Module Name: src
Committed By: maxv
Date: Sat Feb 17 20:28:18 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: amd64_trap.S
Log Message:
Declare and use TRAP_ENTRY_POINT_FPU. No real functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/amd64/amd64/amd64_trap.S
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.25 src/sys/arch/amd64/amd64/amd64_trap.S:1.26
--- src/sys/arch/amd64/amd64/amd64_trap.S:1.25 Sat Feb 17 20:22:05 2018
+++ src/sys/arch/amd64/amd64/amd64_trap.S Sat Feb 17 20:28:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amd64_trap.S,v 1.25 2018/02/17 20:22:05 maxv Exp $ */
+/* $NetBSD: amd64_trap.S,v 1.26 2018/02/17 20:28:18 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc.
@@ -132,6 +132,23 @@ IDTVEC(\name)
IDTVEC_END(\name)
.endm
+.macro TRAP_ENTRY_POINT_FPU name,code,is_ztrap
+IDTVEC(\name)
+ .if \is_ztrap
+ ZTRAP_NJ(\code)
+ .else
+ TRAP_NJ(\code)
+ .endif
+ INTRENTRY
+#ifdef DIAGNOSTIC
+ movl CPUVAR(ILEVEL),%ebx
+#endif
+ movq %rsp,%rdi
+ call _C_LABEL(fputrap)
+ jmp .Lalltraps_checkusr
+IDTVEC_END(\name)
+.endm
+
.text
TEXT_USER_BEGIN
@@ -290,26 +307,10 @@ IDTVEC(trap15)
jmp .Lalltraps_checkusr
IDTVEC_END(trap15)
-IDTVEC(trap16)
- ZTRAP_NJ(T_ARITHTRAP)
-.Ldo_fputrap:
- INTRENTRY
-#ifdef DIAGNOSTIC
- movl CPUVAR(ILEVEL),%ebx
-#endif
- movq %rsp,%rdi
- call _C_LABEL(fputrap)
- jmp .Lalltraps_checkusr
-IDTVEC_END(trap16)
-
+TRAP_ENTRY_POINT_FPU trap16,T_ARITHTRAP,1
TRAP_ENTRY_POINT trap17,T_ALIGNFLT,0
TRAP_ENTRY_POINT trap18,T_MCA,1
-
-IDTVEC(trap19)
- ZTRAP_NJ(T_XMM)
- jmp .Ldo_fputrap
-IDTVEC_END(trap19)
-
+TRAP_ENTRY_POINT_FPU trap19,T_XMM,1
TRAP_ENTRY_POINT trap20,T_RESERVED,1
TRAP_ENTRY_POINT trap21,T_RESERVED,1
TRAP_ENTRY_POINT trap22,T_RESERVED,1
