motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 06:21:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tcg/i386: Generalize multi-part load overlap test

Browse source 
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>
This commit is contained in:
Richard Henderson 2023-04-16 15:56:41 +02:00
parent bf12e2240d
commit 3174941fe0
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tcg/i386/tcg-target.c.inc
View file

@ -2221,23 +2221,22 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg datalo, TCGReg datahi,
if (TCG_TARGET_REG_BITS == 64) { if (TCG_TARGET_REG_BITS == 64) {
tcg_out_modrm_sib_offset(s, movop + P_REXW + seg, datalo, tcg_out_modrm_sib_offset(s, movop + P_REXW + seg, datalo,
base, index, 0, ofs); base, index, 0, ofs);
} else { break;
}
if (use_movbe) { if (use_movbe) {
TCGReg t = datalo; TCGReg t = datalo;
datalo = datahi; datalo = datahi;
datahi = t; datahi = t;
} }
if (base != datalo) { if (base == datalo || index == datalo) {
tcg_out_modrm_sib_offset(s, movop + seg, datalo, tcg_out_modrm_sib_offset(s, OPC_LEA, datahi, base, index, 0, ofs);
base, index, 0, ofs); tcg_out_modrm_offset(s, movop + seg, datalo, datahi, 0);
tcg_out_modrm_sib_offset(s, movop + seg, datahi, tcg_out_modrm_offset(s, movop + seg, datahi, datahi, 4);
base, index, 0, ofs + 4);
} else { } else {
tcg_out_modrm_sib_offset(s, movop + seg, datahi,
base, index, 0, ofs + 4);
tcg_out_modrm_sib_offset(s, movop + seg, datalo, tcg_out_modrm_sib_offset(s, movop + seg, datalo,
base, index, 0, ofs); base, index, 0, ofs);
} tcg_out_modrm_sib_offset(s, movop + seg, datahi,
base, index, 0, ofs + 4);
} }
break; break;
default: default: