From: Joseph Myers Date: Tue, 8 Aug 2017 23:51:29 +0000 (+0000) Subject: target/i386: set rip_offset for further SSE instructions X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c6a8242915328cda0df0fbc0803da3448137e614;p=qemu.git target/i386: set rip_offset for further SSE instructions It turns out that my recent fix to set rip_offset when emulating some SSE4.1 instructions needs generalizing to cover a wider class of instructions. Specifically, every instruction in the sse_op_table7 table, coming from various instruction set extensions, has an 8-bit immediate operand that comes after any memory operand, and so needs rip_offset set for correctness if there is a memory operand that is rip-relative, and my patch only set it for a subset of those instructions. This patch moves the rip_offset setting to cover the wider class of instructions, so fixing 9 further gcc testsuite failures in my GCC 6-based testing. (I do not know whether there might be still further classes of instructions missing this setting.) Signed-off-by: Joseph Myers Message-Id: Signed-off-by: Paolo Bonzini --- diff --git a/target/i386/translate.c b/target/i386/translate.c index de0c989763..a8986f4c1a 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -4076,10 +4076,11 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, if (!(s->cpuid_ext_features & sse_op_table7[b].ext_mask)) goto illegal_op; + s->rip_offset = 1; + if (sse_fn_eppi == SSE_SPECIAL) { ot = mo_64_32(s->dflag); rm = (modrm & 7) | REX_B(s); - s->rip_offset = 1; if (mod != 3) gen_lea_modrm(env, s, modrm); reg = ((modrm >> 3) & 7) | rex_r;