yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-25 07:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-i386: Use gen_lea_v_seg in gen_lea_modrm

Browse source 
Centralize handling of segment bases.

Backports commit d6a2914984c89fa0a3125b9842e0cbf68de79a3d from qemu
This commit is contained in:
Richard Henderson 2018-02-20 09:23:05 -05:00 committed by Lioncash
parent f3220dbb8c
commit 0d1766a9f0
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 23 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
qemu/target-i386/translate.c
View file

@ -2099,21 +2099,15 @@ static void gen_shifti(DisasContext *s, int op, TCGMemOp ot, int d, int c)
static void gen_lea_modrm(CPUX86State *env, DisasContext *s, int modrm) static void gen_lea_modrm(CPUX86State *env, DisasContext *s, int modrm)
{ {
target_long disp; target_long disp;
int havesib; int havesib, base, index, scale;
int base; int mod, rm, code, def_seg, ovr_seg;
int index;
int scale;
int mod, rm, code, override, must_add_seg;
TCGv sum; TCGv sum;
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv cpu_A0 = *(TCGv *)tcg_ctx->cpu_A0; TCGv cpu_A0 = *(TCGv *)tcg_ctx->cpu_A0;
TCGv cpu_tmp0 = *(TCGv *)tcg_ctx->cpu_tmp0;
TCGv **cpu_regs = (TCGv **)tcg_ctx->cpu_regs; TCGv **cpu_regs = (TCGv **)tcg_ctx->cpu_regs;
override = s->override; def_seg = R_DS;
must_add_seg = s->addseg; ovr_seg = s->override;
if (override >= 0)
must_add_seg = 1;
mod = (modrm >> 6) & 3; mod = (modrm >> 6) & 3;
rm = modrm & 7; rm = modrm & 7;
@ -2183,61 +2177,34 @@ static void gen_lea_modrm(CPUX86State *env, DisasContext *s, int modrm)
} }
if (TCGV_IS_UNUSED(sum)) { if (TCGV_IS_UNUSED(sum)) {
tcg_gen_movi_tl(tcg_ctx, cpu_A0, disp); tcg_gen_movi_tl(tcg_ctx, cpu_A0, disp);
} else { sum = cpu_A0;
} else if (disp != 0) {
tcg_gen_addi_tl(tcg_ctx, cpu_A0, sum, disp); tcg_gen_addi_tl(tcg_ctx, cpu_A0, sum, disp);
sum = cpu_A0;
} }
if (must_add_seg) {
if (override < 0) {
if (base == R_EBP || base == R_ESP) { if (base == R_EBP || base == R_ESP) {
override = R_SS; def_seg = R_SS;
} else {
override = R_DS;
}
}
tcg_gen_ld_tl(tcg_ctx, cpu_tmp0, tcg_ctx->cpu_env,
offsetof(CPUX86State, segs[override].base));
if (CODE64(s)) {
if (s->aflag == MO_32) {
tcg_gen_ext32u_tl(tcg_ctx, cpu_A0, cpu_A0);
}
tcg_gen_add_tl(tcg_ctx, cpu_A0, cpu_A0, cpu_tmp0);
return;
}
tcg_gen_add_tl(tcg_ctx, cpu_A0, cpu_A0, cpu_tmp0);
}
if (s->aflag == MO_32) {
tcg_gen_ext32u_tl(tcg_ctx, cpu_A0, cpu_A0);
} }
break; break;
case MO_16: case MO_16:
switch (mod) { sum = cpu_A0;
case 0: if (mod == 0) {
if (rm == 6) { if (rm == 6) {
disp = cpu_lduw_code(env, s->pc); disp = cpu_lduw_code(env, s->pc);
s->pc += 2; s->pc += 2;
tcg_gen_movi_tl(tcg_ctx, cpu_A0, disp); tcg_gen_movi_tl(tcg_ctx, cpu_A0, disp);
rm = 0; /* avoid SS override */ break;
goto no_rm;
} else {
disp = 0;
} }
break; disp = 0;
case 1: } else if (mod == 1) {
disp = (int8_t)cpu_ldub_code(env, s->pc++); disp = (int8_t)cpu_ldub_code(env, s->pc++);
break; } else {
default:
case 2:
disp = (int16_t)cpu_lduw_code(env, s->pc); disp = (int16_t)cpu_lduw_code(env, s->pc);
s->pc += 2; s->pc += 2;
break;
} }
sum = cpu_A0;
switch (rm) { switch (rm) {
case 0: case 0:
tcg_gen_add_tl(tcg_ctx, cpu_A0, *cpu_regs[R_EBX], *cpu_regs[R_ESI]); tcg_gen_add_tl(tcg_ctx, cpu_A0, *cpu_regs[R_EBX], *cpu_regs[R_ESI]);
@ -2247,9 +2214,11 @@ static void gen_lea_modrm(CPUX86State *env, DisasContext *s, int modrm)
break; break;
case 2: case 2:
tcg_gen_add_tl(tcg_ctx, cpu_A0, *cpu_regs[R_EBP], *cpu_regs[R_ESI]); tcg_gen_add_tl(tcg_ctx, cpu_A0, *cpu_regs[R_EBP], *cpu_regs[R_ESI]);
def_seg = R_SS;
break; break;
case 3: case 3:
tcg_gen_add_tl(tcg_ctx, cpu_A0, *cpu_regs[R_EBP], *cpu_regs[R_EDI]); tcg_gen_add_tl(tcg_ctx, cpu_A0, *cpu_regs[R_EBP], *cpu_regs[R_EDI]);
def_seg = R_SS;
break; break;
case 4: case 4:
sum = *cpu_regs[R_ESI]; sum = *cpu_regs[R_ESI];
@ -2259,6 +2228,7 @@ static void gen_lea_modrm(CPUX86State *env, DisasContext *s, int modrm)
break; break;
case 6: case 6:
sum = *cpu_regs[R_EBP]; sum = *cpu_regs[R_EBP];
def_seg = R_SS;
break; break;
default: default:
case 7: case 7:
@ -2267,22 +2237,17 @@ static void gen_lea_modrm(CPUX86State *env, DisasContext *s, int modrm)
} }
tcg_gen_addi_tl(tcg_ctx, cpu_A0, sum, disp); tcg_gen_addi_tl(tcg_ctx, cpu_A0, sum, disp);
tcg_gen_ext16u_tl(tcg_ctx, cpu_A0, cpu_A0); tcg_gen_ext16u_tl(tcg_ctx, cpu_A0, cpu_A0);
no_rm: if (disp != 0) {
if (must_add_seg) { tcg_gen_addi_tl(tcg_ctx, cpu_A0, sum, disp);
if (override < 0) { sum = cpu_A0;
if (rm == 2 || rm == 3 || rm == 6) {
override = R_SS;
} else {
override = R_DS;
}
}
gen_op_addl_A0_seg(s, override);
} }
break; break;
default: default:
tcg_abort(); tcg_abort();
} }
gen_lea_v_seg(s, sum, def_seg, ovr_seg);
} }
static void gen_nop_modrm(CPUX86State *env, DisasContext *s, int modrm) static void gen_nop_modrm(CPUX86State *env, DisasContext *s, int modrm)