--- nono/exp/fmovemc.has	2026/04/29 17:05:28	1.1.1.3
+++ nono/exp/fmovemc.has	2026/04/29 17:05:36	1.1.1.4
@@ -29,6 +29,7 @@
 
 	.xref	hexstr_long
 	.include doscall.mac
+	.include iocscall.mac
 	.list
 	.cpu	68030
 
@@ -38,16 +39,6 @@ PRINT	.macro	msg
 	addq.l	#4,sp
 	.endm
 
-SET_FLINE_TRAP	.macro
-	move.l	(a5),a4
-	lea.l	fline_handler(pc),a1
-	move.l	a1,(a5)
-	.endm
-
-RESTORE_FLINE_TRAP	.macro
-	move.l	a4,(a5)
-	.endm
-
 	.text
 	.even
 start:
@@ -59,12 +50,12 @@ test_fmovem_dn_to____:
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
 	move.l	#$55555555,d0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f200, $8000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -112,12 +103,12 @@ test_fmovem_an_to____:
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
 	move.l	#$55555555,a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $8000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -166,12 +157,12 @@ test_fmovem_anin_to____:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f210, $8000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -229,12 +220,12 @@ test_fmovem_anpi_to____:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f218, $8000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -292,12 +283,12 @@ test_fmovem_anpd_to____:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea+4(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f220, $8000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -353,13 +344,13 @@ test_fmovem_imm_to____:
 	fmove.l	#0,fpcr
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f23c, $8000
 	.dc.l $55555555
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -407,12 +398,12 @@ test_fmovem_dn_to___I:
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
 	move.l	#$55555555,d0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l d0,fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -460,12 +451,12 @@ test_fmovem_an_to___I:
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
 	move.l	#$55555555,a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l a0,fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -514,12 +505,12 @@ test_fmovem_anin_to___I:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0),fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -577,12 +568,12 @@ test_fmovem_anpi_to___I:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0)+,fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -640,12 +631,12 @@ test_fmovem_anpd_to___I:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea+4(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l -(a0),fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -701,12 +692,12 @@ test_fmovem_imm_to___I:
 	fmove.l	#0,fpcr
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l #$55555555,fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -754,12 +745,12 @@ test_fmovem_dn_to__S_:
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
 	move.l	#$55555555,d0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l d0,fpsr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -786,7 +777,7 @@ test_fmovem_dn_to__S_:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -807,12 +798,12 @@ test_fmovem_an_to__S_:
 	rts
 @@:
 	PRINT	msg_fmovem_an_to__S_
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $8800
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -828,12 +819,12 @@ test_fmovem_anin_to__S_:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0),fpsr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -869,7 +860,7 @@ test_fmovem_anin_to__S_:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -891,12 +882,12 @@ test_fmovem_anpi_to__S_:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0)+,fpsr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -932,7 +923,7 @@ test_fmovem_anpi_to__S_:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -954,12 +945,12 @@ test_fmovem_anpd_to__S_:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea+4(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l -(a0),fpsr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -995,7 +986,7 @@ test_fmovem_anpd_to__S_:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -1015,12 +1006,12 @@ test_fmovem_imm_to__S_:
 	fmove.l	#0,fpcr
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l #$55555555,fpsr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1047,7 +1038,7 @@ test_fmovem_imm_to__S_:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -1068,12 +1059,12 @@ test_fmovem_dn_to__SI:
 	rts
 @@:
 	PRINT	msg_fmovem_dn_to__SI
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f200, $8c00
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -1088,12 +1079,12 @@ test_fmovem_an_to__SI:
 	rts
 @@:
 	PRINT	msg_fmovem_an_to__SI
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $8c00
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -1110,12 +1101,12 @@ test_fmovem_anin_to__SI:
 	move.l	#$55555555,workarea
 	move.l	#$aaaaaaaa,workarea+4
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0),fpsr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1174,12 +1165,12 @@ test_fmovem_anpi_to__SI:
 	move.l	#$55555555,workarea
 	move.l	#$aaaaaaaa,workarea+4
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0)+,fpsr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1238,12 +1229,12 @@ test_fmovem_anpd_to__SI:
 	move.l	#$55555555,workarea
 	move.l	#$aaaaaaaa,workarea+4
 	lea.l	workarea+8(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l -(a0),fpsr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1299,12 +1290,12 @@ test_fmovem_imm_to__SI:
 	fmove.l	#0,fpcr
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l #$55555555,#$aaaaaaaa,fpsr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1352,12 +1343,12 @@ test_fmovem_dn_to_C__:
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
 	move.l	#$55555555,d0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l d0,fpcr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1384,7 +1375,7 @@ test_fmovem_dn_to_C__:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -1405,12 +1396,12 @@ test_fmovem_an_to_C__:
 	rts
 @@:
 	PRINT	msg_fmovem_an_to_C__
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $9000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -1426,12 +1417,12 @@ test_fmovem_anin_to_C__:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0),fpcr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1467,7 +1458,7 @@ test_fmovem_anin_to_C__:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -1489,12 +1480,12 @@ test_fmovem_anpi_to_C__:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0)+,fpcr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1530,7 +1521,7 @@ test_fmovem_anpi_to_C__:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -1552,12 +1543,12 @@ test_fmovem_anpd_to_C__:
 	fmove.l	#0,fpiar
 	move.l	#$55555555,workarea
 	lea.l	workarea+4(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l -(a0),fpcr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1593,7 +1584,7 @@ test_fmovem_anpd_to_C__:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -1613,12 +1604,12 @@ test_fmovem_imm_to_C__:
 	fmove.l	#0,fpcr
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l #$55555555,fpcr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1645,7 +1636,7 @@ test_fmovem_imm_to_C__:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -1666,12 +1657,12 @@ test_fmovem_dn_to_C_I:
 	rts
 @@:
 	PRINT	msg_fmovem_dn_to_C_I
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f200, $9400
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -1686,12 +1677,12 @@ test_fmovem_an_to_C_I:
 	rts
 @@:
 	PRINT	msg_fmovem_an_to_C_I
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $9400
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -1708,12 +1699,12 @@ test_fmovem_anin_to_C_I:
 	move.l	#$55555555,workarea
 	move.l	#$aaaaaaaa,workarea+4
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0),fpcr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1772,12 +1763,12 @@ test_fmovem_anpi_to_C_I:
 	move.l	#$55555555,workarea
 	move.l	#$aaaaaaaa,workarea+4
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0)+,fpcr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1836,12 +1827,12 @@ test_fmovem_anpd_to_C_I:
 	move.l	#$55555555,workarea
 	move.l	#$aaaaaaaa,workarea+4
 	lea.l	workarea+8(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l -(a0),fpcr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1897,12 +1888,12 @@ test_fmovem_imm_to_C_I:
 	fmove.l	#0,fpcr
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l #$55555555,#$aaaaaaaa,fpcr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -1950,12 +1941,12 @@ test_fmovem_dn_to_CS_:
 	rts
 @@:
 	PRINT	msg_fmovem_dn_to_CS_
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f200, $9800
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -1970,12 +1961,12 @@ test_fmovem_an_to_CS_:
 	rts
 @@:
 	PRINT	msg_fmovem_an_to_CS_
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $9800
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -1992,12 +1983,12 @@ test_fmovem_anin_to_CS_:
 	move.l	#$55555555,workarea
 	move.l	#$aaaaaaaa,workarea+4
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0),fpcr/fpsr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2033,7 +2024,7 @@ test_fmovem_anin_to_CS_:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -2056,12 +2047,12 @@ test_fmovem_anpi_to_CS_:
 	move.l	#$55555555,workarea
 	move.l	#$aaaaaaaa,workarea+4
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0)+,fpcr/fpsr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2097,7 +2088,7 @@ test_fmovem_anpi_to_CS_:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -2120,12 +2111,12 @@ test_fmovem_anpd_to_CS_:
 	move.l	#$55555555,workarea
 	move.l	#$aaaaaaaa,workarea+4
 	lea.l	workarea+8(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l -(a0),fpcr/fpsr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2161,7 +2152,7 @@ test_fmovem_anpd_to_CS_:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -2181,12 +2172,12 @@ test_fmovem_imm_to_CS_:
 	fmove.l	#0,fpcr
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l #$55555555,#$aaaaaaaa,fpcr/fpsr
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2213,7 +2204,7 @@ test_fmovem_imm_to_CS_:
 	lea.l	12(sp),sp
 @@:
 	fmove.l	fpiar,a0
-	move.l	d7,a1	; d7=0
+	suba.l	a1,a1
 	cmpa.l	a1,a0
 	beq	@f
 	pea.l	msg_fail_ir(pc)
@@ -2234,12 +2225,12 @@ test_fmovem_dn_to_CSI:
 	rts
 @@:
 	PRINT	msg_fmovem_dn_to_CSI
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f200, $9c00
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -2254,12 +2245,12 @@ test_fmovem_an_to_CSI:
 	rts
 @@:
 	PRINT	msg_fmovem_an_to_CSI
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $9c00
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -2277,12 +2268,12 @@ test_fmovem_anin_to_CSI:
 	move.l	#$aaaaaaaa,workarea+4
 	move.l	#$33333333,workarea+8
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0),fpcr/fpsr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2342,12 +2333,12 @@ test_fmovem_anpi_to_CSI:
 	move.l	#$aaaaaaaa,workarea+4
 	move.l	#$33333333,workarea+8
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l (a0)+,fpcr/fpsr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2407,12 +2398,12 @@ test_fmovem_anpd_to_CSI:
 	move.l	#$aaaaaaaa,workarea+4
 	move.l	#$33333333,workarea+8
 	lea.l	workarea+12(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l -(a0),fpcr/fpsr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2468,12 +2459,12 @@ test_fmovem_imm_to_CSI:
 	fmove.l	#0,fpcr
 	fmove.l	#0,fpsr
 	fmove.l	#0,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l #$55555555,#$aaaaaaaa,#$33333333,fpcr/fpsr/fpiar
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2520,12 +2511,12 @@ test_fmovem_____to_dn:
 	fmove.l	#$00000000,fpcr
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$55555555,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f200, $a000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2534,7 +2525,7 @@ test_fmovem_____to_dn:
 	move.l	#$55555555,d1
 	cmp.l	d1,d0
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	d0,-(sp)
 	bsr	result
@@ -2551,12 +2542,12 @@ test_fmovem_____to_an:
 	fmove.l	#$00000000,fpcr
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$55555555,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $a000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2565,7 +2556,7 @@ test_fmovem_____to_an:
 	movea.l	#$55555555,a1
 	cmp.l	a1,a0
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	a1,-(sp)
 	move.l	a0,-(sp)
 	bsr	result
@@ -2583,12 +2574,12 @@ test_fmovem_____to_anin:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$55555555,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f210, $a000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2606,7 +2597,7 @@ test_fmovem_____to_anin:
 	move.l	#$55555555,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -2624,12 +2615,12 @@ test_fmovem_____to_anpi:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$55555555,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f218, $a000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2647,7 +2638,7 @@ test_fmovem_____to_anpi:
 	move.l	#$55555555,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -2665,12 +2656,12 @@ test_fmovem_____to_anpd:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$55555555,fpiar
 	lea.l	workarea+4(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f220, $a000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2688,7 +2679,7 @@ test_fmovem_____to_anpd:
 	move.l	#$55555555,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -2706,12 +2697,12 @@ test_fmovem_____to_imm:
 	rts
 @@:
 	PRINT	msg_fmovem_____to_imm
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f23c, $a000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -2725,12 +2716,12 @@ test_fmovem___I_to_dn:
 	fmove.l	#$00000000,fpcr
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$55555555,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpiar,d0
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2739,7 +2730,7 @@ test_fmovem___I_to_dn:
 	move.l	#$55555555,d1
 	cmp.l	d1,d0
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	d0,-(sp)
 	bsr	result
@@ -2756,12 +2747,12 @@ test_fmovem___I_to_an:
 	fmove.l	#$00000000,fpcr
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$55555555,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpiar,a0
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2770,7 +2761,7 @@ test_fmovem___I_to_an:
 	movea.l	#$55555555,a1
 	cmp.l	a1,a0
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	a1,-(sp)
 	move.l	a0,-(sp)
 	bsr	result
@@ -2788,12 +2779,12 @@ test_fmovem___I_to_anin:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$55555555,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpiar,(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2811,7 +2802,7 @@ test_fmovem___I_to_anin:
 	move.l	#$55555555,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -2829,12 +2820,12 @@ test_fmovem___I_to_anpi:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$55555555,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpiar,(a0)+
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2852,7 +2843,7 @@ test_fmovem___I_to_anpi:
 	move.l	#$55555555,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -2870,12 +2861,12 @@ test_fmovem___I_to_anpd:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$55555555,fpiar
 	lea.l	workarea+4(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpiar,-(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2893,7 +2884,7 @@ test_fmovem___I_to_anpd:
 	move.l	#$55555555,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -2911,12 +2902,12 @@ test_fmovem___I_to_imm:
 	rts
 @@:
 	PRINT	msg_fmovem___I_to_imm
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f23c, $a400
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -2930,12 +2921,12 @@ test_fmovem__S__to_dn:
 	fmove.l	#$00000000,fpcr
 	fmove.l	#$55555555,fpsr
 	fmove.l	#$00000000,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpsr,d0
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -2944,7 +2935,7 @@ test_fmovem__S__to_dn:
 	move.l	#$05555550,d1
 	cmp.l	d1,d0
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	d0,-(sp)
 	bsr	result
@@ -2962,12 +2953,12 @@ test_fmovem__S__to_an:
 	rts
 @@:
 	PRINT	msg_fmovem__S__to_an
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $a800
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -2982,12 +2973,12 @@ test_fmovem__S__to_anin:
 	fmove.l	#$55555555,fpsr
 	fmove.l	#$00000000,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpsr,(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3005,7 +2996,7 @@ test_fmovem__S__to_anin:
 	move.l	#$05555550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3023,12 +3014,12 @@ test_fmovem__S__to_anpi:
 	fmove.l	#$55555555,fpsr
 	fmove.l	#$00000000,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpsr,(a0)+
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3046,7 +3037,7 @@ test_fmovem__S__to_anpi:
 	move.l	#$05555550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3064,12 +3055,12 @@ test_fmovem__S__to_anpd:
 	fmove.l	#$55555555,fpsr
 	fmove.l	#$00000000,fpiar
 	lea.l	workarea+4(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpsr,-(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3087,7 +3078,7 @@ test_fmovem__S__to_anpd:
 	move.l	#$05555550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3105,12 +3096,12 @@ test_fmovem__S__to_imm:
 	rts
 @@:
 	PRINT	msg_fmovem__S__to_imm
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f23c, $a800
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3125,12 +3116,12 @@ test_fmovem__SI_to_dn:
 	rts
 @@:
 	PRINT	msg_fmovem__SI_to_dn
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f200, $ac00
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3145,12 +3136,12 @@ test_fmovem__SI_to_an:
 	rts
 @@:
 	PRINT	msg_fmovem__SI_to_an
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $ac00
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3165,12 +3156,12 @@ test_fmovem__SI_to_anin:
 	fmove.l	#$55555555,fpsr
 	fmove.l	#$aaaaaaaa,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpsr/fpiar,(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3188,7 +3179,7 @@ test_fmovem__SI_to_anin:
 	move.l	#$05555550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3197,7 +3188,7 @@ test_fmovem__SI_to_anin:
 	move.l	#$aaaaaaaa,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -3215,12 +3206,12 @@ test_fmovem__SI_to_anpi:
 	fmove.l	#$55555555,fpsr
 	fmove.l	#$aaaaaaaa,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpsr/fpiar,(a0)+
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3238,7 +3229,7 @@ test_fmovem__SI_to_anpi:
 	move.l	#$05555550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3247,7 +3238,7 @@ test_fmovem__SI_to_anpi:
 	move.l	#$aaaaaaaa,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -3265,12 +3256,12 @@ test_fmovem__SI_to_anpd:
 	fmove.l	#$55555555,fpsr
 	fmove.l	#$aaaaaaaa,fpiar
 	lea.l	workarea+8(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpsr/fpiar,-(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3288,7 +3279,7 @@ test_fmovem__SI_to_anpd:
 	move.l	#$05555550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3297,7 +3288,7 @@ test_fmovem__SI_to_anpd:
 	move.l	#$aaaaaaaa,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -3315,12 +3306,12 @@ test_fmovem__SI_to_imm:
 	rts
 @@:
 	PRINT	msg_fmovem__SI_to_imm
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f23c, $ac00
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3334,12 +3325,12 @@ test_fmovem_C___to_dn:
 	fmove.l	#$55555555,fpcr
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$00000000,fpiar
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr,d0
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3348,7 +3339,7 @@ test_fmovem_C___to_dn:
 	move.l	#$00005550,d1
 	cmp.l	d1,d0
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	d0,-(sp)
 	bsr	result
@@ -3366,12 +3357,12 @@ test_fmovem_C___to_an:
 	rts
 @@:
 	PRINT	msg_fmovem_C___to_an
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $b000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3386,12 +3377,12 @@ test_fmovem_C___to_anin:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$00000000,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr,(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3409,7 +3400,7 @@ test_fmovem_C___to_anin:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3427,12 +3418,12 @@ test_fmovem_C___to_anpi:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$00000000,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr,(a0)+
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3450,7 +3441,7 @@ test_fmovem_C___to_anpi:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3468,12 +3459,12 @@ test_fmovem_C___to_anpd:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$00000000,fpiar
 	lea.l	workarea+4(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr,-(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3491,7 +3482,7 @@ test_fmovem_C___to_anpd:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3509,12 +3500,12 @@ test_fmovem_C___to_imm:
 	rts
 @@:
 	PRINT	msg_fmovem_C___to_imm
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f23c, $b000
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3529,12 +3520,12 @@ test_fmovem_C_I_to_dn:
 	rts
 @@:
 	PRINT	msg_fmovem_C_I_to_dn
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f200, $b400
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3549,12 +3540,12 @@ test_fmovem_C_I_to_an:
 	rts
 @@:
 	PRINT	msg_fmovem_C_I_to_an
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $b400
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3569,12 +3560,12 @@ test_fmovem_C_I_to_anin:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$aaaaaaaa,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr/fpiar,(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3592,7 +3583,7 @@ test_fmovem_C_I_to_anin:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3601,7 +3592,7 @@ test_fmovem_C_I_to_anin:
 	move.l	#$aaaaaaaa,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -3619,12 +3610,12 @@ test_fmovem_C_I_to_anpi:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$aaaaaaaa,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr/fpiar,(a0)+
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3642,7 +3633,7 @@ test_fmovem_C_I_to_anpi:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3651,7 +3642,7 @@ test_fmovem_C_I_to_anpi:
 	move.l	#$aaaaaaaa,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -3669,12 +3660,12 @@ test_fmovem_C_I_to_anpd:
 	fmove.l	#$00000000,fpsr
 	fmove.l	#$aaaaaaaa,fpiar
 	lea.l	workarea+8(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr/fpiar,-(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3692,7 +3683,7 @@ test_fmovem_C_I_to_anpd:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3701,7 +3692,7 @@ test_fmovem_C_I_to_anpd:
 	move.l	#$aaaaaaaa,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -3719,12 +3710,12 @@ test_fmovem_C_I_to_imm:
 	rts
 @@:
 	PRINT	msg_fmovem_C_I_to_imm
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f23c, $b400
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3739,12 +3730,12 @@ test_fmovem_CS__to_dn:
 	rts
 @@:
 	PRINT	msg_fmovem_CS__to_dn
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f200, $b800
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3759,12 +3750,12 @@ test_fmovem_CS__to_an:
 	rts
 @@:
 	PRINT	msg_fmovem_CS__to_an
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $b800
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3779,12 +3770,12 @@ test_fmovem_CS__to_anin:
 	fmove.l	#$aaaaaaaa,fpsr
 	fmove.l	#$00000000,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr/fpsr,(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3802,7 +3793,7 @@ test_fmovem_CS__to_anin:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3811,7 +3802,7 @@ test_fmovem_CS__to_anin:
 	move.l	#$0aaaaaa8,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -3829,12 +3820,12 @@ test_fmovem_CS__to_anpi:
 	fmove.l	#$aaaaaaaa,fpsr
 	fmove.l	#$00000000,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr/fpsr,(a0)+
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3852,7 +3843,7 @@ test_fmovem_CS__to_anpi:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3861,7 +3852,7 @@ test_fmovem_CS__to_anpi:
 	move.l	#$0aaaaaa8,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -3879,12 +3870,12 @@ test_fmovem_CS__to_anpd:
 	fmove.l	#$aaaaaaaa,fpsr
 	fmove.l	#$00000000,fpiar
 	lea.l	workarea+8(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr/fpsr,-(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -3902,7 +3893,7 @@ test_fmovem_CS__to_anpd:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -3911,7 +3902,7 @@ test_fmovem_CS__to_anpd:
 	move.l	#$0aaaaaa8,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -3929,12 +3920,12 @@ test_fmovem_CS__to_imm:
 	rts
 @@:
 	PRINT	msg_fmovem_CS__to_imm
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f23c, $b800
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3949,12 +3940,12 @@ test_fmovem_CSI_to_dn:
 	rts
 @@:
 	PRINT	msg_fmovem_CSI_to_dn
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f200, $bc00
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3969,12 +3960,12 @@ test_fmovem_CSI_to_an:
 	rts
 @@:
 	PRINT	msg_fmovem_CSI_to_an
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f208, $bc00
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -3989,12 +3980,12 @@ test_fmovem_CSI_to_anin:
 	fmove.l	#$aaaaaaaa,fpsr
 	fmove.l	#$33333333,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr/fpsr/fpiar,(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -4012,7 +4003,7 @@ test_fmovem_CSI_to_anin:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -4021,7 +4012,7 @@ test_fmovem_CSI_to_anin:
 	move.l	#$0aaaaaa8,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -4030,7 +4021,7 @@ test_fmovem_CSI_to_anin:
 	move.l	#$33333333,d1
 	cmp.l	workarea+8,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+12,-(sp)
 	bsr	result
@@ -4048,12 +4039,12 @@ test_fmovem_CSI_to_anpi:
 	fmove.l	#$aaaaaaaa,fpsr
 	fmove.l	#$33333333,fpiar
 	lea.l	workarea(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr/fpsr/fpiar,(a0)+
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -4071,7 +4062,7 @@ test_fmovem_CSI_to_anpi:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -4080,7 +4071,7 @@ test_fmovem_CSI_to_anpi:
 	move.l	#$0aaaaaa8,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -4089,7 +4080,7 @@ test_fmovem_CSI_to_anpi:
 	move.l	#$33333333,d1
 	cmp.l	workarea+8,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+12,-(sp)
 	bsr	result
@@ -4107,12 +4098,12 @@ test_fmovem_CSI_to_anpd:
 	fmove.l	#$aaaaaaaa,fpsr
 	fmove.l	#$33333333,fpiar
 	lea.l	workarea+12(pc),a0
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	fmovem.l fpcr/fpsr/fpiar,-(a0)
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	beq	@f
 	PRINT	msg_fail_trap
@@ -4130,7 +4121,7 @@ test_fmovem_CSI_to_anpd:
 	move.l	#$00005550,d1
 	cmp.l	workarea+0,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+4,-(sp)
 	bsr	result
@@ -4139,7 +4130,7 @@ test_fmovem_CSI_to_anpd:
 	move.l	#$0aaaaaa8,d1
 	cmp.l	workarea+4,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+8,-(sp)
 	bsr	result
@@ -4148,7 +4139,7 @@ test_fmovem_CSI_to_anpd:
 	move.l	#$33333333,d1
 	cmp.l	workarea+8,d1
 	beq	@f
-	pea.l	msg_fail(pc)
+	pea.l	msg_fail_dst(pc)
 	move.l	d1,-(sp)
 	move.l	workarea+12,-(sp)
 	bsr	result
@@ -4166,12 +4157,12 @@ test_fmovem_CSI_to_imm:
 	rts
 @@:
 	PRINT	msg_fmovem_CSI_to_imm
-	SET_FLINE_TRAP
+	bsr	set_fline
 	moveq.l	#0,d7
 	lea.l	@f,a3
 	.dc.w	$f23c, $bc00
 @@:
-	RESTORE_FLINE_TRAP
+	bsr	restore_fline
 	tst.l	d7
 	bne	@f
 	PRINT	msg_fail_notrap
@@ -4183,7 +4174,7 @@ test_fmovem_CSI_to_imm:
 start2:
 	clr.l	-(sp)
 	DOS	_SUPER
-	movem.l	d7/a3-a5,-(sp)
+	movem.l	d7/a3-a4,-(sp)
 	; rough argument check
 	cmpi.b	#4,(a2)+	; strlen(arg)>=4 ?
 	bcs	@f
@@ -4198,9 +4189,6 @@ disp_hard:
 disp_easy:
 	PRINT	msg_easy
 @@:
-
-	moveq.l	#$2c,d0		; alternate of "lea.l $2c,a5"
-	move.l	d0,a5		;
 	tst.b	is_hard(pc)
 	beq		@f
 	bsr	test_fmovem_dn_to____
@@ -4333,7 +4321,7 @@ disp_easy:
 	bsr	test_fmovem_CSI_to_anpi
 	bsr	test_fmovem_CSI_to_anpd
 	bsr	test_fmovem_CSI_to_imm
-	movem.l	(sp)+,d7/a3-a5
+	movem.l	(sp)+,d7/a3-a4
 	DOS	_EXIT
 
 ; 結果表示
@@ -4363,6 +4351,28 @@ result:
 	unlk	a6
 	rts
 
+; Fライン例外をテスト用のものに差し替える。
+; 変更前のアドレスを a4 に格納する。
+; a1 は破壊する。
+set_fline:
+	movem.l	d0-d1,-(sp)
+	moveq.l	#$b,d1
+	lea.l	fline_handler(pc),a1
+	IOCS	_B_INTVCS
+	movea.l	d0,a4
+	movem.l	(sp)+,d0-d1
+	rts
+
+; Fライン例外を元に戻す。
+; a1 は破壊する。
+restore_fline:
+	movem.l	d0-d1,-(sp)
+	moveq.l	#$b,d1
+	movea.l	a4,a1
+	IOCS	_B_INTVCS
+	movem.l	(sp)+,d0-d1
+	rts
+
 ; Fライン例外ハンドラ
 ; a3 に戻りアドレスをセットしてあること
 ; d7 を 1 にして帰る
@@ -4378,11 +4388,11 @@ msg_fail_notrap:	.dc.b	$9,"FAIL: trap ex
 msg_fail_trap:	.dc.b	$9,"FAIL: unexpected trap occured",$d,$a,0
 
 msg_ok:		.dc.b	$9,"ok",$d,$a,0
-msg_fail:	.dc.b	$9,"fail",$d,$a,0
 msg_fail_cr:	.dc.b	$9,"FAIL: fpcr expects ",0
 msg_fail_sr:	.dc.b	$9,"FAIL: fpsr expects ",0
 msg_fail_ir:	.dc.b	$9,"FAIL: fpiar expects ",0
 msg_fail_addr:	.dc.b	$9,"FAIL: an expects ",0
+msg_fail_dst:	.dc.b	$9,"FAIL: dst expects ",0
 msg_but:	.dc.b	" but ",0
 msg_crlf:	.dc.b	$d,$a,0