summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-05-18 21:32:31 +0200
committerRichard Braun <rbraun@sceen.net>2017-05-18 21:32:31 +0200
commit8703a289f532a789d95cae7469055d202e160d73 (patch)
tree93f276038d9fdf1d9083e701b86a79f489f80e53
parent92d52b4a2cdc913ab9ea4f9e7f6c5672f08105ff (diff)
x86/trap: minor changes
Edit/remove a few comments.
-rw-r--r--arch/x86/machine/trap_asm.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/machine/trap_asm.S b/arch/x86/machine/trap_asm.S
index 16d431c9..15e8c787 100644
--- a/arch/x86/machine/trap_asm.S
+++ b/arch/x86/machine/trap_asm.S
@@ -77,7 +77,7 @@ ASM_ENTRY(trap_common)
movq %rsp, %rbx /* save frame */
movq %rbx, %rdi
call trap_get_interrupt_stack
- testq %rax, %rax /* must we switch stacks? */
+ testq %rax, %rax /* switch stack ? */
jz 1f
movq %rax, %rsp /* switch to interrupt stack TODO conditional move ? */
1:
@@ -137,12 +137,12 @@ ASM_ENTRY(trap_common)
pushl %ebx
call trap_get_interrupt_stack
addl $4, %esp
- testl %eax, %eax /* must we switch stacks? */
+ testl %eax, %eax /* switch stack ? */
jz 1f
movl %eax, %esp /* switch to interrupt stack */
1:
xorl %ebp, %ebp /* block stack tracing */
- pushl %ebx /* push frame */
+ pushl %ebx
call trap_main
movl %ebx, %esp /* restore stack */
call thread_schedule /* schedule threads */