From df5b3187302dd08c832efbb5000c81cff09775c3 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 15 Jan 1998 01:53:12 +0000
Subject: [PATCH] Fix test case so that they pass.

---
 gas/testsuite/ChangeLog            |   7 +
 gas/testsuite/gas/m32r/m32rx.d     | 328 +++++++++++++++++++++++++
 gas/testsuite/gas/m32r/m32rx.s     | 486 +++++++++++++++++++++++++++++++++++++
 gas/testsuite/gas/m32r/relax-1.d   |  20 ++
 gas/testsuite/gas/m32r/uppercase.d |  11 +
 5 files changed, 852 insertions(+)
 create mode 100644 gas/testsuite/gas/m32r/m32rx.d
 create mode 100644 gas/testsuite/gas/m32r/m32rx.s
 create mode 100644 gas/testsuite/gas/m32r/relax-1.d
 create mode 100644 gas/testsuite/gas/m32r/uppercase.d

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 2722607..affe101 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 14 17:49:22 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* gas/m32r/uppercase.d: Fix white space matching.
+	* gas/m32r/relax-1.d: Fix white space matching.
+	* gas/m32r/m32rx.d: Add expected results.
+	* gas/m32r/m32rx.s: Correct typos in test cases.
+
 Wed Jan 14 15:44:32 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* gas/mips/div.d: Update for recent assembler changes.
