ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ActionReplay: Use Common::BitCast instead of reinterpret_cast in Subtype_AddCode() 

Using reinterpret_cast (or a C-styled equivalent) to reinterpret
integers as floating-point values and vice-versa invokes undefined
behavior. Instead, use BitCast, which does this in a well-defined
manner.
This commit is contained in:
Lioncash 2018-06-20 16:38:28 -04:00
parent bdfc6de9fd
commit 0e437c41e5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/ActionReplay.cpp
View File

@ -31,6 +31,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "Common/BitUtils.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/IniFile.h" #include "Common/IniFile.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
@ -474,10 +475,10 @@ static bool Subtype_AddCode(const ARAddr& addr, const u32 data)
LogInfo("--------"); LogInfo("--------");
const u32 read = PowerPC::HostRead_U32(new_addr); const u32 read = PowerPC::HostRead_U32(new_addr);
const float read_float = reinterpret_cast<const float&>(read); const float read_float = Common::BitCast<float>(read);
// data contains an (unsigned?) integer value // data contains an (unsigned?) integer value
const float fread = read_float + static_cast<float>(data); const float fread = read_float + static_cast<float>(data);
const u32 newval = reinterpret_cast<const u32&>(fread); const u32 newval = Common::BitCast<u32>(fread);
PowerPC::HostWrite_U32(newval, new_addr); PowerPC::HostWrite_U32(newval, new_addr);
LogInfo("Old Value %08x", read); LogInfo("Old Value %08x", read);
LogInfo("Increment %08x", data); LogInfo("Increment %08x", data);