yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-07 16:30:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix reg_read casting for x86 segment registers

Browse source
This commit is contained in:
Chris Eagle 2016-02-04 19:20:59 -08:00
parent c339ced218
commit 4cb43be5bf
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
qemu/target-i386/unicorn.c Normal file → Executable file
View file

@ -260,22 +260,22 @@ int x86_reg_read(struct uc_struct *uc, unsigned int regid, void *value)
*(int16_t *)value = READ_WORD(X86_CPU(uc, mycpu)->env.eip); *(int16_t *)value = READ_WORD(X86_CPU(uc, mycpu)->env.eip);
break; break;
case UC_X86_REG_CS: case UC_X86_REG_CS:
*(int32_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_CS].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_CS].selector;
break; break;
case UC_X86_REG_DS: case UC_X86_REG_DS:
*(int32_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_DS].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_DS].selector;
break; break;
case UC_X86_REG_SS: case UC_X86_REG_SS:
*(int32_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_SS].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_SS].selector;
break; break;
case UC_X86_REG_ES: case UC_X86_REG_ES:
*(int32_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_ES].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_ES].selector;
break; break;
case UC_X86_REG_FS: case UC_X86_REG_FS:
*(int32_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_FS].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_FS].selector;
break; break;
case UC_X86_REG_GS: case UC_X86_REG_GS:
*(int32_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_GS].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_GS].selector;
break; break;
} }
break; break;
@ -412,22 +412,22 @@ int x86_reg_read(struct uc_struct *uc, unsigned int regid, void *value)
*(int16_t *)value = READ_WORD(X86_CPU(uc, mycpu)->env.eip); *(int16_t *)value = READ_WORD(X86_CPU(uc, mycpu)->env.eip);
break; break;
case UC_X86_REG_CS: case UC_X86_REG_CS:
*(int64_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_CS].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_CS].selector;
break; break;
case UC_X86_REG_DS: case UC_X86_REG_DS:
*(int64_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_DS].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_DS].selector;
break; break;
case UC_X86_REG_SS: case UC_X86_REG_SS:
*(int64_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_SS].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_SS].selector;
break; break;
case UC_X86_REG_ES: case UC_X86_REG_ES:
*(int64_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_ES].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_ES].selector;
break; break;
case UC_X86_REG_FS: case UC_X86_REG_FS:
*(int64_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_FS].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_FS].selector;
break; break;
case UC_X86_REG_GS: case UC_X86_REG_GS:
*(int64_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_GS].selector; *(int16_t *)value = (uint16_t)X86_CPU(uc, mycpu)->env.segs[R_GS].selector;
break; break;
case UC_X86_REG_R8: case UC_X86_REG_R8:
*(int64_t *)value = READ_QWORD(X86_CPU(uc, mycpu)->env.regs[8]); *(int64_t *)value = READ_QWORD(X86_CPU(uc, mycpu)->env.regs[8]);