diff options
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/helper.c | 6 | ||||
| -rw-r--r-- | target-i386/translate.c | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 6d0f18c..7e2ac4e 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -28,6 +28,7 @@ #include "exec-all.h" #include "qemu-common.h" #include "kvm.h" +#include "hax.h" //#define DEBUG_MMU @@ -662,6 +663,11 @@ void cpu_dump_state(CPUState *env, FILE *f, if (kvm_enabled()) kvm_arch_get_registers(env); +#ifdef CONFIG_HAX + if (hax_enabled()) + hax_arch_get_registers(env); +#endif + eflags = env->eflags; #ifdef TARGET_X86_64 if (env->hflags & HF_CS64_MASK) { diff --git a/target-i386/translate.c b/target-i386/translate.c index f4e295f..e05cdac 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -32,6 +32,7 @@ #include "helper.h" #define GEN_HELPER 1 #include "helper.h" +#include "hax.h" #define PREFIX_REPZ 0x01 #define PREFIX_REPNZ 0x02 @@ -7714,6 +7715,14 @@ static inline void gen_intermediate_code_internal(CPUState *env, pc_ptr = disas_insn(dc, pc_ptr); num_insns++; +#ifdef CONFIG_HAX + if (hax_enabled() && hax_stop_translate(env)) + { + gen_jmp_im(pc_ptr - dc->cs_base); + gen_eob(dc); + break; + } +#endif /* stop translation if indicated */ if (dc->is_jmp) break; |