* gas/m32r/fslot.[sd]: New testcase.

	* gas/m32r/m32r.exp: Run it.
	* gas/m32r/fslotx.[sd]: New testcase.
	* gas/m32r/m32rx.exp: Run it.
	* gas/m32r/m32rx.[sd]: Update.
PR 18134.

6 files changed, 113 insertions, 1 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d949a94..9205753 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+Mon Nov  2 20:16:50 1998  Doug Evans  <devans@canuck.cygnus.com>
+
+	* gas/m32r/fslot.[sd]: New testcase.
+	* gas/m32r/m32r.exp: Run it.
+start-sanitize-m32rx
+	* gas/m32r/fslotx.[sd]: New testcase.
+	* gas/m32r/m32rx.exp: Run it.
+	* gas/m32r/m32rx.[sd]: Update.
+end-sanitize-m32rx
+
 start-sanitize-r5900
 Fri Oct 23 13:01:24 EDT 1998 Frank Ch. Eigler <fche@cygnus.com>
 
diff --git a/gas/testsuite/gas/m32r/.Sanitize b/gas/testsuite/gas/m32r/.Sanitize
index d42dc01..6f94c1c 100644
--- a/gas/testsuite/gas/m32r/.Sanitize
+++ b/gas/testsuite/gas/m32r/.Sanitize
@@ -15,7 +15,7 @@
 
 Do-first:
 
-m32rx_files="m32rx.s m32rx.d m32rx.exp"
+m32rx_files="fslotx.s fslotx.d m32rx.s m32rx.d m32rx.exp"
 if ( echo $* | grep keep\-m32rx > /dev/null ) ; then
         keep_these_too="${m32rx_files} ${keep_these_too}"
 else
@@ -33,6 +33,8 @@ Things-to-keep:
 allinsn.d
 allinsn.exp
 allinsn.s
+fslot.d
+fslot.s
 high-1.d
 high-1.s
 m32r.exp
diff --git a/gas/testsuite/gas/m32r/fslot.d b/gas/testsuite/gas/m32r/fslot.d
new file mode 100644
index 0000000..7bbf1d6
--- /dev/null
+++ b/gas/testsuite/gas/m32r/fslot.d
@@ -0,0 +1,31 @@
+#as:
+#objdump: -dr
+#name: fslot
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+0 <bl>:
+ *0:	7e 00 f0 00 	bl 0 <bl> || nop
+ *4:	60 08 f0 00 	ldi r0,[#]*8 || nop
+
+0+8 <bl_s>:
+ *8:	7e 00 f0 00 	bl 8 <bl_s> || nop
+ *c:	60 08 f0 00 	ldi r0,[#]*8 || nop
+
+0+10 <bra>:
+ *10:	7f 00 f0 00 	bra 10 <bra> || nop
+ *14:	60 08 f0 00 	ldi r0,[#]*8 || nop
+
+0+18 <bra_s>:
+ *18:	7f 00 f0 00 	bra 18 <bra_s> || nop
+ *1c:	60 08 f0 00 	ldi r0,[#]*8 || nop
+
+0+20 <jl>:
+ *20:	1e c0 f0 00 	jl r0 || nop
+ *24:	60 08 f0 00 	ldi r0,[#]*8 || nop
+
+0+28 <trap>:
+ *28:	10 f4 f0 00 	trap [#]*0x4 || nop
+ *2c:	60 08 f0 00 	ldi r0,[#]*8 || nop
diff --git a/gas/testsuite/gas/m32r/fslot.s b/gas/testsuite/gas/m32r/fslot.s
new file mode 100644
index 0000000..586b664
--- /dev/null
+++ b/gas/testsuite/gas/m32r/fslot.s
@@ -0,0 +1,27 @@
+# Test the FILL-SLOT attribute.
+# The FILL-SLOT attribute ensures the next insn begins on a 32 byte boundary.
+# This is needed for example with bl because the subroutine will return
+# to a 32 bit boundary.
+
+	.text
+bl:
+	bl bl
+	ldi r0,#8
+bl_s:
+	bl.s bl_s
+	ldi r0,#8
+
+bra:
+	bra bra
+	ldi r0,#8
+bra_s:
+	bra.s bra_s
+	ldi r0,#8
+
+jl:
+	jl r0
+	ldi r0,#8
+
+trap:
+	trap #4
+	ldi r0,#8
diff --git a/gas/testsuite/gas/m32r/fslotx.d b/gas/testsuite/gas/m32r/fslotx.d
new file mode 100644
index 0000000..1d8f02c
--- /dev/null
+++ b/gas/testsuite/gas/m32r/fslotx.d
@@ -0,0 +1,23 @@
+#as: -m32rx
+#objdump: -dr
+#name: fslotx
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+0 <bcl>:
+ *0:	78 00 f0 00 	bcl 0 <bcl> || nop
+ *4:	60 08 f0 00 	ldi r0,[#]*8 || nop
+
+0+8 <bcl_s>:
+ *8:	78 00 f0 00 	bcl 8 <bcl_s> || nop
+ *c:	60 08 f0 00 	ldi r0,[#]*8 || nop
+
+0+10 <bncl>:
+  10:	79 00 f0 00 	bncl 10 <bncl> || nop
+  14:	60 08 f0 00 	ldi r0,[#]*8 || nop
+
+0+18 <bncl_s>:
+  18:	79 00 f0 00 	bncl 18 <bncl_s> || nop
+  1c:	60 08 f0 00 	ldi r0,[#]*8 || nop
diff --git a/gas/testsuite/gas/m32r/fslotx.s b/gas/testsuite/gas/m32r/fslotx.s
new file mode 100644
index 0000000..9cfb231
--- /dev/null
+++ b/gas/testsuite/gas/m32r/fslotx.s
@@ -0,0 +1,19 @@
+# Test the FILL-SLOT attribute.
+# The FILL-SLOT attribute ensures the next insn begins on a 32 byte boundary.
+# This is needed for example with bl because the subroutine will return
+# to a 32 bit boundary.
+
+	.text
+bcl:
+	bcl bcl
+	ldi r0,#8
+bcl_s:
+	bcl.s bcl_s
+	ldi r0,#8
+
+bncl:
+	bncl bncl
+	ldi r0,#8
+bncl_s:
+	bncl.s bncl_s
+	ldi r0,#8