yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #5154 from comex/xx-ipc 

hle: Type check ResponseBuilder::Push arguments, and fix use in vi.cpp
This commit is contained in:
bunnei 2020-12-06 22:32:04 -08:00 committed by GitHub
parent 8a00a0ade6 3373149fdc
commit 24cabf5e2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/core/hle/ipc_helpers.h
View File

@ -166,8 +166,23 @@ public:
ValidateHeader(); ValidateHeader();
} }
void PushImpl(s8 value);
void PushImpl(s16 value);
void PushImpl(s32 value);
void PushImpl(s64 value);
void PushImpl(u8 value);
void PushImpl(u16 value);
void PushImpl(u32 value);
void PushImpl(u64 value);
void PushImpl(float value);
void PushImpl(double value);
void PushImpl(bool value);
void PushImpl(ResultCode value);
template <typename T> template <typename T>
void Push(T value); void Push(T value) {
return PushImpl(value);
}
template <typename First, typename... Other> template <typename First, typename... Other>
void Push(const First& first_value, const Other&... other_values); void Push(const First& first_value, const Other&... other_values);
@ -215,13 +230,11 @@ private:
/// Push /// /// Push ///
template <> inline void ResponseBuilder::PushImpl(s32 value) {
inline void ResponseBuilder::Push(s32 value) {
cmdbuf[index++] = static_cast<u32>(value); cmdbuf[index++] = static_cast<u32>(value);
} }
template <> inline void ResponseBuilder::PushImpl(u32 value) {
inline void ResponseBuilder::Push(u32 value) {
cmdbuf[index++] = value; cmdbuf[index++] = value;
} }
@ -233,62 +246,52 @@ void ResponseBuilder::PushRaw(const T& value) {
index += (sizeof(T) + 3) / 4; // round up to word length index += (sizeof(T) + 3) / 4; // round up to word length
} }
template <> inline void ResponseBuilder::PushImpl(ResultCode value) {
inline void ResponseBuilder::Push(ResultCode value) {
// Result codes are actually 64-bit in the IPC buffer, but only the high part is discarded. // Result codes are actually 64-bit in the IPC buffer, but only the high part is discarded.
Push(value.raw); Push(value.raw);
Push<u32>(0); Push<u32>(0);
} }
template <> inline void ResponseBuilder::PushImpl(s8 value) {
inline void ResponseBuilder::Push(s8 value) {
PushRaw(value); PushRaw(value);
} }
template <> inline void ResponseBuilder::PushImpl(s16 value) {
inline void ResponseBuilder::Push(s16 value) {
PushRaw(value); PushRaw(value);
} }
template <> inline void ResponseBuilder::PushImpl(s64 value) {
inline void ResponseBuilder::Push(s64 value) { PushImpl(static_cast<u32>(value));
Push(static_cast<u32>(value)); PushImpl(static_cast<u32>(value >> 32));
Push(static_cast<u32>(value >> 32));
} }
template <> inline void ResponseBuilder::PushImpl(u8 value) {
inline void ResponseBuilder::Push(u8 value) {
PushRaw(value); PushRaw(value);
} }
template <> inline void ResponseBuilder::PushImpl(u16 value) {
inline void ResponseBuilder::Push(u16 value) {
PushRaw(value); PushRaw(value);
} }
template <> inline void ResponseBuilder::PushImpl(u64 value) {
inline void ResponseBuilder::Push(u64 value) { PushImpl(static_cast<u32>(value));
Push(static_cast<u32>(value)); PushImpl(static_cast<u32>(value >> 32));
Push(static_cast<u32>(value >> 32));
} }
template <> inline void ResponseBuilder::PushImpl(float value) {
inline void ResponseBuilder::Push(float value) {
u32 integral; u32 integral;
std::memcpy(&integral, &value, sizeof(u32)); std::memcpy(&integral, &value, sizeof(u32));
Push(integral); PushImpl(integral);
} }
template <> inline void ResponseBuilder::PushImpl(double value) {
inline void ResponseBuilder::Push(double value) {
u64 integral; u64 integral;
std::memcpy(&integral, &value, sizeof(u64)); std::memcpy(&integral, &value, sizeof(u64));
Push(integral); PushImpl(integral);
} }
template <> inline void ResponseBuilder::PushImpl(bool value) {
inline void ResponseBuilder::Push(bool value) { PushImpl(static_cast<u8>(value));
Push(static_cast<u8>(value));
} }
template <typename First, typename... Other> template <typename First, typename... Other>

4
src/core/hle/service/vi/vi.cpp
View File

@ -1230,8 +1230,8 @@ private:
const auto height = rp.Pop<u64>(); const auto height = rp.Pop<u64>();
LOG_DEBUG(Service_VI, "called width={}, height={}", width, height); LOG_DEBUG(Service_VI, "called width={}, height={}", width, height);
constexpr std::size_t base_size = 0x20000; constexpr u64 base_size = 0x20000;
constexpr std::size_t alignment = 0x1000; constexpr u64 alignment = 0x1000;
const auto texture_size = width * height * 4; const auto texture_size = width * height * 4;
const auto out_size = (texture_size + base_size - 1) / base_size * base_size; const auto out_size = (texture_size + base_size - 1) / base_size * base_size;