diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index 3af918cacc..39059ffc4f 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -240,7 +240,7 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress) { case ISFS_IOCTL_GETFILESTATS: { - m_FileLength = File::GetSize(m_pFileHandle); + m_FileLength = (u32)File::GetSize(m_pFileHandle); u32 Position = (u32)ftello(m_pFileHandle); u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); diff --git a/Source/UnitTests/DSPJitTester.cpp b/Source/UnitTests/DSPJitTester.cpp index 0eaed4e0ea..da983038c4 100644 --- a/Source/UnitTests/DSPJitTester.cpp +++ b/Source/UnitTests/DSPJitTester.cpp @@ -63,7 +63,7 @@ bool DSPJitTester::AreEqual(SDSP& int_dsp, SDSP& jit_dsp) bool equal = true; for (int i = 0; i < DSP_REG_NUM; i++) { - if (int_dsp.r[i] != jit_dsp.r[i]) + if (((u16*)&int_dsp._r)[i] != ((u16*)&jit_dsp._r)[i]) { if (equal) { @@ -77,7 +77,7 @@ bool DSPJitTester::AreEqual(SDSP& int_dsp, SDSP& jit_dsp) } equal = false; if (be_verbose || failed_only) - printf("\t%s: int = 0x%04x, jit = 0x%04x\n", regnames[i].name, int_dsp.r[i], jit_dsp.r[i]); + printf("\t%s: int = 0x%04x, jit = 0x%04x\n", regnames[i].name, ((u16*)&int_dsp._r)[i], ((u16*)&jit_dsp._r)[i]); } } @@ -126,8 +126,8 @@ void DSPJitTester::DumpJittedCode() void DSPJitTester::DumpRegs(SDSP& dsp) { for (int i = 0; i < DSP_REG_NUM; i++) - if (dsp.r[i]) - printf("%s=0x%04x ", regnames[i].name, dsp.r[i]); + if (((u16*)&dsp._r)[i]) + printf("%s=0x%04x ", regnames[i].name, ((u16*)&dsp._r)[i]); } void DSPJitTester::Initialize() { @@ -145,7 +145,7 @@ int DSPJitTester::TestOne(TestDataIterator it, SDSP& dsp) it++; for (TestData::size_type i = 0; i < data.size(); i++) { - dsp.r[reg] = data.at(i); + ((u16*)&dsp._r)[reg] = data.at(i); failed += TestOne(it, dsp); } }