diff --git a/gas/testsuite/gas/m32r/m32rx.d b/gas/testsuite/gas/m32r/m32rx.d
new file mode 100644
index 0000000..1ea7671
--- /dev/null
+++ b/gas/testsuite/gas/m32r/m32rx.d
@@ -0,0 +1,328 @@
+#as: -m32rx
+#objdump: -dr
+#name: m32rx
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+00000000 <bcl>:
+   0:	78 00 f0 00 	bcl 0 <bcl> || nop
+
+00000004 <bncl>:
+   4:	79 ff f0 00 	bncl 0 <bcl> || nop
+
+00000008 <cmpz>:
+   8:	00 7d f0 00 	cmpz fp || nop
+
+0000000c <cmpeq>:
+   c:	0d 6d f0 00 	cmpeq fp,fp || nop
+
+00000010 <machl1>:
+  10:	5d cd f0 00 	machl1 fp,fp || nop
+
+00000014 <msblo>:
+  14:	5d dd f0 00 	msblo fp,fp || nop
+
+00000018 <mulwu1>:
+  18:	5d ad f0 00 	mulwu1 fp,fp || nop
+
+0000001c <macwu1>:
+  1c:	5d bd f0 00 	macwu1 fp,fp || nop
+
+00000020 <sadd>:
+  20:	50 e4 f0 00 	sadd || nop
+
+00000024 <satb>:
+  24:	8d 0d 01 00 	satb fp,fp
+
+00000028 <mulhi>:
+  28:	3d 8d f0 00 	 || nop
+
+0000002c <mullo>:
+  2c:	3d 1d f0 00 	mullo fp,fp || nop
+
+00000030 <mulwhi>:
+  30:	3d ad f0 00 	 || nop
+
+00000034 <mulwlo>:
+  34:	3d 3d f0 00 	mulwlo fp,fp || nop
+
+00000038 <machi>:
+  38:	3d cd f0 00 	 || nop
+
+0000003c <maclo>:
+  3c:	3d 5d f0 00 	maclo fp,fp || nop
+
+00000040 <macwhi>:
+  40:	3d ed f0 00 	 || nop
+
+00000044 <macwlo>:
+  44:	3d 7d f0 00 	macwlo fp,fp || nop
+
+00000048 <mvfachi>:
+  48:	5d f0 f0 00 	mvfachi fp || nop
+
+0000004c <mvfacmi>:
+  4c:	5d f2 f0 00 	mvfacmi fp || nop
+
+00000050 <mvfaclo>:
+  50:	5d f1 f0 00 	mvfaclo fp || nop
+
+00000054 <mvtachi>:
+  54:	5d f0 f0 00 	mvfachi fp || nop
+
+00000058 <mvtaclo>:
+  58:	5d 71 f0 00 	mvtaclo fp || nop
+
+0000005c <rac>:
+  5c:	50 90 f0 00 	rac || nop
+
+00000060 <rach>:
+  60:	50 80 f0 00 	rach || nop
+
+00000064 <bc__add>:
+  64:	7c 00 8d ad 	bc 64 <bc__add> || add fp,fp
+  68:	7c e6       	bc 0 <bcl>
+  6a:	0d ad       	add fp,fp
+
+0000006c <bcl__addi>:
+  6c:	78 00 cd 4d 	bcl 6c <bcl__addi> || addi fp,77
+  70:	4d 4d       	addi fp,77
+  72:	78 e4       	bcl 2 <bcl\+0x2>
+
+00000074 <bl__addv>:
+  74:	7e 00 8d 8d 	bl 74 <bl__addv> || addv fp,fp
+  78:	0d 8d       	addv fp,fp
+  7a:	7e e2       	bl 2 <bcl\+0x2>
+
+0000007c <bnc__addx>:
+  7c:	7d 00 8d 9d 	bnc 7c <bnc__addx> || addx fp,fp
+  80:	7d e0       	bnc 0 <bcl>
+  82:	0d 9d       	addx fp,fp
+
+00000084 <bncl__and>:
+  84:	79 00 8d cd 	bncl 84 <bncl__and> || and fp,fp
+  88:	79 de       	bncl 0 <bcl>
+  8a:	0d cd       	and fp,fp
+
+0000008c <bra__cmp>:
+  8c:	7f 00 8d 4d 	bra 8c <bra__cmp> || cmp fp,fp
+  90:	0d 4d       	cmp fp,fp
+  92:	7f dc       	bra 2 <bcl\+0x2>
+
+00000094 <jl__cmpeq>:
+  94:	1e cd 8d 6d 	jl fp || cmpeq fp,fp
+  98:	0d 6d       	cmpeq fp,fp
+  9a:	1e cd       	jl fp
+
+0000009c <jmp__cmpu>:
+  9c:	1f cd 8d 5d 	jmp fp || cmpu fp,fp
+  a0:	0d 5d       	cmpu fp,fp
+  a2:	1f cd       	jmp fp
+
+000000a4 <ld__cmpz>:
+  a4:	2d cd 80 71 	ld fp,@fp || cmpz r1
+  a8:	00 71       	cmpz r1
+  aa:	2d cd       	ld fp,@fp
+
+000000ac <ld__ldi>:
+  ac:	2d e1 e2 4d 	ld fp,@r1\+ || ldi r2,77
+  b0:	2d e1       	ld fp,@r1\+
+  b2:	62 4d       	ldi r2,77
+
+000000b4 <ldb__mv>:
+  b4:	2d 8d 92 8d 	ldb fp,@fp || mv r2,fp
+  b8:	2d 8d       	ldb fp,@fp
+  ba:	12 8d       	mv r2,fp
+
+000000bc <ldh__neg>:
+  bc:	2d ad 82 3d 	ldh fp,@fp || neg r2,fp
+  c0:	2d ad       	ldh fp,@fp
+  c2:	02 3d       	neg r2,fp
+
+000000c4 <ldub__nop>:
+  c4:	2d 9d f0 00 	ldub fp,@fp || nop
+  c8:	2d 9d       	ldub fp,@fp
+  ca:	70 00       	nop
+
+000000cc <lduh__not>:
+  cc:	2d bd 82 bd 	lduh fp,@fp || not r2,fp
+  d0:	2d bd       	lduh fp,@fp
+  d2:	02 bd       	not r2,fp
+
+000000d4 <lock__or>:
+  d4:	2d dd 82 ed 	lock fp,@fp || or r2,fp
+  d8:	2d dd       	lock fp,@fp
+  da:	02 ed       	or r2,fp
+
+000000dc <mvfc__sub>:
+  dc:	1d 91 82 2d 	mvfc fp,cbr || sub r2,fp
+  e0:	1d 91       	mvfc fp,cbr
+  e2:	02 2d       	sub r2,fp
+
+000000e4 <mvtc__subv>:
+  e4:	10 ad 82 0d 	mvtc fp,psw || subv r2,fp
+  e8:	10 ad       	mvtc fp,psw
+  ea:	02 0d       	subv r2,fp
+
+000000ec <rte__subx>:
+  ec:	10 d6 82 1d 	rte || subx r2,fp
+  f0:	10 d6       	rte
+  f2:	02 1d       	subx r2,fp
+
+000000f4 <sll__xor>:
+  f4:	1d 41 82 dd 	sll fp,r1 || xor r2,fp
+  f8:	1d 41       	sll fp,r1
+  fa:	02 dd       	xor r2,fp
+
+000000fc <slli__machi>:
+  fc:	5d 56 b2 4d 	slli fp,0x16 || machi r2,fp
+ 100:	5d 56       	slli fp,0x16
+ 102:	32 4d       	machi r2,fp
+
+00000104 <sra__machl1>:
+ 104:	1d 2d d2 cd 	sra fp,fp || machl1 r2,fp
+ 108:	1d 2d       	sra fp,fp
+ 10a:	52 cd       	machl1 r2,fp
+
+0000010c <srai__maclo>:
+ 10c:	5d 36 b2 5d 	srai fp,0x16 || maclo r2,fp
+ 110:	5d 36       	srai fp,0x16
+ 112:	32 5d       	maclo r2,fp
+
+00000114 <srl__macwhi>:
+ 114:	1d 0d b2 6d 	srl fp,fp || macwhi r2,fp
+ 118:	1d 0d       	srl fp,fp
+ 11a:	32 6d       	macwhi r2,fp
+
+0000011c <srli__macwlo>:
+ 11c:	5d 16 b2 7d 	srli fp,0x16 || macwlo r2,fp
+ 120:	5d 16       	srli fp,0x16
+ 122:	32 7d       	macwlo r2,fp
+
+00000124 <st__macwu1>:
+ 124:	2d 4d d2 bd 	st fp,@fp || macwu1 r2,fp
+ 128:	2d 4d       	st fp,@fp
+ 12a:	52 bd       	macwu1 r2,fp
+
+0000012c <st__msblo>:
+ 12c:	2d 6d d2 dd 	st fp,@\+fp || msblo r2,fp
+ 130:	2d 6d       	st fp,@\+fp
+ 132:	52 dd       	msblo r2,fp
+
+00000134 <st__mul>:
+ 134:	2d 7d 92 6d 	st fp,@-fp || mul r2,fp
+ 138:	2d 7d       	st fp,@-fp
+ 13a:	12 6d       	mul r2,fp
+
+0000013c <stb__mulhi>:
+ 13c:	2d 0d b2 0d 	stb fp,@fp || mulhi r2,fp
+ 140:	2d 0d       	stb fp,@fp
+ 142:	32 0d       	mulhi r2,fp
+
+00000144 <sth__mullo>:
+ 144:	2d 2d b2 1d 	sth fp,@fp || mullo r2,fp
+ 148:	2d 2d       	sth fp,@fp
+ 14a:	32 1d       	mullo r2,fp
+
+0000014c <trap__mulwhi>:
+ 14c:	10 f2 b2 2d 	trap 0x2 || mulwhi r2,fp
+ 150:	10 f2 f0 00 	trap 0x2 || nop
+ 154:	32 2d f0 00 	mulwhi r2,fp || nop
+
+00000158 <unlock__mulwlo>:
+ 158:	2d 5d b2 3d 	unlock fp,@fp || mulwlo r2,fp
+ 15c:	2d 5d       	unlock fp,@fp
+ 15e:	32 3d       	mulwlo r2,fp
+
+00000160 <add__mulwu1>:
+ 160:	0d ad d2 ad 	add fp,fp || mulwu1 r2,fp
+ 164:	0d ad       	add fp,fp
+ 166:	52 ad       	mulwu1 r2,fp
+
+00000168 <addi__mvfachi>:
+ 168:	4d 4d d2 f0 	addi fp,77 || mvfachi r2
+ 16c:	4d 4d       	addi fp,77
+ 16e:	52 f0       	mvfachi r2
+
+00000170 <addv__mvfaclo>:
+ 170:	0d 8d d2 f1 	addv fp,fp || mvfaclo r2
+ 174:	0d 8d       	addv fp,fp
+ 176:	52 f1       	mvfaclo r2
+
+00000178 <addx__mvfacmi>:
+ 178:	0d 9d d2 f2 	addx fp,fp || mvfacmi r2
+ 17c:	0d 9d       	addx fp,fp
+ 17e:	52 f2       	mvfacmi r2
+
+00000180 <and__mvtachi>:
+ 180:	0d cd d2 70 	and fp,fp || mvtachi r2
+ 184:	0d cd       	and fp,fp
+ 186:	52 70       	mvtachi r2
+
+00000188 <cmp__mvtaclo>:
+ 188:	0d 4d d2 71 	cmp fp,fp || mvtaclo r2
+ 18c:	0d 4d       	cmp fp,fp
+ 18e:	52 71       	mvtaclo r2
+
+00000190 <cmpeq__rac>:
+ 190:	0d 6d d0 90 	cmpeq fp,fp || rac
+ 194:	0d 6d       	cmpeq fp,fp
+ 196:	50 90       	rac
+
+00000198 <cmpu__rach>:
+ 198:	0d 5d d0 80 	cmpu fp,fp || rach
+ 19c:	0d 5d       	cmpu fp,fp
+ 19e:	50 80       	rach
+
+000001a0 <cmpz__sadd>:
+ 1a0:	00 7d d0 e4 	cmpz fp || sadd
+ 1a4:	00 7d       	cmpz fp
+ 1a6:	50 e4       	sadd
+
+000001a8 <sc>:
+ 1a8:	74 01       	sc
+ 1aa:	50 e4       	sadd
+
+000001ac <snc>:
+ 1ac:	75 01       	snc
+ 1ae:	50 e4       	sadd
+
+000001b0 <jc>:
+ 1b0:	1c cd f0 00 	jc fp || nop
+
+000001b4 <jnc>:
+ 1b4:	1c cd f0 00 	jc fp || nop
+
+000001b8 <pcmpbz>:
+ 1b8:	03 7d f0 00 	pcmpbz fp || nop
+
+000001bc <sat>:
+ 1bc:	8d 0d 00 00 	sat fp,fp
+
+000001c0 <sath>:
+ 1c0:	8d 0d 02 00 	sath fp,fp
+
+000001c4 <jc__pcmpbz>:
+ 1c4:	1c cd 83 7d 	jc fp || pcmpbz fp
+ 1c8:	1c cd       	jc fp
+ 1ca:	03 7d       	pcmpbz fp
+
+000001cc <jnc__ldi>:
+ 1cc:	1c cd ed 4d 	jc fp || ldi fp,77
+ 1d0:	1c cd       	jc fp
+ 1d2:	6d 4d       	ldi fp,77
+
+000001d4 <sc__mv>:
+ 1d4:	74 01 9d 82 	sc || mv fp,r2
+ 1d8:	74 01       	sc
+ 1da:	1d 82       	mv fp,r2
+
+000001dc <snc__neg>:
+ 1dc:	75 01 8d 32 	snc || neg fp,r2
+ 1e0:	75 01       	snc
+ 1e2:	0d32      	neg fp,r2
+
+# To be completed once the instructions are in cgen.....
+
diff --git a/gas/testsuite/gas/m32r/m32rx.s b/gas/testsuite/gas/m32r/m32rx.s
new file mode 100644
index 0000000..70e4b24
--- /dev/null
+++ b/gas/testsuite/gas/m32r/m32rx.s
@@ -0,0 +1,486 @@
+# Test new instructions
+branchpoint:
+	
+	.text
+	.global bcl
+bcl:
+	bcl branchpoint
+
+	.text
+	.global bncl
+bncl:
+	bncl branchpoint
+
+	.text
+	.global cmpz
+cmpz:
+	cmpz fp
+
+	.text
+	.global cmpeq
+cmpeq:
+	cmpeq fp, fp
+
+	.text
+	.global machl1
+machl1:
+	machl1 fp, fp
+	
+	.text
+	.global macsl0
+msblo:
+	msblo fp, fp
+	
+	.text
+	.global mulwu1
+mulwu1:
+	mulwu1 fp, fp
+	
+	.text
+	.global macwu1
+macwu1:
+	macwu1 fp, fp
+	
+	.text
+	.global sadd
+sadd:
+	sadd
+	
+	.text
+	.global satb
+satb:
+	satb fp, fp
+
+	
+	.text
+	.global mulhi
+mulhi:
+	mulhi fp, fp, a1
+	
+	.text
+	.global mullo
+mullo:
+	mullo fp, fp, a0
+	
+	.text
+	.global mulwhi
+mulwhi:
+	mulwhi fp, fp, a1
+	
+	.text
+	.global mulwlo
+mulwlo:
+	mulwlo fp, fp, a0
+	
+	.text
+	.global machi
+machi:
+	machi fp, fp, a1
+	
+	.text
+	.global maclo
+maclo:
+	maclo fp, fp, a0
+	
+	.text
+	.global macwhi
+macwhi:
+	macwhi fp, fp, a1
+	
+	.text
+	.global macwlo
+macwlo:
+	macwlo fp, fp, a0
+	
+	.text
+	.global mvfachi
+mvfachi:
+	mvfachi fp, a1
+	
+	.text
+	.global mvfacmi
+mvfacmi:
+	mvfacmi fp, a1
+	
+	.text
+	.global mvfaclo
+mvfaclo:
+	mvfaclo fp, a0
+	
+	.text
+	.global mvtachi
+mvtachi:
+	mvtachi fp, a1
+	
+	.text
+	.global mvtaclo
+mvtaclo:
+	mvtaclo fp, a0
+	
+	.text
+	.global rac
+rac:
+	rac a1
+	
+	.text
+	.global rach
+rach:
+	rach a1
+	
+# Test explicitly parallel and implicitly parallel instructions
+# Including apparent instruction sequence reordering.
+	.text
+	.global bc__add
+bc__add:
+	bc branchpoint || add fp, fp
+	bc branchpoint
+	add fp, fp
+
+	.text
+	.global bcl__addi
+bcl__addi:	
+	bcl branchpoint || addi fp, #77
+	addi fp, #77
+	bcl branchpoint
+
+	.text
+	.global bl__addv
+bl__addv:
+	bl branchpoint || addv fp, fp
+	addv fp, fp
+	bl branchpoint
+	
+	.text
+	.global bnc__addx
+bnc__addx:
+	bnc branchpoint || addx fp, fp
+	bnc branchpoint
+	addx fp, fp
+
+	.text
+	.global bncl__and
+bncl__and:
+	bncl branchpoint || and fp, fp
+	bncl branchpoint
+	and fp, fp
+
+	.text
+	.global bra__cmp
+bra__cmp:
+	bra branchpoint || cmp fp, fp
+	cmp fp, fp
+	bra branchpoint
+	
+	.text
+	.global jl__cmpeq
+jl__cmpeq:
+	jl fp || cmpeq fp, fp
+	cmpeq fp, fp
+	jl fp
+	
+	.text
+	.global jmp__cmpu
+jmp__cmpu:
+	jmp fp || cmpu fp, fp
+	cmpu fp, fp
+	jmp fp
+	
+	.text
+	.global ld__cmpz
+ld__cmpz:
+	ld fp, @fp || cmpz r1
+	cmpz r1
+	ld fp, @fp 
+	
+	.text
+	.global ld__ldi
+ld__ldi:
+	ld fp, @r1+ || ldi r2, #77
+	ld fp, @r1+ 
+	ldi r2, #77
+	
+	.text
+	.global ldb__mv
+ldb__mv:
+	ldb fp, @fp || mv r2, fp
+	ldb fp, @fp 
+	mv r2, fp
+
+	.text
+	.global ldh__neg
+ldh__neg:
+	ldh fp, @fp || neg r2, fp
+	ldh fp, @fp
+	neg r2, fp
+
+	.text
+	.global ldub__nop
+ldub__nop:
+	ldub fp, @fp || nop
+	ldub fp, @fp 
+	nop
+
+	.text
+	.global lduh__not
+lduh__not:
+	lduh fp, @fp || not r2, fp
+	lduh fp, @fp
+	not r2, fp
+
+	.text
+	.global lock__or
+lock__or:
+	lock fp, @fp || or r2, fp
+	lock fp, @fp
+	or r2, fp
+
+	.text
+	.global mvfc__sub
+mvfc__sub:
+	mvfc fp, cr1 || sub r2, fp
+	mvfc fp, cr1
+	sub r2, fp
+
+	.text
+	.global mvtc__subv
+mvtc__subv:
+	mvtc fp, cr0 || subv r2, fp
+	mvtc fp, cr0
+	subv r2, fp
+
+	.text
+	.global rte__subx
+rte__subx:
+	rte || subx r2, fp
+	rte
+	subx r2, fp
+
+	.text
+	.global sll__xor
+sll__xor:
+	sll fp, r1 || xor r2, fp
+	sll fp, r1
+	xor r2, fp
+
+	.text
+	.global slli__machi
+slli__machi:
+	slli fp, #22 || machi r2, fp
+	slli fp, #22
+	machi r2, fp
+
+	.text
+	.global sra__machl1
+sra__machl1:
+	sra fp, fp || machl1 r2, fp
+	sra fp, fp
+	machl1 r2, fp
+
+	.text
+	.global srai__maclo
+srai__maclo:
+	srai fp, #22 || maclo r2, fp
+	srai fp, #22
+	maclo r2, fp
+
+	.text
+	.global srl__macwhi
+srl__macwhi:
+	srl fp, fp || macwhi r2, fp
+	srl fp, fp
+	macwhi r2, fp
+
+	.text
+	.global srli__macwlo
+srli__macwlo:
+	srli fp, #22 || macwlo r2, fp
+	srli fp, #22
+	macwlo r2, fp
+	
+	.text
+	.global st__macwu1
+st__macwu1:
+	st fp, @fp || macwu1 r2, fp
+	st fp, @fp
+	macwu1 r2, fp
+
+	.text
+	.global st__msblo
+st__msblo:
+	st fp, @+fp || msblo r2, fp
+	st fp, @+fp 
+	msblo r2, fp
+
+	.text
+	.global st__mul
+st__mul:
+	st fp, @-fp || mul r2, fp
+	st fp, @-fp
+	mul r2, fp
+
+	.text
+	.global stb__mulhi
+stb__mulhi:
+	stb fp, @fp || mulhi r2, fp
+	stb fp, @fp
+	mulhi r2, fp
+	
+	.text
+	.global sth__mullo
+sth__mullo:
+	sth fp, @fp || mullo r2, fp
+	sth fp, @fp 
+	mullo r2, fp
+
+	.text
+	.global trap__mulwhi
+trap__mulwhi:
+	trap 2 || mulwhi r2, fp
+	trap 2
+	mulwhi r2, fp
+
+	.text
+	.global unlock__mulwlo
+unlock__mulwlo:
+	unlock fp, @fp || mulwlo r2, fp
+	unlock fp, @fp
+	mulwlo r2, fp
+
+	.text
+	.global add__mulwu1
+add__mulwu1:
+	add fp, fp || mulwu1 r2, fp
+	add fp, fp
+	mulwu1 r2, fp
+
+	.text
+	.global addi__mvfachi
+addi__mvfachi:
+	addi fp, #77 || mvfachi r2, a0
+	addi fp, #77
+	mvfachi r2, a0
+
+	.text
+	.global addv__mvfaclo
+addv__mvfaclo:
+	addv fp, fp || mvfaclo r2, a1
+	addv fp, fp
+	mvfaclo r2, a1
+
+	.text
+	.global addx__mvfacmi
+addx__mvfacmi:
+	addx fp, fp || mvfacmi r2, a0
+	addx fp, fp
+	mvfacmi r2, a0
+
+	.text
+	.global and__mvtachi
+and__mvtachi:
+	and fp, fp || mvtachi r2, a0
+	and fp, fp
+	mvtachi r2, a0
+	
+	.text
+	.global cmp__mvtaclo
+cmp__mvtaclo:
+	cmp fp, fp || mvtaclo r2, a0
+	cmp fp, fp
+	mvtaclo r2, a0
+
+	.text
+	.global cmpeq__rac
+cmpeq__rac:
+	cmpeq fp, fp || rac a1
+	cmpeq fp, fp
+	rac a1
+
+	.text
+	.global cmpu__rach
+cmpu__rach:
+	cmpu fp, fp || rach a0
+	cmpu fp, fp
+	rach a0
+
+	.text
+	.global cmpz__sadd
+cmpz__sadd:
+	cmpz fp || sadd
+	cmpz fp
+	sadd
+
+
+	
+# Test private instructions	
+	.text
+	.global sc
+sc:
+	sc
+	sadd
+	
+	.text
+	.global snc
+snc:
+	snc
+	sadd 
+	
+	.text
+	.global jc
+jc:
+	jc fp
+	
+	.text
+	.global jnc
+jnc:
+	jnc fp
+		
+	.text
+	.global pcmpbz
+pcmpbz:
+	pcmpbz fp
+	
+	.text
+	.global sat
+sat:
+	sat fp, fp
+	
+	.text
+	.global sath
+sath:
+	sath fp, fp 
+
+
+# Test parallel versions of the private instructions
+	
+	.text
+	.global jc__pcmpbz
+jc__pcmpbz:
+	jc fp || pcmpbz fp
+	jc fp 
+	pcmpbz fp
+	
+	.text
+	.global jnc__ldi
+jnc__ldi:
+	jnc fp || ldi fp, #77
+	jnc fp
+	ldi fp, #77
+	
+	.text
+	.global sc__mv
+sc__mv:
+	sc || mv fp, r2
+	sc 
+	mv fp, r2
+
+	.text
+	.global snc__neg
+snc__neg:
+	snc || neg fp, r2
+	snc 
+	neg fp, r2
+	
+	
+	
+
+	
\ No newline at end of file
diff --git a/gas/testsuite/gas/m32r/relax-1.d b/gas/testsuite/gas/m32r/relax-1.d
new file mode 100644
index 0000000..3388477
--- /dev/null
+++ b/gas/testsuite/gas/m32r/relax-1.d
@@ -0,0 +1,20 @@
+#as:
+#objdump: -dr
+#name: relax-1
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0* <DoesNotWork>:
+ *0:	70 00 *	nop
+ *2:	70 00 *	nop
+
+0*4 <Work>:
+ *4:	70 00 *	nop
+ *6:	7000 *	nop
+Disassembly of section .branch:
+
+0* <branch>:
+ *0:	ff 00 00 01 	bra 4 <Work>
+[ 	]*0: R_M32R_26_PCREL	.text
diff --git a/gas/testsuite/gas/m32r/uppercase.d b/gas/testsuite/gas/m32r/uppercase.d
new file mode 100644
index 0000000..2736dea
--- /dev/null
+++ b/gas/testsuite/gas/m32r/uppercase.d
@@ -0,0 +1,11 @@
+#as:
+#objdump: -dr
+#name: uppercase
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+00000000 <foo>:
+   0:	10 81 *	mv r0,r1
+   2:	1091 *	mvfc r0,cbr
-- 
2.7.4