diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-10-04 11:33:52 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-10-04 11:33:52 +0000 |
| commit | 000cacf6f9dce7d71f88aadf7e9b3688eaa3ab69 (patch) | |
| tree | 1251548122e5b9104facc48e228db900d0b738f9 | |
| parent | 9dc63a1efd50ab6f792b165dffe176547350bfcc (diff) | |
Fix crc32w decoding, fix a constant width in blendvpd.
Forced the constant's width to long long so that it doesn't overflow,
problem spotted by C. W. Betts.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5417 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | target-i386/ops_sse.h | 2 | ||||
| -rw-r--r-- | target-i386/translate.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/target-i386/ops_sse.h b/target-i386/ops_sse.h index 1f1db50241..7d7834fe6f 100644 --- a/target-i386/ops_sse.h +++ b/target-i386/ops_sse.h @@ -1481,7 +1481,7 @@ void glue(name, SUFFIX) (Reg *d, Reg *s, uint32_t imm)\ /* SSE4.1 op helpers */ #define FBLENDVB(d, s, m) (m & 0x80) ? s : d #define FBLENDVPS(d, s, m) (m & 0x80000000) ? s : d -#define FBLENDVPD(d, s, m) (m & 0x8000000000000000) ? s : d +#define FBLENDVPD(d, s, m) (m & 0x8000000000000000LL) ? s : d SSE_HELPER_V(helper_pblendvb, B, 16, FBLENDVB) SSE_HELPER_V(helper_blendvps, L, 4, FBLENDVPS) SSE_HELPER_V(helper_blendvpd, Q, 2, FBLENDVPD) diff --git a/target-i386/translate.c b/target-i386/translate.c index 681688c207..598c6f9c6c 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -3568,17 +3568,16 @@ static void gen_sse(DisasContext *s, int b, target_ulong pc_start, int rex_r) reg = ((modrm >> 3) & 7) | rex_r; gen_op_mov_reg_T0(OT_LONG, reg); break; - case 0x038: case 0x138: + if (s->prefix & PREFIX_REPNZ) + goto crc32; + case 0x038: b = modrm; modrm = ldub_code(s->pc++); rm = modrm & 7; reg = ((modrm >> 3) & 7) | rex_r; mod = (modrm >> 6) & 3; - if (s->prefix & PREFIX_REPNZ) - goto crc32; - sse_op2 = sse_op_table6[b].op[b1]; if (!sse_op2) goto illegal_op; |