mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-24 11:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

target/i386: move x86_64_hregs to DisasContext

Browse source 
And convert it to a bool to use an existing hole
in the struct.

Backports commit 1dbe15ef57abdf7b6a26c8e638abf6413a4b9d0c from qemu
This commit is contained in:
Emilio G. Cota 2018-10-04 04:02:47 -04:00 committed by Lioncash
parent 90e189ca24
commit b9bb6cead9
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
qemu/target/i386/translate.c
View file

@ -95,6 +95,9 @@ typedef struct DisasContext {
CCOp cc_op; /* current CC operation */ CCOp cc_op; /* current CC operation */
CCOp last_cc_op; /* Unicorn: last CC operation. Save this to see if cc_op has changed */ CCOp last_cc_op; /* Unicorn: last CC operation. Save this to see if cc_op has changed */
bool cc_op_dirty; bool cc_op_dirty;
#ifdef TARGET_X86_64
bool x86_64_hregs;
#endif
int addseg; /* non zero if either DS/ES/SS have a non zero base */ int addseg; /* non zero if either DS/ES/SS have a non zero base */
int f_st; /* currently unused */ int f_st; /* currently unused */
int vm86; /* vm86 mode */ int vm86; /* vm86 mode */
@ -374,13 +377,13 @@ static void gen_update_cc_op(DisasContext *s)
* [AH, CH, DH, BH], ie "bits 15..8 of register N-4". Return * [AH, CH, DH, BH], ie "bits 15..8 of register N-4". Return
* true for this special case, false otherwise. * true for this special case, false otherwise.
*/ */
static inline bool byte_reg_is_xH(int x86_64_hregs, int reg) static inline bool byte_reg_is_xH(DisasContext *s, int reg)
{ {
if (reg < 4) { if (reg < 4) {
return false; return false;
} }
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
if (reg >= 8 || x86_64_hregs) { if (reg >= 8 || s->x86_64_hregs) {
return false; return false;
} }
#endif #endif
@ -434,7 +437,7 @@ static void gen_op_mov_reg_v(DisasContext *s, TCGMemOp ot, int reg, TCGv t0)
switch(ot) { switch(ot) {
case MO_8: case MO_8:
if (!byte_reg_is_xH(tcg_ctx->x86_64_hregs, reg)) { if (!byte_reg_is_xH(s, reg)) {
tcg_gen_deposit_tl(tcg_ctx, cpu_regs[reg], cpu_regs[reg], t0, 0, 8); tcg_gen_deposit_tl(tcg_ctx, cpu_regs[reg], cpu_regs[reg], t0, 0, 8);
} else { } else {
tcg_gen_deposit_tl(tcg_ctx, cpu_regs[reg - 4], cpu_regs[reg - 4], t0, 8, 8); tcg_gen_deposit_tl(tcg_ctx, cpu_regs[reg - 4], cpu_regs[reg - 4], t0, 8, 8);
@ -463,7 +466,7 @@ static inline void gen_op_mov_v_reg(DisasContext *s, TCGMemOp ot, TCGv t0, int r
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv *cpu_regs = tcg_ctx->cpu_regs; TCGv *cpu_regs = tcg_ctx->cpu_regs;
if (ot == MO_8 && byte_reg_is_xH(tcg_ctx->x86_64_hregs, reg)) { if (ot == MO_8 && byte_reg_is_xH(s, reg)) {
tcg_gen_extract_tl(tcg_ctx, t0, cpu_regs[reg - 4], 8, 8); tcg_gen_extract_tl(tcg_ctx, t0, cpu_regs[reg - 4], 8, 8);
} else { } else {
tcg_gen_mov_tl(tcg_ctx, t0, cpu_regs[reg]); tcg_gen_mov_tl(tcg_ctx, t0, cpu_regs[reg]);
@ -4998,7 +5001,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
s->rex_x = 0; s->rex_x = 0;
s->rex_b = 0; s->rex_b = 0;
s->uc = env->uc; s->uc = env->uc;
tcg_ctx->x86_64_hregs = 0; s->x86_64_hregs = 0;
#endif #endif
s->rip_offset = 0; /* for relative ip address */ s->rip_offset = 0; /* for relative ip address */
s->vex_l = 0; s->vex_l = 0;
@ -5072,7 +5075,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
rex_r = (b & 0x4) << 1; rex_r = (b & 0x4) << 1;
s->rex_x = (b & 0x2) << 2; s->rex_x = (b & 0x2) << 2;
REX_B(s) = (b & 0x1) << 3; REX_B(s) = (b & 0x1) << 3;
tcg_ctx->x86_64_hregs = 1; /* select uniform byte register addressing */ s->x86_64_hregs = 1; /* select uniform byte register addressing */
goto next_byte; goto next_byte;
} }
break; break;
@ -5100,7 +5103,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
goto illegal_op; goto illegal_op;
} }
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
if (tcg_ctx->x86_64_hregs) { if (s->x86_64_hregs) {
goto illegal_op; goto illegal_op;
} }
#endif #endif
@ -6075,7 +6078,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
rm = (modrm & 7) | REX_B(s); rm = (modrm & 7) | REX_B(s);
if (mod == 3) { if (mod == 3) {
if (s_ot == MO_SB && byte_reg_is_xH(tcg_ctx->x86_64_hregs, rm)) { if (s_ot == MO_SB && byte_reg_is_xH(s, rm)) {
tcg_gen_sextract_tl(tcg_ctx, s->T0, cpu_regs[rm - 4], 8, 8); tcg_gen_sextract_tl(tcg_ctx, s->T0, cpu_regs[rm - 4], 8, 8);
} else { } else {
gen_op_mov_v_reg(s, ot, s->T0, rm); gen_op_mov_v_reg(s, ot, s->T0, rm);

1
qemu/tcg/tcg.h
View file

@ -819,7 +819,6 @@ struct TCGContext {
TCGv cpu_seg_base[6]; TCGv cpu_seg_base[6];
TCGv_i64 cpu_bndl[4]; TCGv_i64 cpu_bndl[4];
TCGv_i64 cpu_bndu[4]; TCGv_i64 cpu_bndu[4];
int x86_64_hregs; // qemu/target-i386/translate.c
/* qemu/target-i386/translate.c: global TCGv vars */ /* qemu/target-i386/translate.c: global TCGv vars */
TCGv cpu_cc_dst; TCGv cpu_cc_dst;