summaryrefslogtreecommitdiff
path: root/libcpu/mips/common/stackframe.h
diff options
context:
space:
mode:
authoraozima <[email protected]>2020-10-09 15:17:27 +0800
committeraozima <[email protected]>2020-10-09 15:17:27 +0800
commit05777266b9dffe30df0bef15b35b710f6de21710 (patch)
tree6453a68327fd2d7ffb3dcbf788bd5f6d8b209528 /libcpu/mips/common/stackframe.h
parent79fd12842beeee5a653ba6f4bc2f08b21be7697a (diff)
parentaeff91b2a7fc846cf3724c01c28fbd7327bd2bac (diff)
Merge remote-tracking branch 'remotes/gitee/master' into gitee_master
Diffstat (limited to 'libcpu/mips/common/stackframe.h')
-rw-r--r--libcpu/mips/common/stackframe.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/libcpu/mips/common/stackframe.h b/libcpu/mips/common/stackframe.h
index 258f9a994f..bb92a18c9c 100644
--- a/libcpu/mips/common/stackframe.h
+++ b/libcpu/mips/common/stackframe.h
@@ -22,7 +22,9 @@
#ifdef RT_USING_FPU
/* Ensure CU1 (FPU) is enabled */
MFC0 v1, CP0_STATUS
- ori v1, ST0_CU1
+ lui t1, %hi(ST0_CU1)
+ addiu t1, t1, %lo(ST0_CU1)
+ or v1, v1, t1
MTC0 v1, CP0_STATUS
SSNOP
cfc1 v1, fcr31
@@ -125,11 +127,13 @@
#ifdef RT_USING_FPU
/* Ensure CU1 (FPU) is enabled */
MFC0 v1, CP0_STATUS
- ori v1, ST0_CU1
+ lui t1, %hi(ST0_CU1)
+ addiu t1, t1, %lo(ST0_CU1)
+ or v1, v1, t1
MTC0 v1, CP0_STATUS
SSNOP
LONG_L v1, PT_FPU_FCSR31(sp)
- ctc1 v1, fcsr31
+ ctc1 v1, fcr31
l.d $f0, PT_FPU_R0(sp)
l.d $f2, PT_FPU_R2(sp)
l.d $f4, PT_FPU_R4(sp)
@@ -202,6 +206,8 @@
li v1, ~(ST0_CU1 | ST0_FR | ST0_IM)
and v0, v1
or v0, a0
+ li v1, (ST0_KX | ST0_SX | ST0_UX)
+ or v0, v1
mtc0 v0, CP0_STATUS
LONG_L v1, PT_EPC(sp)
MTC0 v1, CP0_EPC