yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-22 09:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

mips: advance PC for SYSCALL instruction. this fixes issue #157

Browse source
This commit is contained in:
Nguyen Anh Quynh 2015-09-28 10:58:43 +08:00
parent 0b971a4413
commit 2b0b4169bc
5 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/uc_priv.h
View file

@ -185,6 +185,7 @@ struct uc_struct {
void *qemu_thread_data; // to support cross compile to Windows (qemu-thread-win32.c) void *qemu_thread_data; // to support cross compile to Windows (qemu-thread-win32.c)
uint32_t target_page_size; uint32_t target_page_size;
uint32_t target_page_align; uint32_t target_page_align;
uint64_t next_pc; // save next PC for some special cases
}; };
#include "qemu_macro.h" #include "qemu_macro.h"

3
qemu/cpu-exec.c
View file

@ -136,6 +136,9 @@ int cpu_exec(struct uc_struct *uc, CPUArchState *env) // qq
// point EIP to the next instruction after INT // point EIP to the next instruction after INT
env->eip = env->exception_next_eip; env->eip = env->exception_next_eip;
#endif #endif
#if defined(TARGET_MIPS) || defined(TARGET_MIPS64)
env->active_tc.PC = uc->next_pc;
#endif
#endif #endif
} }
} }

1
qemu/target-mips/translate.c
View file

@ -19348,6 +19348,7 @@ gen_intermediate_code_internal(MIPSCPU *cpu, TranslationBlock *tb,
switch (ctx.bstate) { switch (ctx.bstate) {
case BS_STOP: case BS_STOP:
gen_goto_tb(&ctx, 0, ctx.pc); gen_goto_tb(&ctx, 0, ctx.pc);
env->uc->next_pc = ctx.pc;
break; break;
case BS_NONE: case BS_NONE:
save_cpu_state(&ctx, 0); save_cpu_state(&ctx, 0);

5
qemu/tcg/tcg.c
View file

@ -2586,8 +2586,13 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf) // qq
} }
#endif #endif
//printf("====== before gen code\n");
//tcg_dump_ops(s);
tcg_gen_code_common(s, gen_code_buf, -1); // qq tcg_gen_code_common(s, gen_code_buf, -1); // qq
//printf("====== after gen code\n");
//tcg_dump_ops(s);
/* flush instruction cache */ /* flush instruction cache */
flush_icache_range((uintptr_t)s->code_buf, (uintptr_t)s->code_ptr); flush_icache_range((uintptr_t)s->code_buf, (uintptr_t)s->code_ptr);

4
tests/regress/mips_syscall_pc.py Normal file → Executable file
View file

@ -1,3 +1,5 @@
#!/usr/bin/python
from unicorn import * from unicorn import *
from unicorn.mips_const import * from unicorn.mips_const import *
@ -13,4 +15,4 @@ uc.mem_write(addr, code)
uc.reg_write(UC_MIPS_REG_V0, 100) uc.reg_write(UC_MIPS_REG_V0, 100)
uc.hook_add(UC_HOOK_INTR, intr_hook) uc.hook_add(UC_HOOK_INTR, intr_hook)
uc.emu_start(addr, len(code)) uc.emu_start(addr, addr+len(code))