diff --git a/Source/Core/Common/Src/x64Emitter.cpp b/Source/Core/Common/Src/x64Emitter.cpp index cd9e64293b..bfefa3e28f 100644 --- a/Source/Core/Common/Src/x64Emitter.cpp +++ b/Source/Core/Common/Src/x64Emitter.cpp @@ -22,8 +22,7 @@ namespace Gen { static u8 *code; - static bool mode32 = false; - static bool enableBranchHints = false; + static bool enableBranchHints = false; void SetCodePtr(u8 *ptr) { @@ -89,7 +88,6 @@ namespace Gen inline void Write64(u64 value) { - _dbg_assert_msg_(DYNA_REC,!mode32,"!mode32"); *(u64*)code = value; code += 8; } @@ -113,7 +111,6 @@ namespace Gen if (customOp >> 3) op |= 4; if (indexReg >> 3) op |= 2; if (offsetOrBaseReg >> 3) op |= 1; //TODO investigate if this is dangerous - _dbg_assert_msg_(DYNA_REC, !mode32 || op == 0x40, "!mode32"); if (op != 0x40) Write8(op); #else @@ -134,7 +131,6 @@ namespace Gen if (scale == SCALE_RIP) //Also, on 32-bit, just an immediate address { - _dbg_assert_msg_(DYNA_REC,!mode32,"!mode32"); // Oh, RIP addressing. _offsetOrBaseReg = 5; WriteModRM(0, _operandReg&7, 5); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index 290d7c2ed6..c0ac680398 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -572,7 +572,9 @@ void CWII_IPC_HLE_WiiMote::CommandConnectionResponse(u8 _Ident, u8* _pData, u32 } void CWII_IPC_HLE_WiiMote::CommandCofigurationResponse(u8 _Ident, u8* _pData, u32 _Size) { +#ifdef LOGGING l2cap_conf_rsp* rsp = (l2cap_conf_rsp*)_pData; +#endif _dbg_assert_(WIIMOTE, _Size == sizeof(l2cap_conf_rsp));