[src/trunk]: src/sys/arch/amd64 Compile amd64_trap.S as a file instead of inc...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bfede52594bb
branches:  trunk
changeset: 829165:bfede52594bb
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Jan 20 14:27:14 2018 +0000

description:
Compile amd64_trap.S as a file instead of including it.

diffstat:

 sys/arch/amd64/amd64/amd64_trap.S |  19 +++++++++++++------
 sys/arch/amd64/amd64/vector.S     |   4 +---
 sys/arch/amd64/conf/files.amd64   |   3 ++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diffs (76 lines):

diff -r 747adbc7924b -r bfede52594bb sys/arch/amd64/amd64/amd64_trap.S
--- a/sys/arch/amd64/amd64/amd64_trap.S Sat Jan 20 14:08:08 2018 +0000
+++ b/sys/arch/amd64/amd64/amd64_trap.S Sat Jan 20 14:27:14 2018 +0000
@@ -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 @@
  * handler.
  */
 
-/*****************************************************************************/
-
 #ifdef XEN
 #define        PRE_TRAP        movq (%rsp),%rcx ; movq 8(%rsp),%r11 ; addq $0x10,%rsp
 #else
diff -r 747adbc7924b -r bfede52594bb sys/arch/amd64/amd64/vector.S
--- a/sys/arch/amd64/amd64/vector.S     Sat Jan 20 14:08:08 2018 +0000
+++ b/sys/arch/amd64/amd64/vector.S     Sat Jan 20 14:27:14 2018 +0000
@@ -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
 
 /*****************************************************************************/
diff -r 747adbc7924b -r bfede52594bb sys/arch/amd64/conf/files.amd64
--- a/sys/arch/amd64/conf/files.amd64   Sat Jan 20 14:08:08 2018 +0000
+++ b/sys/arch/amd64/conf/files.amd64   Sat Jan 20 14:27:14 2018 +0000
@@ -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/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