This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: Bug in operands to IA32 cvtps2dq instruction in gnu as
This should fix twobyte_has_modrm, and ring bells in the future when
people add new opcodes without updating the table. Makes your patch
redundant H.J., and in any case it wasn't a fix except when the modrm
byte just happenned to be zero.
* i386-dis.c (twobyte_has_modrm): Update table.
(need_modrm): Give it file scope.
(MODRM_CHECK): Define.
(dofloat): Use MODRM_CHECK.
(OP_E): Likewise.
(OP_EM): Likewise.
(OP_EX): Likewise.
Fixing twobyte_has_modrm showed up yet another problem with sse2.d
--
Alan Modra
Index: opcodes/i386-dis.c
===================================================================
RCS file: /cvs/src/src/opcodes/i386-dis.c,v
retrieving revision 1.21
diff -u -p -r1.21 i386-dis.c
--- i386-dis.c 2001/05/12 09:52:37 1.21
+++ i386-dis.c 2001/05/12 11:21:17
@@ -2228,20 +2228,20 @@ static const unsigned char twobyte_has_m
/* ------------------------------- */
/* 00 */ 1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0f */
/* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0, /* 1f */
- /* 20 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 2f */
+ /* 20 */ 1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 2f */
/* 30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 3f */
/* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 4f */
- /* 50 */ 1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1, /* 5f */
- /* 60 */ 1,1,1,1,1,1,1,1,1,1,1,1,0,0,1,1, /* 6f */
+ /* 50 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 5f */
+ /* 60 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 6f */
/* 70 */ 1,1,1,1,1,1,1,0,0,0,0,0,0,0,1,1, /* 7f */
/* 80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 8f */
/* 90 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 9f */
- /* a0 */ 0,0,0,1,1,1,1,1,0,0,0,1,1,1,1,1, /* af */
+ /* a0 */ 0,0,0,1,1,1,0,0,0,0,0,1,1,1,1,1, /* af */
/* b0 */ 1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,1, /* bf */
/* c0 */ 1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0, /* cf */
- /* d0 */ 0,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1, /* df */
- /* e0 */ 1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1, /* ef */
- /* f0 */ 0,1,1,1,0,1,1,1,1,1,1,1,1,1,1,0 /* ff */
+ /* d0 */ 0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* df */
+ /* e0 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* ef */
+ /* f0 */ 0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0 /* ff */
/* ------------------------------- */
/* 0 1 2 3 4 5 6 7 8 9 a b c d e f */
};
@@ -2279,8 +2279,14 @@ static disassemble_info *the_info;
static int mod;
static int rm;
static int reg;
+static unsigned char need_modrm;
static void oappend PARAMS ((const char *s));
+/* If we are accessing mod/rm/reg without need_modrm set, then the
+ values are stale. Hitting this abort likely indicates that you
+ need to update onebyte_has_modrm or twobyte_has_modrm. */
+#define MODRM_CHECK if (!need_modrm) abort ()
+
static const char *names64[] = {
"%rax","%rcx","%rdx","%rbx", "%rsp","%rbp","%rsi","%rdi",
"%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
@@ -2989,7 +2995,6 @@ print_insn_i386 (pc, info)
int two_source_ops;
char *first, *second, *third;
int needcomma;
- unsigned char need_modrm;
unsigned char uses_SSE_prefix;
VOLATILE int sizeflag;
VOLATILE int orig_sizeflag;
@@ -3624,6 +3629,8 @@ dofloat (sizeflag)
OP_E (v_mode, sizeflag);
return;
}
+ /* skip mod/rm byte */
+ MODRM_CHECK;
codep++;
dp = &float_reg[floatop - 0xd8][reg];
@@ -4038,6 +4045,7 @@ OP_E (bytemode, sizeflag)
add += 8;
/* skip mod/rm byte */
+ MODRM_CHECK;
codep++;
if (mod == 3)
@@ -4927,6 +4935,8 @@ OP_EM (bytemode, sizeflag)
if (rex & REX_EXTZ)
add = 8;
+ /* skip mod/rm byte */
+ MODRM_CHECK;
codep++;
used_prefixes |= (prefixes & PREFIX_DATA);
if (prefixes & PREFIX_DATA)
@@ -4951,6 +4961,8 @@ OP_EX (bytemode, sizeflag)
if (rex & REX_EXTZ)
add = 8;
+ /* skip mod/rm byte */
+ MODRM_CHECK;
codep++;
sprintf (scratchbuf, "%%xmm%d", rm + add);
oappend (scratchbuf);
Index: gas/testsuite/gas/i386/sse2.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/i386/sse2.d,v
retrieving revision 1.5
diff -u -p -r1.5 sse2.d
--- sse2.d 2001/05/12 10:28:20 1.5
+++ sse2.d 2001/05/12 11:40:54
@@ -152,5 +152,5 @@ Disassembly of section .text:
26b: f2 0f 70 c8 01[ ]+pshuflw \$0x1,%xmm0,%xmm1
270: 66 0f 73 f8 01[ ]+pslldq \$0x1,%xmm0
275: 66 0f 73 d8 01[ ]+psrldq \$0x1,%xmm0
- 27a: 66 0f 6d c8[ ]+punpckhqdq %xmm0,%xmm3
+ 27a: 66 0f 6d c8[ ]+punpckhqdq %xmm0,%xmm1
27e: 89 f6[ ]+mov[ ]+%esi,%esi