Module Name: src
Committed By: matt
Date: Sat Sep 5 03:24:21 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: fp.S
Log Message:
Use INT_[LS] for dealing with the FRAME_FSR.
To generate a diff of this commit:
cvs rdiff -u -r1.33.38.5 -r1.33.38.6 src/sys/arch/mips/mips/fp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/fp.S
diff -u src/sys/arch/mips/mips/fp.S:1.33.38.5 src/sys/arch/mips/mips/fp.S:1.33.38.6
--- src/sys/arch/mips/mips/fp.S:1.33.38.5 Wed Sep 2 13:00:39 2009
+++ src/sys/arch/mips/mips/fp.S Sat Sep 5 03:24:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fp.S,v 1.33.38.5 2009/09/02 13:00:39 uebayasi Exp $ */
+/* $NetBSD: fp.S,v 1.33.38.6 2009/09/05 03:24:21 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -139,7 +139,7 @@
#ifdef SOFTFLOAT
PTR_L t0, L_ADDR(MIPS_CURLWP) # get pcb of current process
PTR_L a3, fmt_tbl(v0) # switch on FUNC & FMT
- FPX_L a2, U_PCB_FPREGS+FRAME_FSR(t0)
+ INT_L a2, U_PCB_FPREGS+FRAME_FSR(t0)
#else
cfc1 a2, MIPS_FPU_CSR # get exception register
PTR_L a3, fmt_tbl(v0) # switch on FUNC & FMT
@@ -727,7 +727,7 @@
move v0, zero
bne t1, t2, cfinvalid
- FPX_L v0, U_PCB_FPREGS+FRAME_FSR(t0)
+ INT_L v0, U_PCB_FPREGS+FRAME_FSR(t0)
cfinvalid:
@@ -759,7 +759,7 @@
REG_EPILOGUE
PTR_L t0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S v0, U_PCB_FPREGS+FRAME_FSR(t0)
+ INT_S v0, U_PCB_FPREGS+FRAME_FSR(t0)
b done
@@ -1316,7 +1316,7 @@
#ifdef SOFTFLOAT
PTR_L t1, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(t1)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(t1)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
@@ -1396,7 +1396,7 @@
#ifdef SOFTFLOAT
PTR_L t1, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(t1)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(t1)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
@@ -2014,7 +2014,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
@@ -2126,7 +2126,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save condition bit
#endif
@@ -2149,7 +2149,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save condition bit
#endif
@@ -2266,7 +2266,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
@@ -2387,7 +2387,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
@@ -2528,7 +2528,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
@@ -2671,7 +2671,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
@@ -2688,7 +2688,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
@@ -2709,7 +2709,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
@@ -2731,7 +2731,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
@@ -2749,7 +2749,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
/*
* ctc1 with fpe bits set causes FPE in kernel mode panic on 5231.
@@ -2762,7 +2762,7 @@
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#endif
REG_L a1, CALLFRAME_SIZ + 1*SZREG(sp) # frame
REG_L a2, CALLFRAME_SIZ + 2*SZREG(sp) # cause
@@ -2777,7 +2777,7 @@
#ifdef SOFTFLOAT
PTR_L v0, L_ADDR(MIPS_CURLWP) # get pcb of current process
#nop
- FPX_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
+ INT_S a2, U_PCB_FPREGS+FRAME_FSR(v0)
#else
ctc1 a2, MIPS_FPU_CSR # save exceptions
#endif
