Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/amd64/include Let the user of INTRENTRY_L() place a...
details: https://anonhg.NetBSD.org/src/rev/421d3fc9f79c
branches: trunk
changeset: 779308:421d3fc9f79c
user: dsl <dsl%NetBSD.org@localhost>
date: Thu May 17 19:38:53 2012 +0000
description:
Let the user of INTRENTRY_L() place a label on the 'swapgs' used
when faulting from user space.
diffstat:
sys/arch/amd64/include/frameasm.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (32 lines):
diff -r 34ecd9761950 -r 421d3fc9f79c sys/arch/amd64/include/frameasm.h
--- a/sys/arch/amd64/include/frameasm.h Thu May 17 16:24:09 2012 +0000
+++ b/sys/arch/amd64/include/frameasm.h Thu May 17 19:38:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: frameasm.h,v 1.18 2012/05/07 21:04:09 dsl Exp $ */
+/* $NetBSD: frameasm.h,v 1.19 2012/05/17 19:38:53 dsl Exp $ */
#ifndef _AMD64_MACHINE_FRAMEASM_H
#define _AMD64_MACHINE_FRAMEASM_H
@@ -73,11 +73,12 @@
movq TF_RBX(%rsp),%rbx ; \
movq TF_RAX(%rsp),%rax
-#define INTRENTRY_L(kernel_trap) \
+#define INTRENTRY_L(kernel_trap, usertrap) \
subq $TF_REGSIZE,%rsp ; \
INTR_SAVE_GPRS ; \
testb $SEL_UPL,TF_CS(%rsp) ; \
je kernel_trap ; \
+usertrap ; \
swapgs ; \
movw %gs,TF_GS(%rsp) ; \
movw %fs,TF_FS(%rsp) ; \
@@ -85,7 +86,7 @@
movw %ds,TF_DS(%rsp)
#define INTRENTRY \
- INTRENTRY_L(98f) ; \
+ INTRENTRY_L(98f,) ; \
98:
#define INTRFASTEXIT \
Home |
Main Index |
Thread Index |
Old Index