Fix pc issue of tcg opcode hooks

wtdcode · wtdcode · commit c915d13cce00 · 2025-02-10T21:35:17.000+08:00
diff --git a/qemu/target/arm/translate.c b/qemu/target/arm/translate.c
@@ -11598,6 +11598,7 @@ static void thumb_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
         check_exit_request(tcg_ctx);
     }
 
+    tcg_ctx->pc_start = dc->base.pc_next - insn_size;
     if (is_16bit) {
         disas_thumb_insn(dc, insn);
     } else {
diff --git a/tests/unit/test_arm.c b/tests/unit/test_arm.c
@@ -902,7 +902,7 @@ static void test_arm_tcg_opcode_cmp(void)
 
     OK(uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 3));
     TEST_CHECK(cmp_info.v0 == 5 && cmp_info.v1 == 3);
-    TEST_CHECK(cmp_info.pc == code_start);
+    TEST_CHECK(cmp_info.pc == 0x1008);
     TEST_CHECK(cmp_info.size == 32);
 }
 
@@ -928,7 +928,7 @@ static void test_arm_thumb_tcg_opcode_cmn(void)
 
     OK(uc_emu_start(uc, code_start | 1, code_start + sizeof(code) - 1, 0, 4));
     TEST_CHECK(cmp_info.v0 == 5 && cmp_info.v1 == 3);
-    TEST_CHECK(cmp_info.pc == (code_start | 1));
+    TEST_CHECK(cmp_info.pc == 0x1006);
     TEST_CHECK(cmp_info.size == 32);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11598,6 +11598,7 @@ static void thumb_tr_translate_insn(DisasContextBase dcbase, CPUState cpu)`
`11598`	`11598`	`check_exit_request(tcg_ctx);`
`11599`	`11599`	`}`
`11600`	`11600`
	`11601`	`+ tcg_ctx->pc_start = dc->base.pc_next - insn_size;`
`11601`	`11602`	`if (is_16bit) {`
`11602`	`11603`	`disas_thumb_insn(dc, insn);`
`11603`	`11604`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -902,7 +902,7 @@ static void test_arm_tcg_opcode_cmp(void)`
`902`	`902`
`903`	`903`	`OK(uc_emu_start(uc, code_start, code_start + sizeof(code) - 1, 0, 3));`
`904`	`904`	`TEST_CHECK(cmp_info.v0 == 5 && cmp_info.v1 == 3);`
`905`		`- TEST_CHECK(cmp_info.pc == code_start);`
	`905`	`+ TEST_CHECK(cmp_info.pc == 0x1008);`
`906`	`906`	`TEST_CHECK(cmp_info.size == 32);`
`907`	`907`	`}`
`908`	`908`
`@@ -928,7 +928,7 @@ static void test_arm_thumb_tcg_opcode_cmn(void)`
`928`	`928`
`929`	`929`	`OK(uc_emu_start(uc, code_start \| 1, code_start + sizeof(code) - 1, 0, 4));`
`930`	`930`	`TEST_CHECK(cmp_info.v0 == 5 && cmp_info.v1 == 3);`
`931`		`- TEST_CHECK(cmp_info.pc == (code_start \| 1));`
	`931`	`+ TEST_CHECK(cmp_info.pc == 0x1006);`
`932`	`932`	`TEST_CHECK(cmp_info.size == 32);`
`933`	`933`	`}`
`934`	`934`