Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
tcg/i386: Generalize multi-part load overlap test 
Test for both base and index; use datahi as a temporary, overwritten
by the final load.  Always perform the loads in ascending order, so
that any (user-only) fault sees the correct address.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
@rth7680
rth7680 committed May 5, 2023
1 parent bf12e22 commit 3174941
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions tcg/i386/tcg-target.c.inc
View file
Expand Up @@ -2221,23 +2221,22 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg datalo, TCGReg datahi,
if (TCG_TARGET_REG_BITS == 64) {
tcg_out_modrm_sib_offset(s, movop + P_REXW + seg, datalo,
base, index, 0, ofs);
break;
}
if (use_movbe) {
TCGReg t = datalo;
datalo = datahi;
datahi = t;
}
if (base == datalo || index == datalo) {
tcg_out_modrm_sib_offset(s, OPC_LEA, datahi, base, index, 0, ofs);
tcg_out_modrm_offset(s, movop + seg, datalo, datahi, 0);
tcg_out_modrm_offset(s, movop + seg, datahi, datahi, 4);
} else {
if (use_movbe) {
TCGReg t = datalo;
datalo = datahi;
datahi = t;
}
if (base != datalo) {
tcg_out_modrm_sib_offset(s, movop + seg, datalo,
base, index, 0, ofs);
tcg_out_modrm_sib_offset(s, movop + seg, datahi,
base, index, 0, ofs + 4);
} else {
tcg_out_modrm_sib_offset(s, movop + seg, datahi,
base, index, 0, ofs + 4);
tcg_out_modrm_sib_offset(s, movop + seg, datalo,
base, index, 0, ofs);
}
tcg_out_modrm_sib_offset(s, movop + seg, datalo,
base, index, 0, ofs);
tcg_out_modrm_sib_offset(s, movop + seg, datahi,
base, index, 0, ofs + 4);
}
break;
default:
Expand Down

0 comments on commit 3174941

Please sign in to comment.