Skip to content

Q
qemu

openeuler / qemu

通知 10
Star 0
Fork 0
Q
qemu

体验新版 GitCode，发现更多精彩内容 >>

提交 7923057b 编写于 作者: B Blue Swirl
浏览文件
操作

x86: avoid AREG0 for integer helpers 

Add an explicit CPUX86State parameter instead of relying on AREG0.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
上级 f0967a1a
隐藏空白更改
内联 并排
Showing with 88 addition and 71 deletion
target-i386/Makefile.objs
浏览文件 @ 7923057b
...@@ -7,7 +7,6 @@ obj-$(CONFIG_NO_KVM) += kvm-stub.o ...@@ -7,7 +7,6 @@ obj-$(CONFIG_NO_KVM) += kvm-stub.o
obj-$(CONFIG_LINUX_USER) += ioport-user.o obj-$(CONFIG_LINUX_USER) += ioport-user.o
obj-$(CONFIG_BSD_USER) += ioport-user.o obj-$(CONFIG_BSD_USER) += ioport-user.o
$(obj)/int_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
$(obj)/svm_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/svm_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
$(obj)/smm_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/smm_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
$(obj)/misc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS) $(obj)/misc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
......
target-i386/helper.h
浏览文件 @ 7923057b
...@@ -7,26 +7,26 @@ DEF_HELPER_0(lock, void) ...@@ -7,26 +7,26 @@ DEF_HELPER_0(lock, void)
DEF_HELPER_0(unlock, void) DEF_HELPER_0(unlock, void)
DEF_HELPER_3(write_eflags, void, env, tl, i32) DEF_HELPER_3(write_eflags, void, env, tl, i32)
DEF_HELPER_1(read_eflags, tl, env) DEF_HELPER_1(read_eflags, tl, env)
DEF_HELPER_1(divb_AL, void, tl) DEF_HELPER_2(divb_AL, void, env, tl)
DEF_HELPER_1(idivb_AL, void, tl) DEF_HELPER_2(idivb_AL, void, env, tl)
DEF_HELPER_1(divw_AX, void, tl) DEF_HELPER_2(divw_AX, void, env, tl)
DEF_HELPER_1(idivw_AX, void, tl) DEF_HELPER_2(idivw_AX, void, env, tl)
DEF_HELPER_1(divl_EAX, void, tl) DEF_HELPER_2(divl_EAX, void, env, tl)
DEF_HELPER_1(idivl_EAX, void, tl) DEF_HELPER_2(idivl_EAX, void, env, tl)
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
DEF_HELPER_1(mulq_EAX_T0, void, tl) DEF_HELPER_2(mulq_EAX_T0, void, env, tl)
DEF_HELPER_1(imulq_EAX_T0, void, tl) DEF_HELPER_2(imulq_EAX_T0, void, env, tl)
DEF_HELPER_2(imulq_T0_T1, tl, tl, tl) DEF_HELPER_3(imulq_T0_T1, tl, env, tl, tl)
DEF_HELPER_1(divq_EAX, void, tl) DEF_HELPER_2(divq_EAX, void, env, tl)
DEF_HELPER_1(idivq_EAX, void, tl) DEF_HELPER_2(idivq_EAX, void, env, tl)
#endif #endif
DEF_HELPER_1(aam, void, int) DEF_HELPER_2(aam, void, env, int)
DEF_HELPER_1(aad, void, int) DEF_HELPER_2(aad, void, env, int)
DEF_HELPER_0(aaa, void) DEF_HELPER_1(aaa, void, env)
DEF_HELPER_0(aas, void) DEF_HELPER_1(aas, void, env)
DEF_HELPER_0(daa, void) DEF_HELPER_1(daa, void, env)
DEF_HELPER_0(das, void) DEF_HELPER_1(das, void, env)
DEF_HELPER_1(lsl, tl, tl) DEF_HELPER_1(lsl, tl, tl)
DEF_HELPER_1(lar, tl, tl) DEF_HELPER_1(lar, tl, tl)
...@@ -207,15 +207,15 @@ DEF_HELPER_3(movq, void, env, ptr, ptr) ...@@ -207,15 +207,15 @@ DEF_HELPER_3(movq, void, env, ptr, ptr)
#define SHIFT 1 #define SHIFT 1
#include "ops_sse_header.h" #include "ops_sse_header.h"
DEF_HELPER_2(rclb, tl, tl, tl) DEF_HELPER_3(rclb, tl, env, tl, tl)
DEF_HELPER_2(rclw, tl, tl, tl) DEF_HELPER_3(rclw, tl, env, tl, tl)
DEF_HELPER_2(rcll, tl, tl, tl) DEF_HELPER_3(rcll, tl, env, tl, tl)
DEF_HELPER_2(rcrb, tl, tl, tl) DEF_HELPER_3(rcrb, tl, env, tl, tl)
DEF_HELPER_2(rcrw, tl, tl, tl) DEF_HELPER_3(rcrw, tl, env, tl, tl)
DEF_HELPER_2(rcrl, tl, tl, tl) DEF_HELPER_3(rcrl, tl, env, tl, tl)
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
DEF_HELPER_2(rclq, tl, tl, tl) DEF_HELPER_3(rclq, tl, env, tl, tl)
DEF_HELPER_2(rcrq, tl, tl, tl) DEF_HELPER_3(rcrq, tl, env, tl, tl)
#endif #endif
#include "def-helper.h" #include "def-helper.h"
target-i386/int_helper.c
浏览文件 @ 7923057b
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "dyngen-exec.h"
#include "host-utils.h" #include "host-utils.h"
#include "helper.h" #include "helper.h"
...@@ -42,7 +41,7 @@ static const uint8_t rclw_table[32] = { ...@@ -42,7 +41,7 @@ static const uint8_t rclw_table[32] = {
/* division, flags are undefined */ /* division, flags are undefined */
void helper_divb_AL(target_ulong t0) void helper_divb_AL(CPUX86State *env, target_ulong t0)
{ {
unsigned int num, den, q, r; unsigned int num, den, q, r;
...@@ -60,7 +59,7 @@ void helper_divb_AL(target_ulong t0) ...@@ -60,7 +59,7 @@ void helper_divb_AL(target_ulong t0)
EAX = (EAX & ~0xffff) | (r << 8) | q; EAX = (EAX & ~0xffff) | (r << 8) | q;
} }
void helper_idivb_AL(target_ulong t0) void helper_idivb_AL(CPUX86State *env, target_ulong t0)
{ {
int num, den, q, r; int num, den, q, r;
...@@ -78,7 +77,7 @@ void helper_idivb_AL(target_ulong t0) ...@@ -78,7 +77,7 @@ void helper_idivb_AL(target_ulong t0)
EAX = (EAX & ~0xffff) | (r << 8) | q; EAX = (EAX & ~0xffff) | (r << 8) | q;
} }
void helper_divw_AX(target_ulong t0) void helper_divw_AX(CPUX86State *env, target_ulong t0)
{ {
unsigned int num, den, q, r; unsigned int num, den, q, r;
...@@ -97,7 +96,7 @@ void helper_divw_AX(target_ulong t0) ...@@ -97,7 +96,7 @@ void helper_divw_AX(target_ulong t0)
EDX = (EDX & ~0xffff) | r; EDX = (EDX & ~0xffff) | r;
} }
void helper_idivw_AX(target_ulong t0) void helper_idivw_AX(CPUX86State *env, target_ulong t0)
{ {
int num, den, q, r; int num, den, q, r;
...@@ -116,7 +115,7 @@ void helper_idivw_AX(target_ulong t0) ...@@ -116,7 +115,7 @@ void helper_idivw_AX(target_ulong t0)
EDX = (EDX & ~0xffff) | r; EDX = (EDX & ~0xffff) | r;
} }
void helper_divl_EAX(target_ulong t0) void helper_divl_EAX(CPUX86State *env, target_ulong t0)
{ {
unsigned int den, r; unsigned int den, r;
uint64_t num, q; uint64_t num, q;
...@@ -135,7 +134,7 @@ void helper_divl_EAX(target_ulong t0) ...@@ -135,7 +134,7 @@ void helper_divl_EAX(target_ulong t0)
EDX = (uint32_t)r; EDX = (uint32_t)r;
} }
void helper_idivl_EAX(target_ulong t0) void helper_idivl_EAX(CPUX86State *env, target_ulong t0)
{ {
int den, r; int den, r;
int64_t num, q; int64_t num, q;
...@@ -157,7 +156,7 @@ void helper_idivl_EAX(target_ulong t0) ...@@ -157,7 +156,7 @@ void helper_idivl_EAX(target_ulong t0)
/* bcd */ /* bcd */
/* XXX: exception */ /* XXX: exception */
void helper_aam(int base) void helper_aam(CPUX86State *env, int base)
{ {
int al, ah; int al, ah;
...@@ -168,7 +167,7 @@ void helper_aam(int base) ...@@ -168,7 +167,7 @@ void helper_aam(int base)
CC_DST = al; CC_DST = al;
} }
void helper_aad(int base) void helper_aad(CPUX86State *env, int base)
{ {
int al, ah; int al, ah;
...@@ -179,7 +178,7 @@ void helper_aad(int base) ...@@ -179,7 +178,7 @@ void helper_aad(int base)
CC_DST = al; CC_DST = al;
} }
void helper_aaa(void) void helper_aaa(CPUX86State *env)
{ {
int icarry; int icarry;
int al, ah, af; int al, ah, af;
...@@ -203,7 +202,7 @@ void helper_aaa(void) ...@@ -203,7 +202,7 @@ void helper_aaa(void)
CC_SRC = eflags; CC_SRC = eflags;
} }
void helper_aas(void) void helper_aas(CPUX86State *env)
{ {
int icarry; int icarry;
int al, ah, af; int al, ah, af;
...@@ -227,7 +226,7 @@ void helper_aas(void) ...@@ -227,7 +226,7 @@ void helper_aas(void)
CC_SRC = eflags; CC_SRC = eflags;
} }
void helper_daa(void) void helper_daa(CPUX86State *env)
{ {
int old_al, al, af, cf; int old_al, al, af, cf;
int eflags; int eflags;
...@@ -254,7 +253,7 @@ void helper_daa(void) ...@@ -254,7 +253,7 @@ void helper_daa(void)
CC_SRC = eflags; CC_SRC = eflags;
} }
void helper_das(void) void helper_das(CPUX86State *env)
{ {
int al, al1, af, cf; int al, al1, af, cf;
int eflags; int eflags;
...@@ -375,7 +374,7 @@ static int idiv64(uint64_t *plow, uint64_t *phigh, int64_t b) ...@@ -375,7 +374,7 @@ static int idiv64(uint64_t *plow, uint64_t *phigh, int64_t b)
return 0; return 0;
} }
void helper_mulq_EAX_T0(target_ulong t0) void helper_mulq_EAX_T0(CPUX86State *env, target_ulong t0)
{ {
uint64_t r0, r1; uint64_t r0, r1;
...@@ -386,7 +385,7 @@ void helper_mulq_EAX_T0(target_ulong t0) ...@@ -386,7 +385,7 @@ void helper_mulq_EAX_T0(target_ulong t0)
CC_SRC = r1; CC_SRC = r1;
} }
void helper_imulq_EAX_T0(target_ulong t0) void helper_imulq_EAX_T0(CPUX86State *env, target_ulong t0)
{ {
uint64_t r0, r1; uint64_t r0, r1;
...@@ -397,7 +396,8 @@ void helper_imulq_EAX_T0(target_ulong t0) ...@@ -397,7 +396,8 @@ void helper_imulq_EAX_T0(target_ulong t0)
CC_SRC = ((int64_t)r1 != ((int64_t)r0 >> 63)); CC_SRC = ((int64_t)r1 != ((int64_t)r0 >> 63));
} }
target_ulong helper_imulq_T0_T1(target_ulong t0, target_ulong t1) target_ulong helper_imulq_T0_T1(CPUX86State *env, target_ulong t0,
target_ulong t1)
{ {
uint64_t r0, r1; uint64_t r0, r1;
...@@ -407,7 +407,7 @@ target_ulong helper_imulq_T0_T1(target_ulong t0, target_ulong t1) ...@@ -407,7 +407,7 @@ target_ulong helper_imulq_T0_T1(target_ulong t0, target_ulong t1)
return r0; return r0;
} }
void helper_divq_EAX(target_ulong t0) void helper_divq_EAX(CPUX86State *env, target_ulong t0)
{ {
uint64_t r0, r1; uint64_t r0, r1;
...@@ -423,7 +423,7 @@ void helper_divq_EAX(target_ulong t0) ...@@ -423,7 +423,7 @@ void helper_divq_EAX(target_ulong t0)
EDX = r1; EDX = r1;
} }
void helper_idivq_EAX(target_ulong t0) void helper_idivq_EAX(CPUX86State *env, target_ulong t0)
{ {
uint64_t r0, r1; uint64_t r0, r1;
......
target-i386/shift_helper_template.h
浏览文件 @ 7923057b
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
#error unhandled operand size #error unhandled operand size
#endif #endif
target_ulong glue(helper_rcl, SUFFIX)(target_ulong t0, target_ulong t1) target_ulong glue(helper_rcl, SUFFIX)(CPUX86State *env, target_ulong t0,
target_ulong t1)
{ {
int count, eflags; int count, eflags;
target_ulong src; target_ulong src;
...@@ -71,7 +72,8 @@ target_ulong glue(helper_rcl, SUFFIX)(target_ulong t0, target_ulong t1) ...@@ -71,7 +72,8 @@ target_ulong glue(helper_rcl, SUFFIX)(target_ulong t0, target_ulong t1)
return t0; return t0;
} }
target_ulong glue(helper_rcr, SUFFIX)(target_ulong t0, target_ulong t1) target_ulong glue(helper_rcr, SUFFIX)(CPUX86State *env, target_ulong t0,
target_ulong t1)
{ {
int count, eflags; int count, eflags;
target_ulong src; target_ulong src;
......
target-i386/translate.c
浏览文件 @ 7923057b
...@@ -1773,20 +1773,36 @@ static void gen_rotc_rm_T1(DisasContext *s, int ot, int op1, ...@@ -1773,20 +1773,36 @@ static void gen_rotc_rm_T1(DisasContext *s, int ot, int op1,
if (is_right) { if (is_right) {
switch (ot) { switch (ot) {
case 0: gen_helper_rcrb(cpu_T[0], cpu_T[0], cpu_T[1]); break; case 0:
case 1: gen_helper_rcrw(cpu_T[0], cpu_T[0], cpu_T[1]); break; gen_helper_rcrb(cpu_T[0], cpu_env, cpu_T[0], cpu_T[1]);
case 2: gen_helper_rcrl(cpu_T[0], cpu_T[0], cpu_T[1]); break; break;
case 1:
gen_helper_rcrw(cpu_T[0], cpu_env, cpu_T[0], cpu_T[1]);
break;
case 2:
gen_helper_rcrl(cpu_T[0], cpu_env, cpu_T[0], cpu_T[1]);
break;
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
case 3: gen_helper_rcrq(cpu_T[0], cpu_T[0], cpu_T[1]); break; case 3:
gen_helper_rcrq(cpu_T[0], cpu_env, cpu_T[0], cpu_T[1]);
break;
#endif #endif
} }
} else { } else {
switch (ot) { switch (ot) {
case 0: gen_helper_rclb(cpu_T[0], cpu_T[0], cpu_T[1]); break; case 0:
case 1: gen_helper_rclw(cpu_T[0], cpu_T[0], cpu_T[1]); break; gen_helper_rclb(cpu_T[0], cpu_env, cpu_T[0], cpu_T[1]);
case 2: gen_helper_rcll(cpu_T[0], cpu_T[0], cpu_T[1]); break; break;
case 1:
gen_helper_rclw(cpu_T[0], cpu_env, cpu_T[0], cpu_T[1]);
break;
case 2:
gen_helper_rcll(cpu_T[0], cpu_env, cpu_T[0], cpu_T[1]);
break;
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
case 3: gen_helper_rclq(cpu_T[0], cpu_T[0], cpu_T[1]); break; case 3:
gen_helper_rclq(cpu_T[0], cpu_env, cpu_T[0], cpu_T[1]);
break;
#endif #endif
} }
} }
...@@ -4541,7 +4557,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -4541,7 +4557,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
break; break;
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
case OT_QUAD: case OT_QUAD:
gen_helper_mulq_EAX_T0(cpu_T[0]); gen_helper_mulq_EAX_T0(cpu_env, cpu_T[0]);
s->cc_op = CC_OP_MULQ; s->cc_op = CC_OP_MULQ;
break; break;
#endif #endif
...@@ -4611,7 +4627,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -4611,7 +4627,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
break; break;
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
case OT_QUAD: case OT_QUAD:
gen_helper_imulq_EAX_T0(cpu_T[0]); gen_helper_imulq_EAX_T0(cpu_env, cpu_T[0]);
s->cc_op = CC_OP_MULQ; s->cc_op = CC_OP_MULQ;
break; break;
#endif #endif
...@@ -4621,21 +4637,21 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -4621,21 +4637,21 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
switch(ot) { switch(ot) {
case OT_BYTE: case OT_BYTE:
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
gen_helper_divb_AL(cpu_T[0]); gen_helper_divb_AL(cpu_env, cpu_T[0]);
break; break;
case OT_WORD: case OT_WORD:
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
gen_helper_divw_AX(cpu_T[0]); gen_helper_divw_AX(cpu_env, cpu_T[0]);
break; break;
default: default:
case OT_LONG: case OT_LONG:
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
gen_helper_divl_EAX(cpu_T[0]); gen_helper_divl_EAX(cpu_env, cpu_T[0]);
break; break;
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
case OT_QUAD: case OT_QUAD:
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
gen_helper_divq_EAX(cpu_T[0]); gen_helper_divq_EAX(cpu_env, cpu_T[0]);
break; break;
#endif #endif
} }
...@@ -4644,21 +4660,21 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -4644,21 +4660,21 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
switch(ot) { switch(ot) {
case OT_BYTE: case OT_BYTE:
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
gen_helper_idivb_AL(cpu_T[0]); gen_helper_idivb_AL(cpu_env, cpu_T[0]);
break; break;
case OT_WORD: case OT_WORD:
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
gen_helper_idivw_AX(cpu_T[0]); gen_helper_idivw_AX(cpu_env, cpu_T[0]);
break; break;
default: default:
case OT_LONG: case OT_LONG:
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
gen_helper_idivl_EAX(cpu_T[0]); gen_helper_idivl_EAX(cpu_env, cpu_T[0]);
break; break;
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
case OT_QUAD: case OT_QUAD:
gen_jmp_im(pc_start - s->cs_base); gen_jmp_im(pc_start - s->cs_base);
gen_helper_idivq_EAX(cpu_T[0]); gen_helper_idivq_EAX(cpu_env, cpu_T[0]);
break; break;
#endif #endif
} }
...@@ -4871,7 +4887,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -4871,7 +4887,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
if (ot == OT_QUAD) { if (ot == OT_QUAD) {
gen_helper_imulq_T0_T1(cpu_T[0], cpu_T[0], cpu_T[1]); gen_helper_imulq_T0_T1(cpu_T[0], cpu_env, cpu_T[0], cpu_T[1]);
} else } else
#endif #endif
if (ot == OT_LONG) { if (ot == OT_LONG) {
...@@ -6727,7 +6743,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -6727,7 +6743,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
goto illegal_op; goto illegal_op;
if (s->cc_op != CC_OP_DYNAMIC) if (s->cc_op != CC_OP_DYNAMIC)
gen_op_set_cc_op(s->cc_op); gen_op_set_cc_op(s->cc_op);
gen_helper_daa(); gen_helper_daa(cpu_env);
s->cc_op = CC_OP_EFLAGS; s->cc_op = CC_OP_EFLAGS;
break; break;
case 0x2f: /* das */ case 0x2f: /* das */
...@@ -6735,7 +6751,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -6735,7 +6751,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
goto illegal_op; goto illegal_op;
if (s->cc_op != CC_OP_DYNAMIC) if (s->cc_op != CC_OP_DYNAMIC)
gen_op_set_cc_op(s->cc_op); gen_op_set_cc_op(s->cc_op);
gen_helper_das(); gen_helper_das(cpu_env);
s->cc_op = CC_OP_EFLAGS; s->cc_op = CC_OP_EFLAGS;
break; break;
case 0x37: /* aaa */ case 0x37: /* aaa */
...@@ -6743,7 +6759,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -6743,7 +6759,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
goto illegal_op; goto illegal_op;
if (s->cc_op != CC_OP_DYNAMIC) if (s->cc_op != CC_OP_DYNAMIC)
gen_op_set_cc_op(s->cc_op); gen_op_set_cc_op(s->cc_op);
gen_helper_aaa(); gen_helper_aaa(cpu_env);
s->cc_op = CC_OP_EFLAGS; s->cc_op = CC_OP_EFLAGS;
break; break;
case 0x3f: /* aas */ case 0x3f: /* aas */
...@@ -6751,7 +6767,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -6751,7 +6767,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
goto illegal_op; goto illegal_op;
if (s->cc_op != CC_OP_DYNAMIC) if (s->cc_op != CC_OP_DYNAMIC)
gen_op_set_cc_op(s->cc_op); gen_op_set_cc_op(s->cc_op);
gen_helper_aas(); gen_helper_aas(cpu_env);
s->cc_op = CC_OP_EFLAGS; s->cc_op = CC_OP_EFLAGS;
break; break;
case 0xd4: /* aam */ case 0xd4: /* aam */
...@@ -6761,7 +6777,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -6761,7 +6777,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
if (val == 0) { if (val == 0) {
gen_exception(s, EXCP00_DIVZ, pc_start - s->cs_base); gen_exception(s, EXCP00_DIVZ, pc_start - s->cs_base);
} else { } else {
gen_helper_aam(tcg_const_i32(val)); gen_helper_aam(cpu_env, tcg_const_i32(val));
s->cc_op = CC_OP_LOGICB; s->cc_op = CC_OP_LOGICB;
} }
break; break;
...@@ -6769,7 +6785,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) ...@@ -6769,7 +6785,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
if (CODE64(s)) if (CODE64(s))
goto illegal_op; goto illegal_op;
val = ldub_code(s->pc++); val = ldub_code(s->pc++);
gen_helper_aad(tcg_const_i32(val)); gen_helper_aad(cpu_env, tcg_const_i32(val));
s->cc_op = CC_OP_LOGICB; s->cc_op = CC_OP_LOGICB;
break; break;
/************************/ /************************/
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或