* gas/i386/katmai.d: Adjust for changed sib printing.

	* gas/i386/prescott.d: Likewise.
	* gas/i386/sse2.d: Likewise.
	* gas/i386/ssemmx2.d: Likewise.

5 files changed, 31 insertions, 24 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c98cba9997..234176815b 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* gas/i386/katmai.d: Adjust for changed sib printing.
+	* gas/i386/prescott.d: Likewise.
+	* gas/i386/sse2.d: Likewise.
+	* gas/i386/ssemmx2.d: Likewise.
+
 2004-01-16  Alexandre Oliva  <aoliva@redhat.com>
 
 	* gas/mn10300/mov5.s: New.
diff --git a/gas/testsuite/gas/i386/katmai.d b/gas/testsuite/gas/i386/katmai.d
index 8c681de8a0..b1fc77d86e 100644
--- a/gas/testsuite/gas/i386/katmai.d
+++ b/gas/testsuite/gas/i386/katmai.d
@@ -17,7 +17,7 @@ Disassembly of section .text:
   1b:	0f c2 c1 02 [ 	]*cmpleps %xmm1,%xmm0
   1f:	0f c2 0a 03 [ 	]*cmpunordps \(%edx\),%xmm1
   23:	f3 0f c2 d2 04 [ 	]*cmpneqss %xmm2,%xmm2
-  28:	f3 0f c2 1c 24 05 [ 	]*cmpnltss \(%esp,1\),%xmm3
+  28:	f3 0f c2 1c 24 05 [ 	]*cmpnltss \(%esp\),%xmm3
   2e:	0f c2 e5 06 [ 	]*cmpnleps %xmm5,%xmm4
   32:	0f c2 2e 07 [ 	]*cmpordps \(%esi\),%xmm5
   36:	f3 0f c2 f7 00 [ 	]*cmpeqss %xmm7,%xmm6
@@ -25,7 +25,7 @@ Disassembly of section .text:
   40:	0f c2 c1 00 [ 	]*cmpeqps %xmm1,%xmm0
   44:	0f c2 0a 00 [ 	]*cmpeqps \(%edx\),%xmm1
   48:	f3 0f c2 d2 00 [ 	]*cmpeqss %xmm2,%xmm2
-  4d:	f3 0f c2 1c 24 00 [ 	]*cmpeqss \(%esp,1\),%xmm3
+  4d:	f3 0f c2 1c 24 00 [ 	]*cmpeqss \(%esp\),%xmm3
   53:	0f c2 e5 01 [ 	]*cmpltps %xmm5,%xmm4
   57:	0f c2 2e 01 [ 	]*cmpltps \(%esi\),%xmm5
   5b:	f3 0f c2 f7 01 [ 	]*cmpltss %xmm7,%xmm6
@@ -41,7 +41,7 @@ Disassembly of section .text:
   8a:	0f c2 c1 04 [ 	]*cmpneqps %xmm1,%xmm0
   8e:	0f c2 0a 04 [ 	]*cmpneqps \(%edx\),%xmm1
   92:	f3 0f c2 d2 04 [ 	]*cmpneqss %xmm2,%xmm2
-  97:	f3 0f c2 1c 24 04 [ 	]*cmpneqss \(%esp,1\),%xmm3
+  97:	f3 0f c2 1c 24 04 [ 	]*cmpneqss \(%esp\),%xmm3
   9d:	0f c2 e5 05 [ 	]*cmpnltps %xmm5,%xmm4
   a1:	0f c2 2e 05 [ 	]*cmpnltps \(%esi\),%xmm5
   a5:	f3 0f c2 f7 05 [ 	]*cmpnltss %xmm7,%xmm6
@@ -57,7 +57,7 @@ Disassembly of section .text:
   d4:	0f 2f c1 [ 	]*comiss %xmm1,%xmm0
   d7:	0f 2f 0a [ 	]*comiss \(%edx\),%xmm1
   da:	0f 2a d3 [ 	]*cvtpi2ps %mm3,%xmm2
-  dd:	0f 2a 1c 24 [ 	]*cvtpi2ps \(%esp,1\),%xmm3
+  dd:	0f 2a 1c 24 [ 	]*cvtpi2ps \(%esp\),%xmm3
   e1:	f3 0f 2a e5 [ 	]*cvtsi2ss %ebp,%xmm4
   e5:	f3 0f 2a 2e [ 	]*cvtsi2ss \(%esi\),%xmm5
   e9:	0f 2d f7 [ 	]*cvtps2pi %xmm7,%mm6
