diff options
Diffstat (limited to 'sys/arch/mvme68k')
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/locore.s | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s index cec672c39f1..d44cbda8d1b 100644 --- a/sys/arch/mvme68k/mvme68k/locore.s +++ b/sys/arch/mvme68k/mvme68k/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.28 2001/08/31 00:37:20 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.29 2001/12/06 21:13:28 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -1338,17 +1338,17 @@ Lsw2: #endif /* M68060 */ 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 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 /* M68060 */ Lswnofpsave: #ifdef DIAGNOSTIC @@ -1394,8 +1394,8 @@ Lresnonofpatall: #endif /* M68060 */ 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 @@ -1406,10 +1406,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 @@ -1440,18 +1440,18 @@ 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 moveq #0,d0 rts #ifdef M68060 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 @@ -1803,8 +1803,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 @@ -1812,10 +1812,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 @@ -1828,8 +1828,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 @@ -1838,10 +1838,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 |