Module Name: src
Committed By: maxv
Date: Sat Jan 20 14:27:15 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: amd64_trap.S vector.S
src/sys/arch/amd64/conf: files.amd64
Log Message:
Compile amd64_trap.S as a file instead of including it.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amd64/amd64/amd64_trap.S
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/amd64/amd64/vector.S
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/amd64/conf/files.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/amd64_trap.S
diff -u src/sys/arch/amd64/amd64/amd64_trap.S:1.21 src/sys/arch/amd64/amd64/amd64_trap.S:1.22
--- src/sys/arch/amd64/amd64/amd64_trap.S:1.21 Sat Jan 20 13:45:15 2018
+++ src/sys/arch/amd64/amd64/amd64_trap.S Sat Jan 20 14:27:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amd64_trap.S,v 1.21 2018/01/20 13:45:15 maxv Exp $ */
+/* $NetBSD: amd64_trap.S,v 1.22 2018/01/20 14:27:15 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc.
@@ -64,10 +64,19 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#if 0
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: amd64_trap.S,v 1.21 2018/01/20 13:45:15 maxv Exp $");
-#endif
+
+#include "opt_xen.h"
+#include "opt_dtrace.h"
+
+#define ALIGN_TEXT .align 16,0x90
+
+#include <machine/frameasm.h>
+#include <machine/segments.h>
+#include <machine/trap.h>
+#include <machine/specialreg.h>
+
+#include "assym.h"
/*
* Trap and fault vector routines
@@ -80,8 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: amd64_trap.S
* handler.
*/
-/*****************************************************************************/
-
#ifdef XEN
#define PRE_TRAP movq (%rsp),%rcx ; movq 8(%rsp),%r11 ; addq $0x10,%rsp
#else
Index: src/sys/arch/amd64/amd64/vector.S
diff -u src/sys/arch/amd64/amd64/vector.S:1.54 src/sys/arch/amd64/amd64/vector.S:1.55
--- src/sys/arch/amd64/amd64/vector.S:1.54 Sat Jan 20 14:08:08 2018
+++ src/sys/arch/amd64/amd64/vector.S Sat Jan 20 14:27:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.54 2018/01/20 14:08:08 maxv Exp $ */
+/* $NetBSD: vector.S,v 1.55 2018/01/20 14:27:15 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -85,8 +85,6 @@
#include "lapic.h"
#include "assym.h"
-#include "amd64_trap.S"
-
.text
/*****************************************************************************/
Index: src/sys/arch/amd64/conf/files.amd64
diff -u src/sys/arch/amd64/conf/files.amd64:1.100 src/sys/arch/amd64/conf/files.amd64:1.101
--- src/sys/arch/amd64/conf/files.amd64:1.100 Mon Jan 8 09:33:53 2018
+++ src/sys/arch/amd64/conf/files.amd64 Sat Jan 20 14:27:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.amd64,v 1.100 2018/01/08 09:33:53 maxv Exp $
+# $NetBSD: files.amd64,v 1.101 2018/01/20 14:27:14 maxv Exp $
#
# new style config file for amd64 architecture
#
@@ -36,6 +36,7 @@ file arch/amd64/amd64/copy.S machdep
file arch/amd64/amd64/spl.S machdep
file arch/amd64/amd64/amd64func.S machdep
+file arch/amd64/amd64/amd64_trap.S machdep
file arch/amd64/amd64/autoconf.c machdep
file arch/amd64/amd64/busfunc.S machdep
file arch/amd64/amd64/cpu_in_cksum.S (inet | inet6) & cpu_in_cksum
