diff --git a/sim/testsuite/d10v-elf/ChangeLog b/sim/testsuite/d10v-elf/ChangeLog
index 874b6f520d..b040b34fcb 100644
--- a/sim/testsuite/d10v-elf/ChangeLog
+++ b/sim/testsuite/d10v-elf/ChangeLog
@@ -1,5 +1,16 @@
+Wed Feb 11 17:58:50 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* t-macros.i: Update trap calls, func in r4, args in
+ 	r0...
+	(start): Force r0 to zero.
+
+	* t-sub2w.s: Ditto.
+
 Tue Dec  9 10:41:44 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
+	* t-rte.s (success): New file.
+	* Makefile.in: Update.
+
 	* t-rep.s: Check rep repeats correct number of times.
 
 Fri Dec  5 10:11:18 1997  Andrew Cagney  <cagney@b1.cygnus.com>
diff --git a/sim/testsuite/d10v-elf/t-macros.i b/sim/testsuite/d10v-elf/t-macros.i
index 83029b5a0a..fcc54b0450 100644
--- a/sim/testsuite/d10v-elf/t-macros.i
+++ b/sim/testsuite/d10v-elf/t-macros.i
@@ -3,19 +3,20 @@
 	.align 2
 	.globl _start
 _start:
+	ldi r0, 0
 	.endm
 
 
 	.macro exit47
-	ldi r6, 1
-	ldi r2, 47
+	ldi r4, 1
+	ldi r0, 47
 	trap 15
 	.endm
 
 
 	.macro exit0
-	ldi r6, 1
-	ldi r2, 0
+	ldi r4, 1
+	ldi r0, 0
 	trap 15
 	.endm
 
@@ -38,8 +39,8 @@ _start:
 	.macro check exit reg val
 	cmpeqi	\reg, #\val
 	brf0t 1f
-0:	ldi r6, 1
-	ldi r2, \exit
+0:	ldi r4, 1
+	ldi r0, \exit
 	trap 15
 1:
 	.endm
@@ -54,8 +55,8 @@ _start:
 	cmpeqi	r2, #\lo
 	brf0f	0f
 	bra	2f
-0:	ldi r6, 1
-	ldi r2, \exit
+0:	ldi r4, 1
+	ldi r0, \exit
 	trap 15
 	.data
 	.align 2
@@ -89,8 +90,8 @@ _start:
 	cmpeq	r2, r3
 	brf0f	0f
 	bra	4f
-0:	ldi r6, 1
-	ldi r2, \exit
+0:	ldi r4, 1
+	ldi r0, \exit
 	trap 15
 4:
 	.endm
@@ -106,8 +107,8 @@ _start:
 	mvfc	r2, cr0
 	cmpeqi	r2, #\val
 	brf0t	1f
-	ldi r6, 1
-	ldi r2, \exit
+	ldi r4, 1
+	ldi r0, \exit
 	trap 15
 1:
 	.endm
@@ -115,13 +116,31 @@ _start:
 
 	.macro hello
 	;; 4:write (1, string, strlen (string))
-	ldi r6, 4
-	ldi r2, 1
-	ldi r3, 1f
-	ldi r4, 2f-1f-1
+	ldi r4, 4
+	ldi r0, 1
+	ldi r1, 1f
+	ldi r2, 2f-1f-1
 	trap 15
 	.section	.rodata
 1:	.string "Hello World!\n"
 2:	.align 2
 	.text
 	.endm
+
+
+	PSW_SM = 0x8000
+	PSW_01 = 0x4000
+	PSW_EA = 0x2000
+	PSW_DB = 0x1000
+	PSW_DM = 0x0800
+	PSW_IE = 0x0400
+	PSW_RP = 0x0200
+	PSW_MD = 0x0100
+	PSW_FX = 0x0080
+	PSW_ST = 0x0040
+	PSW_10 = 0x0020
+	PSW_11 = 0x0010
+	PSW_F0 = 0x0008
+	PSW_F1 = 0x0004
+	PSW_14 = 0x0002
+	PSW_C  = 0x0001