lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make s390x stopping mechanism work

Browse Source
This commit is contained in:
mio
2021-12-27 23:48:20 +01:00
parent a38151bf77
commit 034a1aa5f2
7 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
qemu/target/s390x/translate.c
View File

@@ -6652,6 +6652,9 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
/* Search for the insn in the table. */
insn = extract_insn(env, s);
/* Emit insn_start now that we know the ILEN. */
tcg_gen_insn_start(tcg_ctx, s->base.pc_next, s->cc_op, s->ilen);
// Unicorn: trace this instruction on request
if (HOOK_EXISTS_BOUNDED(s->uc, UC_HOOK_CODE, s->base.pc_next)) {
gen_uc_tracecode(tcg_ctx, s->ilen, UC_HOOK_CODE_IDX, s->uc, s->base.pc_next);
@@ -6659,9 +6662,6 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
check_exit_request(tcg_ctx);
}
/* Emit insn_start now that we know the ILEN. */
tcg_gen_insn_start(tcg_ctx, s->base.pc_next, s->cc_op, s->ilen);
/* Not found means unimplemented/illegal opcode. */
if (insn == NULL) {
// qemu_log_mask(LOG_UNIMP, "unimplemented opcode 0x%02x%02x\n",
@@ -6867,7 +6867,8 @@ static void s390x_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs)
switch (dc->base.is_jmp) {
case DISAS_UNICORN_HALT:
gen_exception(tcg_ctx, EXCP_PGM);
tcg_gen_insn_start(tcg_ctx, dc->base.pc_next, 0, 0);
gen_helper_uc_s390x_exit(tcg_ctx, tcg_ctx->cpu_env);
break;
case DISAS_GOTO_TB:
case DISAS_NORETURN: