From 4130e0847ce83843f5d0cfbcf828e51bf9efc16c Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Thu, 25 Mar 2021 21:58:07 +0100 Subject: Minor fixes to MODRM decoder functions --- src/emu/x64run_private.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/emu/x64run_private.c b/src/emu/x64run_private.c index c544705d..1ac3eec2 100755 --- a/src/emu/x64run_private.c +++ b/src/emu/x64run_private.c @@ -1091,7 +1091,7 @@ reg64_t* GetECommon32O(x64emu_t* emu, rex_t rex, uint8_t m, uint8_t delta, uintp base += Fetch32s(emu); return (reg64_t*)(base+R_RIP+delta); } - return (reg64_t*)(uintptr_t)(emu->regs[m+(rex.b<<3)].dword[0]); + return (reg64_t*)(uintptr_t)(base + emu->regs[m+(rex.b<<3)].dword[0]); } else { if((m&7)==4) { uint8_t sib = Fetch8(emu); @@ -1238,9 +1238,9 @@ reg64_t* GetGd(x64emu_t *emu, rex_t rex, uint8_t v) reg64_t* GetGb(x64emu_t *emu, rex_t rex, uint8_t v) { uint8_t m = (v&0x38)>>3; - if(rex.rex) { + if(rex.rex) return &emu->regs[(m&7)+(rex.r<<3)]; - } else + else return (reg64_t*)&emu->regs[m&3].byte[m>>2]; } -- cgit 1.4.1