Define proper macros for FP frame offsets rather than magic numbers.

From NetBSD (tsutsui).

1 files changed, 31 insertions, 31 deletions

diff --git a/sys/arch/amiga/amiga/locore.s b/sys/arch/amiga/amiga/locore.s
index 2978408d710..9d1442dac5a 100644
--- a/sys/arch/amiga/amiga/locore.s
+++ b/sys/arch/amiga/amiga/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.33 2001/11/30 23:14:28 miod Exp $	*/
+/*	$OpenBSD: locore.s,v 1.34 2001/12/06 21:13:28 millert Exp $	*/
 /*	$NetBSD: locore.s,v 1.89 1997/07/17 16:22:54 is Exp $	*/
 
 /*
@@ -1302,8 +1302,8 @@ Lsw2:
 #endif
 	tstb	a2@			| null state frame?
 	jeq	Lswnofpsave		| yes, all done
-	fmovem	fp0-fp7,a2@(216)	| save FP general registers
-	fmovem	fpcr/fpsr/fpi,a2@(312)	| save FP control registers
+	fmovem	fp0-fp7,a2@(FPF_REGS)	| save FP general registers
+	fmovem	fpcr/fpsr/fpi,a2@(FPF_FPCR)	| save FP control registers
 #ifdef M68060
 	jra	Lswnofpsave
 #endif
@@ -1312,10 +1312,10 @@ Lsw2:
 Lsavfp60:
 	tstb	a2@(2)			| null state frame?
 	jeq	Lswnofpsave		| yes, all done
-	fmovem	fp0-fp7,a2@(216)	| save FP general registers
-	fmovem	fpcr,a2@(312)		| save FP control registers
-	fmovem	fpsr,a2@(316)
-	fmovem	fpi,a2@(320)
+	fmovem	fp0-fp7,a2@(FPF_REGS)	| save FP general registers
+	fmovem	fpcr,a2@(FPF_FPCR)	| save FP control registers
+	fmovem	fpsr,a2@(FPF_FPSR)
+	fmovem	fpi,a2@(FPF_FPI)
 #endif
 Lswnofpsave:
 
@@ -1362,8 +1362,8 @@ Lresnonofpatall:
 #endif
 	tstb	a0@			| null state frame?
 	jeq	Lresfprest2		| yes, easy
-	fmovem	a0@(312),fpcr/fpsr/fpi	| restore FP control registers
-	fmovem	a0@(216),fp0-fp7	| restore FP general registers
+	fmovem	a0@(FPF_FPCR),fpcr/fpsr/fpi	| restore FP control registers
+	fmovem	a0@(FPF_REGS),fp0-fp7	| restore FP general registers
 Lresfprest2:
 	frestore a0@			| restore state
 	movw	a1@(PCB_PS),sr		| no, restore PS
@@ -1375,10 +1375,10 @@ Lresfprest2:
 Lresfp60rest1:
 	tstb	a0@(2)			| null state frame?
 	jeq	Lresfp60rest2		| yes, easy
-	fmovem	a0@(312),fpcr		| restore FP control registers
-	fmovem	a0@(316),fpsr
-	fmovem	a0@(320),fpi
-	fmovem	a0@(216),fp0-fp7	| restore FP general registers
+	fmovem	a0@(FPF_FPCR),fpcr	| restore FP control registers
+	fmovem	a0@(FPF_FPSR),fpsr
+	fmovem	a0@(FPF_FPI),fpi
+	fmovem	a0@(FPF_REGS),fp0-fp7	| restore FP general registers
 Lresfp60rest2:
 	frestore a0@			| restore state
 	movw	a1@(PCB_PS),sr		| no, restore PS
@@ -1410,8 +1410,8 @@ ENTRY(savectx)
 #endif
 	tstb	a0@			| null state frame?
 	jeq	Lsavedone		| yes, all done
-	fmovem	fp0-fp7,a0@(216)	| save FP general registers
-	fmovem	fpcr/fpsr/fpi,a0@(312)	| save FP control registers
+	fmovem	fp0-fp7,a0@(FPF_REGS)	| save FP general registers
+	fmovem	fpcr/fpsr/fpi,a0@(FPF_FPCR)	| save FP control registers
 #ifdef	M68060
 	moveq	#0,d0
 	rts
@@ -1421,10 +1421,10 @@ ENTRY(savectx)
 Lsavctx60:
 	tstb	a0@(2)
 	jeq	Lsavedone
-	fmovem	fp0-fp7,a0@(216)	| save FP general registers
-	fmovem	fpcr,a0@(312)		| save FP control registers
-	fmovem	fpsr,a0@(316)
-	fmovem	fpi,a0@(320)
+	fmovem	fp0-fp7,a0@(FPF_REGS)	| save FP general registers
+	fmovem	fpcr,a0@(FPF_FPCR)	| save FP control registers
+	fmovem	fpsr,a0@(FPF_FPSR)
+	fmovem	fpi,a0@(FPF_FPI)
 #endif
 Lsavedone:
 	moveq	#0,d0			| return 0
@@ -1747,8 +1747,8 @@ ENTRY(m68881_save)
 #endif
 	tstb	a0@			| null state frame?
 	jeq	Lm68881sdone		| yes, all done
-	fmovem fp0-fp7,a0@(216)		| save FP general registers
-	fmovem fpcr/fpsr/fpi,a0@(312)	| save FP control registers
+	fmovem fp0-fp7,a0@(FPF_REGS)	| save FP general registers
+	fmovem fpcr/fpsr/fpi,a0@(FPF_FPCR)	| save FP control registers
 Lm68881sdone:
 	rts
 #endif
@@ -1757,10 +1757,10 @@ Lm68881sdone:
 Lm68060fpsave:
 	tstb	a0@(2)			| null state frame?
 	jeq	Lm68060sdone		| yes, all done
-	fmovem fp0-fp7,a0@(216)		| save FP general registers
-	fmovem	fpcr,a0@(312)		| save FP control registers
-	fmovem	fpsr,a0@(316)
-	fmovem	fpi,a0@(320)
+	fmovem fp0-fp7,a0@(FPF_REGS)	| save FP general registers
+	fmovem	fpcr,a0@(FPF_FPCR)	| save FP control registers
+	fmovem	fpsr,a0@(FPF_FPSR)
+	fmovem	fpi,a0@(FPF_FPI)
 Lm68060sdone:
 	rts
 #endif
@@ -1774,8 +1774,8 @@ ENTRY(m68881_restore)
 #endif
 	tstb	a0@			| null state frame?
 	jeq	Lm68881rdone		| yes, easy
-	fmovem	a0@(312),fpcr/fpsr/fpi	| restore FP control registers
-	fmovem	a0@(216),fp0-fp7	| restore FP general registers
+	fmovem	a0@(FPF_FPCR),fpcr/fpsr/fpi	| restore FP control registers
+	fmovem	a0@(FPF_REGS),fp0-fp7	| restore FP general registers
 Lm68881rdone:
 	frestore a0@			| restore state
 	rts
@@ -1785,10 +1785,10 @@ Lm68881rdone:
 Lm68060fprestore:
 	tstb	a0@(2)			| null state frame?
 	jeq	Lm68060fprdone		| yes, easy
-	fmovem	a0@(312),fpcr		| restore FP control registers
-	fmovem	a0@(316),fpsr
-	fmovem	a0@(320),fpi
-	fmovem	a0@(216),fp0-fp7	| restore FP general registers
+	fmovem	a0@(FPF_FPCR),fpcr	| restore FP control registers
+	fmovem	a0@(FPF_FPSR),fpsr
+	fmovem	a0@(FPF_FPI),fpi
+	fmovem	a0@(FPF_REGS),fp0-fp7	| restore FP general registers
 Lm68060fprdone:
 	frestore a0@			| restore state
 	rts