hal/ia32: optimize cr0 restoration

JIRA: RTOS-954
phoenix-rtos · Nov 18, 2024 · 709b931 · 709b931
1 parent 7d65b73
commit 709b931
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/hal/ia32/_exceptions.S b/hal/ia32/_exceptions.S
@@ -98,20 +98,18 @@ exception_popContext:
 	popw %ds
 	/* FPU context */
 	testl $CR0_TS_BIT, FPU_CONTEXT_SIZE(%esp)
+	jz .exception_popFPU
 	movl %eax, FPU_CONTEXT_SIZE(%esp)
 	movl %cr0, %eax
-	jz .exception_popFPU
 	orl $CR0_TS_BIT, %eax
 	movl %eax, %cr0
 	addl $FPU_CONTEXT_SIZE, %esp
 	popl %eax
 	iret
 	.exception_popFPU:
-	andl $~CR0_TS_BIT, %eax
-	mov %eax, %cr0
+	clts
 	frstor (%esp)
-	addl $FPU_CONTEXT_SIZE, %esp
-	popl %eax
+	addl $FPU_CONTEXT_SIZE + 4, %esp
 	iret
 .size exception_popContext, .-exception_popContext
 

diff --git a/hal/ia32/_interrupts.S b/hal/ia32/_interrupts.S
@@ -114,20 +114,18 @@ interrupts_popContext:
 	popw %ds
 	/* FPU context */
 	testl $CR0_TS_BIT, FPU_CONTEXT_SIZE(%esp)
+	jz .Linterrupts_popFPU
 	movl %eax, FPU_CONTEXT_SIZE(%esp)
 	movl %cr0, %eax
-	jz .Linterrupts_popFPU
 	orl $CR0_TS_BIT, %eax
 	movl %eax, %cr0
 	addl $FPU_CONTEXT_SIZE, %esp
 	popl %eax
 	iret
 .Linterrupts_popFPU:
-	andl $~CR0_TS_BIT, %eax
-	mov %eax, %cr0
+	clts
 	frstor (%esp)
-	addl $FPU_CONTEXT_SIZE, %esp
-	popl %eax
+	addl $FPU_CONTEXT_SIZE + 4, %esp
 	iret
 interrupts_popContextUnlocked:
 	popl %esp