* [Qemu-devel] [4479] MONITOR insn address generation fix - converted XLAT to TCG
@ 2008-05-17 19:05 Fabrice Bellard
0 siblings, 0 replies; only message in thread
From: Fabrice Bellard @ 2008-05-17 19:05 UTC (permalink / raw)
To: qemu-devel
Revision: 4479
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4479
Author: bellard
Date: 2008-05-17 19:05:28 +0000 (Sat, 17 May 2008)
Log Message:
-----------
MONITOR insn address generation fix - converted XLAT to TCG
Modified Paths:
--------------
trunk/target-i386/op.c
trunk/target-i386/translate.c
Modified: trunk/target-i386/op.c
===================================================================
--- trunk/target-i386/op.c 2008-05-17 18:58:29 UTC (rev 4478)
+++ trunk/target-i386/op.c 2008-05-17 19:05:28 UTC (rev 4479)
@@ -224,30 +224,6 @@
/* constant load & misc op */
/* XXX: consistent names */
-void OPPROTO op_addl_T1_im(void)
-{
- T1 += PARAM1;
-}
-
-void OPPROTO op_movl_T1_A0(void)
-{
- T1 = A0;
-}
-
-void OPPROTO op_addl_A0_AL(void)
-{
- A0 = (uint32_t)(A0 + (EAX & 0xff));
-}
-
-#ifdef TARGET_X86_64
-
-void OPPROTO op_addq_A0_AL(void)
-{
- A0 = (A0 + (EAX & 0xff));
-}
-
-#endif
-
void OPPROTO op_into(void)
{
int eflags;
Modified: trunk/target-i386/translate.c
===================================================================
--- trunk/target-i386/translate.c 2008-05-17 18:58:29 UTC (rev 4478)
+++ trunk/target-i386/translate.c 2008-05-17 19:05:28 UTC (rev 4479)
@@ -2352,12 +2352,12 @@
gen_op_addl_A0_im(-4);
if (s->ss32) {
if (s->addseg) {
- gen_op_movl_T1_A0();
+ tcg_gen_mov_tl(cpu_T[1], cpu_A0);
gen_op_addl_A0_seg(R_SS);
}
} else {
gen_op_andl_A0_ffff();
- gen_op_movl_T1_A0();
+ tcg_gen_mov_tl(cpu_T[1], cpu_A0);
gen_op_addl_A0_seg(R_SS);
}
gen_op_st_T0_A0(s->dflag + 1 + s->mem_index);
@@ -2447,7 +2447,7 @@
gen_op_movl_A0_reg(R_ESP);
if (!s->ss32)
gen_op_andl_A0_ffff();
- gen_op_movl_T1_A0();
+ tcg_gen_mov_tl(cpu_T[1], cpu_A0);
if (s->addseg)
gen_op_addl_A0_seg(R_SS);
}
@@ -2460,7 +2460,7 @@
gen_op_addl_A0_im(-16 << s->dflag);
if (!s->ss32)
gen_op_andl_A0_ffff();
- gen_op_movl_T1_A0();
+ tcg_gen_mov_tl(cpu_T[1], cpu_A0);
if (s->addseg)
gen_op_addl_A0_seg(R_SS);
for(i = 0;i < 8; i++) {
@@ -2478,8 +2478,8 @@
gen_op_movl_A0_reg(R_ESP);
if (!s->ss32)
gen_op_andl_A0_ffff();
- gen_op_movl_T1_A0();
- gen_op_addl_T1_im(16 << s->dflag);
+ tcg_gen_mov_tl(cpu_T[1], cpu_A0);
+ tcg_gen_addi_tl(cpu_T[1], cpu_T[1], 16 << s->dflag);
if (s->addseg)
gen_op_addl_A0_seg(R_SS);
for(i = 0;i < 8; i++) {
@@ -2505,7 +2505,7 @@
gen_op_movl_A0_reg(R_ESP);
gen_op_addq_A0_im(-opsize);
- gen_op_movl_T1_A0();
+ tcg_gen_mov_tl(cpu_T[1], cpu_A0);
/* push bp */
gen_op_mov_TN_reg(OT_LONG, 0, R_EBP);
@@ -2518,7 +2518,7 @@
cpu_T[1]);
}
gen_op_mov_reg_T1(ot, R_EBP);
- gen_op_addl_T1_im( -esp_addend + (-opsize * level) );
+ tcg_gen_addi_tl(cpu_T[1], cpu_T[1], -esp_addend + (-opsize * level));
gen_op_mov_reg_T1(OT_QUAD, R_ESP);
} else
#endif
@@ -2530,7 +2530,7 @@
gen_op_addl_A0_im(-opsize);
if (!s->ss32)
gen_op_andl_A0_ffff();
- gen_op_movl_T1_A0();
+ tcg_gen_mov_tl(cpu_T[1], cpu_A0);
if (s->addseg)
gen_op_addl_A0_seg(R_SS);
/* push bp */
@@ -2544,7 +2544,7 @@
cpu_T[1]);
}
gen_op_mov_reg_T1(ot, R_EBP);
- gen_op_addl_T1_im( -esp_addend + (-opsize * level) );
+ tcg_gen_addi_tl(cpu_T[1], cpu_T[1], -esp_addend + (-opsize * level));
gen_op_mov_reg_T1(OT_WORD + s->ss32, R_ESP);
}
}
@@ -4561,14 +4561,20 @@
#ifdef TARGET_X86_64
if (s->aflag == 2) {
gen_op_movq_A0_reg(R_EBX);
- gen_op_addq_A0_AL();
+ gen_op_mov_TN_reg(OT_QUAD, 0, R_EAX);
+ tcg_gen_andi_tl(cpu_T[0], cpu_T[0], 0xff);
+ tcg_gen_add_tl(cpu_A0, cpu_A0, cpu_T[0]);
} else
#endif
{
gen_op_movl_A0_reg(R_EBX);
- gen_op_addl_A0_AL();
+ gen_op_mov_TN_reg(OT_LONG, 0, R_EAX);
+ tcg_gen_andi_tl(cpu_T[0], cpu_T[0], 0xff);
+ tcg_gen_add_tl(cpu_A0, cpu_A0, cpu_T[0]);
if (s->aflag == 0)
gen_op_andl_A0_ffff();
+ else
+ tcg_gen_andi_tl(cpu_A0, cpu_A0, 0xffffffff);
}
gen_add_A0_ds_seg(s);
gen_op_ldu_T0_A0(OT_BYTE + s->mem_index);
@@ -6285,13 +6291,11 @@
gen_jmp_im(pc_start - s->cs_base);
#ifdef TARGET_X86_64
if (s->aflag == 2) {
- gen_op_movq_A0_reg(R_EBX);
- gen_op_addq_A0_AL();
+ gen_op_movq_A0_reg(R_EAX);
} else
#endif
{
- gen_op_movl_A0_reg(R_EBX);
- gen_op_addl_A0_AL();
+ gen_op_movl_A0_reg(R_EAX);
if (s->aflag == 0)
gen_op_andl_A0_ffff();
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-17 19:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-17 19:05 [Qemu-devel] [4479] MONITOR insn address generation fix - converted XLAT to TCG Fabrice Bellard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).