summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authoruebayasi <uebayasi@NetBSD.org>2014-11-27 04:48:39 +0000
committeruebayasi <uebayasi@NetBSD.org>2014-11-27 04:48:39 +0000
commitb6475d04df29dbd0289f90d3f7a67c08973ea107 (patch)
tree912e72dbcdf67e305114d17eaee9773abc854bae /sys
parentfbc8201b71e9942008bfd7a699092f9a4150d99a (diff)
Comments.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/amd64/spl.S14
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/spl.S b/sys/arch/amd64/amd64/spl.S
index de8908dc9cc..176fcefddd6 100644
--- a/sys/arch/amd64/amd64/spl.S
+++ b/sys/arch/amd64/amd64/spl.S
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.28 2014/01/12 20:31:50 joerg Exp $ */
+/* $NetBSD: spl.S,v 1.29 2014/11/27 04:48:39 uebayasi Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -115,7 +115,7 @@ IDTVEC(softintr)
xchgq %r15,CPUVAR(CURLWP) /* must be globally visible */
popq %r15 /* unwind switchframe */
addq $(5 * 8),%rsp
- jmp *%r13 /* back to splx/doreti */
+ jmp *%r13 /* back to Xspllower/Xdoreti */
END(Xsoftintr)
/*
@@ -130,7 +130,7 @@ NENTRY(softintr_ret)
incl CPUVAR(MTX_COUNT) /* re-adjust after mi_switch */
movl $0, L_CTXSWTCH(%rax) /* %rax from cpu_switchto */
cli
- jmp *%r13 /* back to splx/doreti */
+ jmp *%r13 /* back to Xspllower/Xdoreti */
END(softintr_ret)
/*
@@ -155,7 +155,7 @@ IDTVEC(preemptrecurse)
xorq %rdi, %rdi
call _C_LABEL(kpreempt)
cli
- jmp *%r13
+ jmp *%r13 /* back to Xspllower */
END(Xpreemptrecurse)
/*
@@ -171,11 +171,11 @@ IDTVEC(preemptresume)
movq TF_RIP(%rsp), %rdi
call _C_LABEL(kpreempt) # from kernel
cli
- jmp *%r13
+ jmp *%r13 /* back to Xdoreti */
1:
call _C_LABEL(preempt) # from user
cli
- jmp *%r13
+ jmp *%r13 /* back to Xdoreti */
END(Xpreemptresume)
/*
@@ -303,6 +303,8 @@ IDTVEC(spllower)
END(Xspllower)
/*
+ * void Xdoreti(void);
+ *
* Handle return from interrupt after device handler finishes.
*
* Important registers: