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

Jit64Base: Clean up casting 

Mostly intended to clean up HandleFault than anything else.
This commit is contained in:
Lioncash 2016-12-13 18:59:03 -05:00
parent 1aff8c4eb1
commit d010246af2
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/Core/PowerPC/Jit64Common/Jit64Base.cpp
View File

@ -26,19 +26,20 @@
bool Jitx86Base::HandleFault(uintptr_t access_address, SContext* ctx) bool Jitx86Base::HandleFault(uintptr_t access_address, SContext* ctx)
{ {
// TODO: do we properly handle off-the-end? // TODO: do we properly handle off-the-end?
if (access_address >= (uintptr_t)Memory::physical_base && const auto base_ptr = reinterpret_cast<uintptr_t>(Memory::physical_base);
access_address < (uintptr_t)Memory::physical_base + 0x100010000) if (access_address >= base_ptr && access_address < base_ptr + 0x100010000)
return BackPatch((u32)(access_address - (uintptr_t)Memory::physical_base), ctx); return BackPatch(static_cast<u32>(access_address - base_ptr), ctx);
if (access_address >= (uintptr_t)Memory::logical_base &&
access_address < (uintptr_t)Memory::logical_base + 0x100010000) const auto logical_base_ptr = reinterpret_cast<uintptr_t>(Memory::logical_base);
return BackPatch((u32)(access_address - (uintptr_t)Memory::logical_base), ctx); if (access_address >= logical_base_ptr && access_address < logical_base_ptr + 0x100010000)
return BackPatch(static_cast<u32>(access_address - logical_base_ptr), ctx);
return false; return false;
} }
bool Jitx86Base::BackPatch(u32 emAddress, SContext* ctx) bool Jitx86Base::BackPatch(u32 emAddress, SContext* ctx)
{ {
u8* codePtr = (u8*)ctx->CTX_PC; u8* codePtr = reinterpret_cast<u8*>(ctx->CTX_PC);
if (!IsInSpace(codePtr)) if (!IsInSpace(codePtr))
return false; // this will become a regular crash real soon after this return false; // this will become a regular crash real soon after this
@ -139,13 +140,13 @@ void LogGeneratedX86(int size, PPCAnalyst::CodeBuffer* code_buffer, const u8* no
disassembler x64disasm; disassembler x64disasm;
x64disasm.set_syntax_intel(); x64disasm.set_syntax_intel();
u64 disasmPtr = (u64)normalEntry; u64 disasmPtr = reinterpret_cast<u64>(normalEntry);
const u8* end = normalEntry + b->codeSize; const u8* end = normalEntry + b->codeSize;
while ((u8*)disasmPtr < end) while (reinterpret_cast<u8*>(disasmPtr) < end)
{ {
char sptr[1000] = ""; char sptr[1000] = "";
disasmPtr += x64disasm.disasm64(disasmPtr, disasmPtr, (u8*)disasmPtr, sptr); disasmPtr += x64disasm.disasm64(disasmPtr, disasmPtr, reinterpret_cast<u8*>(disasmPtr), sptr);
DEBUG_LOG(DYNA_REC, "IR_X86 x86: %s", sptr); DEBUG_LOG(DYNA_REC, "IR_X86 x86: %s", sptr);
} }
@ -157,7 +158,7 @@ void LogGeneratedX86(int size, PPCAnalyst::CodeBuffer* code_buffer, const u8* no
{ {
ss.width(2); ss.width(2);
ss.fill('0'); ss.fill('0');
ss << (u32) * (normalEntry + i); ss << static_cast<u32>(*(normalEntry + i));
} }
DEBUG_LOG(DYNA_REC, "IR_X86 bin: %s\n\n\n", ss.str().c_str()); DEBUG_LOG(DYNA_REC, "IR_X86 bin: %s\n\n\n", ss.str().c_str());
} }