@@ -71,14 +71,14 @@ Disassembly of section .text:
  106:	0f 5e c1 [ 	]*divps  %xmm1,%xmm0
  109:	0f 5e 0a [ 	]*divps  \(%edx\),%xmm1
  10c:	f3 0f 5e d3 [ 	]*divss  %xmm3,%xmm2
- 110:	f3 0f 5e 1c 24 [ 	]*divss  \(%esp,1\),%xmm3
+ 110:	f3 0f 5e 1c 24 [ 	]*divss  \(%esp\),%xmm3
  115:	0f ae 55 00 [ 	]*ldmxcsr 0x0\(%ebp\)
  119:	0f ae 1e [ 	]*stmxcsr \(%esi\)
  11c:	0f ae f8 [ 	]*sfence 
  11f:	0f 5f c1 [ 	]*maxps  %xmm1,%xmm0
  122:	0f 5f 0a [ 	]*maxps  \(%edx\),%xmm1
  125:	f3 0f 5f d3 [ 	]*maxss  %xmm3,%xmm2
- 129:	f3 0f 5f 1c 24 [ 	]*maxss  \(%esp,1\),%xmm3
+ 129:	f3 0f 5f 1c 24 [ 	]*maxss  \(%esp\),%xmm3
  12e:	0f 5d e5 [ 	]*minps  %xmm5,%xmm4
  131:	0f 5d 2e [ 	]*minps  \(%esi\),%xmm5
  134:	f3 0f 5d f7 [ 	]*minss  %xmm7,%xmm6
@@ -87,7 +87,7 @@ Disassembly of section .text:
  13f:	0f 29 11 [ 	]*movaps %xmm2,\(%ecx\)
  142:	0f 28 12 [ 	]*movaps \(%edx\),%xmm2
  145:	0f 16 dc [ 	]*movlhps %xmm4,%xmm3
- 148:	0f 17 2c 24 [ 	]*movhps %xmm5,\(%esp,1\)
+ 148:	0f 17 2c 24 [ 	]*movhps %xmm5,\(%esp\)
  14c:	0f 16 2e [ 	]*movhps \(%esi\),%xmm5
  14f:	0f 12 f7 [ 	]*movhlps %xmm7,%xmm6
  152:	0f 13 07 [ 	]*movlps %xmm0,\(%edi\)
@@ -102,7 +102,7 @@ Disassembly of section .text:
  171:	0f 59 c1 [ 	]*mulps  %xmm1,%xmm0
  174:	0f 59 0a [ 	]*mulps  \(%edx\),%xmm1
  177:	f3 0f 59 d2 [ 	]*mulss  %xmm2,%xmm2
- 17b:	f3 0f 59 1c 24 [ 	]*mulss  \(%esp,1\),%xmm3
+ 17b:	f3 0f 59 1c 24 [ 	]*mulss  \(%esp\),%xmm3
  180:	0f 56 e5 [ 	]*orps   %xmm5,%xmm4
  183:	0f 56 2e [ 	]*orps   \(%esi\),%xmm5
  186:	0f 53 f7 [ 	]*rcpps  %xmm7,%xmm6
@@ -118,7 +118,7 @@ Disassembly of section .text:
  1ab:	0f 51 c1 [ 	]*sqrtps %xmm1,%xmm0
  1ae:	0f 51 0a [ 	]*sqrtps \(%edx\),%xmm1
  1b1:	f3 0f 51 d2 [ 	]*sqrtss %xmm2,%xmm2
- 1b5:	f3 0f 51 1c 24 [ 	]*sqrtss \(%esp,1\),%xmm3
+ 1b5:	f3 0f 51 1c 24 [ 	]*sqrtss \(%esp\),%xmm3
  1ba:	0f 5c e5 [ 	]*subps  %xmm5,%xmm4
  1bd:	0f 5c 2e [ 	]*subps  \(%esi\),%xmm5
  1c0:	f3 0f 5c f7 [ 	]*subss  %xmm7,%xmm6
@@ -134,14 +134,14 @@ Disassembly of section .text:
  1e1:	0f e0 c1 [ 	]*pavgb  %mm1,%mm0
  1e4:	0f e0 0a [ 	]*pavgb  \(%edx\),%mm1
  1e7:	0f e3 d3 [ 	]*pavgw  %mm3,%mm2
- 1ea:	0f e3 1c 24 [ 	]*pavgw  \(%esp,1\),%mm3
+ 1ea:	0f e3 1c 24 [ 	]*pavgw  \(%esp\),%mm3
  1ee:	0f c5 c1 00 [ 	]*pextrw \$0x0,%mm1,%eax
  1f2:	0f c4 09 01 [ 	]*pinsrw \$0x1,\(%ecx\),%mm1
  1f6:	0f c4 d2 02 [ 	]*pinsrw \$0x2,%edx,%mm2
  1fa:	0f ee c1 [ 	]*pmaxsw %mm1,%mm0
  1fd:	0f ee 0a [ 	]*pmaxsw \(%edx\),%mm1
  200:	0f de d2 [ 	]*pmaxub %mm2,%mm2
- 203:	0f de 1c 24 [ 	]*pmaxub \(%esp,1\),%mm3
+ 203:	0f de 1c 24 [ 	]*pmaxub \(%esp\),%mm3
  207:	0f ea e5 [ 	]*pminsw %mm5,%mm4
  20a:	0f ea 2e [ 	]*pminsw \(%esi\),%mm5
  20d:	0f da f7 [ 	]*pminub %mm7,%mm6
diff --git a/gas/testsuite/gas/i386/prescott.d b/gas/testsuite/gas/i386/prescott.d
index 9c5ba9256c..78609a7db2 100644
--- a/gas/testsuite/gas/i386/prescott.d
+++ b/gas/testsuite/gas/i386/prescott.d
@@ -22,7 +22,7 @@ Disassembly of section .text:
   3f:	66 0f 7d c1 [ 	]*hsubpd %xmm1,%xmm0
   43:	66 0f 7d 0a [ 	]*hsubpd \(%edx\),%xmm1
   47:	f2 0f 7d d2 [ 	]*hsubps %xmm2,%xmm2
-  4b:	f2 0f 7d 1c 24 [ 	]*hsubps \(%esp,1\),%xmm3
+  4b:	f2 0f 7d 1c 24 [ 	]*hsubps \(%esp\),%xmm3
   50:	f2 0f f0 2e [ 	]*lddqu  \(%esi\),%xmm5
   54:	0f 01 c8 [ 	]*monitor %eax,%ecx,%edx 
   57:	0f 01 c8 [ 	]*monitor %eax,%ecx,%edx 
diff --git a/gas/testsuite/gas/i386/sse2.d b/gas/testsuite/gas/i386/sse2.d
index b7aa48909d..eb6a161cbf 100644
--- a/gas/testsuite/gas/i386/sse2.d
+++ b/gas/testsuite/gas/i386/sse2.d
@@ -22,7 +22,7 @@ Disassembly of section .text:
 [ 	]+2d:	66 0f c2 c1 02[ 	]+cmplepd %xmm1,%xmm0
 [ 	]+32:	66 0f c2 0a 03[ 	]+cmpunordpd \(%edx\),%xmm1
 [ 	]+37:	f2 0f c2 d2 04[ 	]+cmpneqsd %xmm2,%xmm2
-[ 	]+3c:	f2 0f c2 1c 24 05[ 	]+cmpnltsd \(%esp,1\),%xmm3
+[ 	]+3c:	f2 0f c2 1c 24 05[ 	]+cmpnltsd \(%esp\),%xmm3
 [ 	]+42:	66 0f c2 e5 06[ 	]+cmpnlepd %xmm5,%xmm4
 [ 	]+47:	66 0f c2 2e 07[ 	]+cmpordpd \(%esi\),%xmm5
 [ 	]+4c:	f2 0f c2 f7 00[ 	]+cmpeqsd %xmm7,%xmm6
@@ -30,7 +30,7 @@ Disassembly of section .text:
 [ 	]+56:	66 0f c2 c1 00[ 	]+cmpeqpd %xmm1,%xmm0
 [ 	]+5b:	66 0f c2 0a 00[ 	]+cmpeqpd \(%edx\),%xmm1
 [ 	]+60:	f2 0f c2 d2 00[ 	]+cmpeqsd %xmm2,%xmm2
-[ 	]+65:	f2 0f c2 1c 24 00[ 	]+cmpeqsd \(%esp,1\),%xmm3
+[ 	]+65:	f2 0f c2 1c 24 00[ 	]+cmpeqsd \(%esp\),%xmm3
 [ 	]+6b:	66 0f c2 e5 01[ 	]+cmpltpd %xmm5,%xmm4
 [ 	]+70:	66 0f c2 2e 01[ 	]+cmpltpd \(%esi\),%xmm5
 [ 	]+75:	f2 0f c2 f7 01[ 	]+cmpltsd %xmm7,%xmm6
@@ -46,7 +46,7 @@ Disassembly of section .text:
 [ 	]+a8:	66 0f c2 c1 04[ 	]+cmpneqpd %xmm1,%xmm0
 [ 	]+ad:	66 0f c2 0a 04[ 	]+cmpneqpd \(%edx\),%xmm1
 [ 	]+b2:	f2 0f c2 d2 04[ 	]+cmpneqsd %xmm2,%xmm2
-[ 	]+b7:	f2 0f c2 1c 24 04[ 	]+cmpneqsd \(%esp,1\),%xmm3
+[ 	]+b7:	f2 0f c2 1c 24 04[ 	]+cmpneqsd \(%esp\),%xmm3
 [ 	]+bd:	66 0f c2 e5 05[ 	]+cmpnltpd %xmm5,%xmm4
 [ 	]+c2:	66 0f c2 2e 05[ 	]+cmpnltpd \(%esi\),%xmm5
 [ 	]+c7:	f2 0f c2 f7 05[ 	]+cmpnltsd %xmm7,%xmm6
@@ -62,7 +62,7 @@ Disassembly of section .text:
 [ 	]+fa:	66 0f 2f c1[ 	]+comisd %xmm1,%xmm0
 [ 	]+fe:	66 0f 2f 0a[ 	]+comisd \(%edx\),%xmm1
  102:	66 0f 2a d3[ 	]+cvtpi2pd %xmm3,%xmm2
- 106:	66 0f 2a 1c 24[ 	]+cvtpi2pd \(%esp,1\),%xmm3
+ 106:	66 0f 2a 1c 24[ 	]+cvtpi2pd \(%esp\),%xmm3
  10b:	f2 0f 2a e5[ 	]+cvtsi2sd %ebp,%xmm4
  10f:	f2 0f 2a 2e[ 	]+cvtsi2sd \(%esi\),%xmm5
  113:	66 0f 2d f7[ 	]+cvtpd2pi %xmm7,%xmm6
@@ -76,14 +76,14 @@ Disassembly of section .text:
  134:	66 0f 5e c1[ 	]+divpd[ 	]+%xmm1,%xmm0
  138:	66 0f 5e 0a[ 	]+divpd[ 	]+\(%edx\),%xmm1
  13c:	f2 0f 5e d3[ 	]+divsd[ 	]+%xmm3,%xmm2
- 140:	f2 0f 5e 1c 24[ 	]+divsd[ 	]+\(%esp,1\),%xmm3
+ 140:	f2 0f 5e 1c 24[ 	]+divsd[ 	]+\(%esp\),%xmm3
  145:	0f ae 55 00[ 	]+ldmxcsr 0x0\(%ebp\)
  149:	0f ae 1e[ 	]+stmxcsr \(%esi\)
  14c:	0f ae f8[ 	]+sfence 
  14f:	66 0f 5f c1[ 	]+maxpd[ 	]+%xmm1,%xmm0
  153:	66 0f 5f 0a[ 	]+maxpd[ 	]+\(%edx\),%xmm1
  157:	f2 0f 5f d3[ 	]+maxsd[ 	]+%xmm3,%xmm2
- 15b:	f2 0f 5f 1c 24[ 	]+maxsd[ 	]+\(%esp,1\),%xmm3
+ 15b:	f2 0f 5f 1c 24[ 	]+maxsd[ 	]+\(%esp\),%xmm3
  160:	66 0f 5d e5[ 	]+minpd[ 	]+%xmm5,%xmm4
  164:	66 0f 5d 2e[ 	]+minpd[ 	]+\(%esi\),%xmm5
  168:	f2 0f 5d f7[ 	]+minsd[ 	]+%xmm7,%xmm6
@@ -91,7 +91,7 @@ Disassembly of section .text:
  170:	66 0f 28 c1[ 	]+movapd %xmm1,%xmm0
  174:	66 0f 29 11[ 	]+movapd %xmm2,\(%ecx\)
  178:	66 0f 28 12[ 	]+movapd \(%edx\),%xmm2
- 17c:	66 0f 17 2c 24[ 	]+movhpd %xmm5,\(%esp,1\)
+ 17c:	66 0f 17 2c 24[ 	]+movhpd %xmm5,\(%esp\)
  181:	66 0f 16 2e[ 	]+movhpd \(%esi\),%xmm5
  185:	66 0f 13 07[ 	]+movlpd %xmm0,\(%edi\)
  189:	66 0f 12 00[ 	]+movlpd \(%eax\),%xmm0
@@ -105,7 +105,7 @@ Disassembly of section .text:
  1aa:	66 0f 59 c1[ 	]+mulpd[ 	]+%xmm1,%xmm0
  1ae:	66 0f 59 0a[ 	]+mulpd[ 	]+\(%edx\),%xmm1
  1b2:	f2 0f 59 d2[ 	]+mulsd[ 	]+%xmm2,%xmm2
- 1b6:	f2 0f 59 1c 24[ 	]+mulsd[ 	]+\(%esp,1\),%xmm3
+ 1b6:	f2 0f 59 1c 24[ 	]+mulsd[ 	]+\(%esp\),%xmm3
  1bb:	66 0f 56 e5[ 	]+orpd[ 	]+%xmm5,%xmm4
  1bf:	66 0f 56 2e[ 	]+orpd[ 	]+\(%esi\),%xmm5
  1c3:	66 0f c6 37 02[ 	]+shufpd \$0x2,\(%edi\),%xmm6
@@ -113,7 +113,7 @@ Disassembly of section .text:
  1cd:	66 0f 51 c1[ 	]+sqrtpd %xmm1,%xmm0
  1d1:	66 0f 51 0a[ 	]+sqrtpd \(%edx\),%xmm1
  1d5:	f2 0f 51 d2[ 	]+sqrtsd %xmm2,%xmm2
- 1d9:	f2 0f 51 1c 24[ 	]+sqrtsd \(%esp,1\),%xmm3
+ 1d9:	f2 0f 51 1c 24[ 	]+sqrtsd \(%esp\),%xmm3
  1de:	66 0f 5c e5[ 	]+subpd[ 	]+%xmm5,%xmm4
  1e2:	66 0f 5c 2e[ 	]+subpd[ 	]+\(%esi\),%xmm5
  1e6:	f2 0f 5c f7[ 	]+subsd[ 	]+%xmm7,%xmm6
diff --git a/gas/testsuite/gas/i386/ssemmx2.d b/gas/testsuite/gas/i386/ssemmx2.d
index e67787025a..04ccbafe45 100644
--- a/gas/testsuite/gas/i386/ssemmx2.d
+++ b/gas/testsuite/gas/i386/ssemmx2.d
@@ -10,14 +10,14 @@ Disassembly of section .text:
 [ 	]+0:	66 0f e0 c1[ 	]+pavgb[ 	]+%xmm1,%xmm0
 [ 	]+4:	66 0f e0 0a[ 	]+pavgb[ 	]+\(%edx\),%xmm1
 [ 	]+8:	66 0f e3 d3[ 	]+pavgw[ 	]+%xmm3,%xmm2
-[ 	]+c:	66 0f e3 1c 24[ 	]+pavgw[ 	]+\(%esp,1\),%xmm3
+[ 	]+c:	66 0f e3 1c 24[ 	]+pavgw[ 	]+\(%esp\),%xmm3
 [ 	]+11:	66 0f c5 c1 00[ 	]+pextrw \$0x0,%xmm1,%eax
 [ 	]+16:	66 0f c4 09 01[ 	]+pinsrw \$0x1,\(%ecx\),%xmm1
 [ 	]+1b:	66 0f c4 d2 02[ 	]+pinsrw \$0x2,%edx,%xmm2
 [ 	]+20:	66 0f ee c1[ 	]+pmaxsw %xmm1,%xmm0
 [ 	]+24:	66 0f ee 0a[ 	]+pmaxsw \(%edx\),%xmm1
 [ 	]+28:	66 0f de d2[ 	]+pmaxub %xmm2,%xmm2
-[ 	]+2c:	66 0f de 1c 24[ 	]+pmaxub \(%esp,1\),%xmm3
+[ 	]+2c:	66 0f de 1c 24[ 	]+pmaxub \(%esp\),%xmm3
 [ 	]+31:	66 0f ea e5[ 	]+pminsw %xmm5,%xmm4
 [ 	]+35:	66 0f ea 2e[ 	]+pminsw \(%esi\),%xmm5
 [ 	]+39:	66 0f da f7[ 	]+pminub %xmm7,%xmm6
@@ -85,4 +85,4 @@ Disassembly of section .text:
  1f1:	66 0f fc 90 90 90 90 90 	paddb[ 	]+0x90909090\(%eax\),%xmm2
  1f9:	66 0f fd 90 90 90 90 90 	paddw[ 	]+0x90909090\(%eax\),%xmm2
  201:	66 0f fe 90 90 90 90 90 	paddd[ 	]+0x90909090\(%eax\),%xmm2
- 209:	8d b4 26 00 00 00 00 	lea[ 	]+0x0\(%esi,1\),%esi
+ 209:	8d b4 26 00 00 00 00 	lea[ 	]+0x0\(%esi\),%esi