From a1bd90929437cefa86edb15398d4c8171ef16157 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 28 Oct 2015 16:10:21 -0400 Subject: csnd_snd: Get rid of type punning --- src/core/hle/service/csnd_snd.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'src/core/hle') diff --git a/src/core/hle/service/csnd_snd.cpp b/src/core/hle/service/csnd_snd.cpp index ce2877f57..669659510 100644 --- a/src/core/hle/service/csnd_snd.cpp +++ b/src/core/hle/service/csnd_snd.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include "core/hle/hle.h" #include "core/hle/kernel/mutex.h" #include "core/hle/kernel/shared_memory.h" @@ -52,19 +53,19 @@ void Initialize(Service::Interface* self) { } void ExecuteType0Commands(Service::Interface* self) { - u32* cmd_buff = Kernel::GetCommandBuffer(); + u32* const cmd_buff = Kernel::GetCommandBuffer(); + u8* const ptr = shared_memory->GetPointer(cmd_buff[1]); + + if (shared_memory != nullptr && ptr != nullptr) { + Type0Command command; + std::memcpy(&command, ptr, sizeof(Type0Command)); + + LOG_WARNING(Service, "(STUBBED) CSND_SND::ExecuteType0Commands"); + command.finished |= 1; + cmd_buff[1] = 0; - if (shared_memory != nullptr) { - struct Type0Command* command = reinterpret_cast( - shared_memory->GetPointer(cmd_buff[1])); - if (command == nullptr) { - cmd_buff[1] = 1; - }else{ - LOG_WARNING(Service, "(STUBBED) CSND_SND::ExecuteType0Commands"); - command->finished |= 1; - cmd_buff[1] = 0; - } - }else{ + std::memcpy(ptr, &command, sizeof(Type0Command)); + } else { cmd_buff[1] = 1; } } -- cgit v1.2.3