Move rep tests for bsf/bsr/ret to rep-suffix

	* gas/i386/i386.exp: Don't run rep-bsf nor rep-ret.

	* gas/i386/rep-bsf.d: Removed.
	* gas/i386/rep-bsf.s: Likewise.
	* gas/i386/rep-ret.d: Likewise.
	* gas/i386/rep-ret.s: Likewise.

	* gas/i386/rep-suffix.d: Updated.
	* gas/i386/x86-64-rep-suffix.d: Likewise.
	* gas/i386/ilp32/x86-64-rep-suffix.d: Likewise.

	* gas/i386/rep-suffix.s: Add tests for bsf, bsr and ret.
	* i386/x86-64-rep-suffix.s: Likewise.

11 files changed, 35 insertions, 29 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8e99af7..68f1ad3 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2012-07-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* gas/i386/i386.exp: Don't run rep-bsf nor rep-ret.
+
+	* gas/i386/rep-bsf.d: Removed.
+	* gas/i386/rep-bsf.s: Likewise.
+	* gas/i386/rep-ret.d: Likewise.
+	* gas/i386/rep-ret.s: Likewise.
+
+	* gas/i386/rep-suffix.d: Updated.
+	* gas/i386/x86-64-rep-suffix.d: Likewise.
+	* gas/i386/ilp32/x86-64-rep-suffix.d: Likewise.
+
+	* gas/i386/rep-suffix.s: Add tests for bsf, bsr and ret.
+	* i386/x86-64-rep-suffix.s: Likewise.
+
 2012-06-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/14315
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 0049000..89adf69 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -264,8 +264,6 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
 
     # Miscellaneous tests.
     run_dump_test "pr12589-1"
-    run_dump_test "rep-bsf"
-    run_dump_test "rep-ret"
 
     set ASFLAGS "$old_ASFLAGS"
 }
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-rep-suffix.d b/gas/testsuite/gas/i386/ilp32/x86-64-rep-suffix.d
index 46d597a..241365d 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-rep-suffix.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-rep-suffix.d
@@ -15,4 +15,7 @@ Disassembly of section .text:
    c:	f3 ab[ 	]+rep stosl %eax,%es:\(%rdi\)
    e:	f3 48 ad[ 	]+rep lodsq %ds:\(%rsi\),%rax
   11:	f3 48 ab[ 	]+rep stosq %rax,%es:\(%rdi\)
+  14:	f3 0f bc c1[	 ]+tzcntl %ecx,%eax
+  18:	f3 0f bd c1[	 ]+lzcntl %ecx,%eax
+  1c:	f3 c3[	 ]+repz retq 
 #pass
diff --git a/gas/testsuite/gas/i386/rep-bsf.d b/gas/testsuite/gas/i386/rep-bsf.d
deleted file mode 100644
index c0a47dd..0000000
--- a/gas/testsuite/gas/i386/rep-bsf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-#objdump: -d
-#name: rep prefix on bsf/bsr
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+000 <bsf>:
-\s*[0-9]+:\s+f3 0f bc c1\s+tzcnt  %ecx,%eax
-0+004 <bsr>:
-\s*[0-9]+:\s+f3 0f bd c1\s+lzcnt  %ecx,%eax
diff --git a/gas/testsuite/gas/i386/rep-bsf.s b/gas/testsuite/gas/i386/rep-bsf.s
deleted file mode 100644
index 10a12aa..0000000
--- a/gas/testsuite/gas/i386/rep-bsf.s
+++ /dev/null
@@ -1,3 +0,0 @@
-	.text
-bsf:	rep bsf %ecx, %eax
-bsr:	rep bsr %ecx, %eax
diff --git a/gas/testsuite/gas/i386/rep-ret.d b/gas/testsuite/gas/i386/rep-ret.d
deleted file mode 100644
index 3045290..0000000
--- a/gas/testsuite/gas/i386/rep-ret.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#objdump: -d
-#name: rep prefix on ret
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+000 <foo>:
-\s*[0-9a-f]+:\s+f3 c3\s+repz ret\s*
-	\.\.\.
diff --git a/gas/testsuite/gas/i386/rep-ret.s b/gas/testsuite/gas/i386/rep-ret.s
deleted file mode 100644
index 054ad78..0000000
--- a/gas/testsuite/gas/i386/rep-ret.s
+++ /dev/null
@@ -1,3 +0,0 @@
-	.text
-foo:	rep ret
-	.p2align 4,0
diff --git a/gas/testsuite/gas/i386/rep-suffix.d b/gas/testsuite/gas/i386/rep-suffix.d
index ac4e606..81f8d61 100644
--- a/gas/testsuite/gas/i386/rep-suffix.d
+++ b/gas/testsuite/gas/i386/rep-suffix.d
@@ -12,4 +12,7 @@ Disassembly of section .text:
    7:	66 f3 ab[ 	]+rep stosw %ax,%es:\(%edi\)
    a:	f3 ad[ 	]+rep lodsl %ds:\(%esi\),%eax
    c:	f3 ab[ 	]+rep stosl %eax,%es:\(%edi\)
+   e:	f3 0f bc c1[	 ]+tzcntl %ecx,%eax
+  12:	f3 0f bd c1[	 ]+lzcntl %ecx,%eax
+  16:	f3 c3[	 ]+repz retl 
 #pass
diff --git a/gas/testsuite/gas/i386/rep-suffix.s b/gas/testsuite/gas/i386/rep-suffix.s
index be54877..6f53663 100644
--- a/gas/testsuite/gas/i386/rep-suffix.s
+++ b/gas/testsuite/gas/i386/rep-suffix.s
@@ -7,3 +7,8 @@ _start:
 	rep stosw
 	rep lodsl
 	rep stosl
+
+	rep bsf %ecx, %eax
+	rep bsr %ecx, %eax
+
+	rep ret
diff --git a/gas/testsuite/gas/i386/x86-64-rep-suffix.d b/gas/testsuite/gas/i386/x86-64-rep-suffix.d
index 68a90d9..3c3f7ea 100644
--- a/gas/testsuite/gas/i386/x86-64-rep-suffix.d
+++ b/gas/testsuite/gas/i386/x86-64-rep-suffix.d
@@ -14,4 +14,7 @@ Disassembly of section .text:
    c:	f3 ab[ 	]+rep stosl %eax,%es:\(%rdi\)
    e:	f3 48 ad[ 	]+rep lodsq %ds:\(%rsi\),%rax
   11:	f3 48 ab[ 	]+rep stosq %rax,%es:\(%rdi\)
+  14:	f3 0f bc c1[	 ]+tzcntl %ecx,%eax
+  18:	f3 0f bd c1[	 ]+lzcntl %ecx,%eax
+  1c:	f3 c3[	 ]+repz retq 
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-rep-suffix.s b/gas/testsuite/gas/i386/x86-64-rep-suffix.s
index de748cf..43d71cf 100644
--- a/gas/testsuite/gas/i386/x86-64-rep-suffix.s
+++ b/gas/testsuite/gas/i386/x86-64-rep-suffix.s
@@ -9,3 +9,8 @@ _start:
 	rep stosl
 	rep lodsq
 	rep stosq
+
+	rep bsf %ecx, %eax
+	rep bsr %ecx, %eax
+
+	rep ret