yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 08:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Indentation

Browse source
This commit is contained in:
feliam 2016-03-10 07:45:36 -03:00
parent 3038726a5b
commit 23b3f651f9
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bindings/python/unicorn/unicorn.py
View file

@ -206,6 +206,7 @@ class Uc(object):
except: # _uc might be pulled from under our feet except: # _uc might be pulled from under our feet
pass pass
# emulate from @begin, and stop when reaching address @until # emulate from @begin, and stop when reaching address @until
def emu_start(self, begin, until, timeout=0, count=0): def emu_start(self, begin, until, timeout=0, count=0):
status = _uc.uc_emu_start(self._uch, begin, until, timeout, count) status = _uc.uc_emu_start(self._uch, begin, until, timeout, count)

2
include/unicorn/x86.h
View file

@ -74,7 +74,7 @@ typedef enum uc_x86_reg {
UC_X86_REG_R14D, UC_X86_REG_R15D, UC_X86_REG_R8W, UC_X86_REG_R9W, UC_X86_REG_R10W, UC_X86_REG_R14D, UC_X86_REG_R15D, UC_X86_REG_R8W, UC_X86_REG_R9W, UC_X86_REG_R10W,
UC_X86_REG_R11W, UC_X86_REG_R12W, UC_X86_REG_R13W, UC_X86_REG_R14W, UC_X86_REG_R15W, UC_X86_REG_R11W, UC_X86_REG_R12W, UC_X86_REG_R13W, UC_X86_REG_R14W, UC_X86_REG_R15W,
UC_X86_REG_IDTR, UC_X86_REG_GDTR, UC_X86_REG_LDTR, UC_X86_REG_TR, UC_X86_REG_FPCW, UC_X86_REG_IDTR, UC_X86_REG_GDTR, UC_X86_REG_LDTR, UC_X86_REG_TR, UC_X86_REG_FPCW,
UC_X86_REG_FPTAG, UC_X86_REG_FPTAG,
UC_X86_REG_ENDING // <-- mark the end of the list of registers UC_X86_REG_ENDING // <-- mark the end of the list of registers
} uc_x86_reg; } uc_x86_reg;

8
qemu/target-i386/unicorn.c
View file

@ -152,7 +152,7 @@ int x86_reg_read(struct uc_struct *uc, unsigned int regid, void *value)
case UC_X86_REG_FPSW: case UC_X86_REG_FPSW:
{ {
uint16_t fpus = X86_CPU(uc, mycpu)->env.fpus; uint16_t fpus = X86_CPU(uc, mycpu)->env.fpus;
fpus = fpus & ~0x3800; fpus = fpus & ~0x3800;
fpus |= ( X86_CPU(uc, mycpu)->env.fpstt & 0x7 ) << 11; fpus |= ( X86_CPU(uc, mycpu)->env.fpstt & 0x7 ) << 11;
*(uint16_t*) value = fpus; *(uint16_t*) value = fpus;
} }
@ -629,9 +629,8 @@ int x86_reg_write(struct uc_struct *uc, unsigned int regid, const void *value)
break; break;
case UC_X86_REG_FP0 ... UC_X86_REG_FP7: case UC_X86_REG_FP0 ... UC_X86_REG_FP7:
{ {
//floatx80 cpu_set_fp80(uint64_t mant, uint16_t upper);
uint64_t mant = *(uint64_t*) value; uint64_t mant = *(uint64_t*) value;
uint16_t upper = *(uint16_t*) (value+sizeof(uint64_t)); uint16_t upper = *(uint16_t*) (value + sizeof(uint64_t));
X86_CPU(uc, mycpu)->env.fpregs[regid - UC_X86_REG_FP0].d = cpu_set_fp80(mant, upper); X86_CPU(uc, mycpu)->env.fpregs[regid - UC_X86_REG_FP0].d = cpu_set_fp80(mant, upper);
} }
break; break;
@ -654,7 +653,8 @@ int x86_reg_write(struct uc_struct *uc, unsigned int regid, const void *value)
fptag >>= 2; fptag >>= 2;
} }
} }
} break;
}
switch(uc->mode) { switch(uc->mode) {
default: default: