Module Name: src
Committed By: maxv
Date: Sun May 29 09:16:12 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/i386/i386: locore.S
Log Message:
Define tablesize. Useful when debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/i386/i386/locore.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/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.97 src/sys/arch/amd64/amd64/locore.S:1.98
--- src/sys/arch/amd64/amd64/locore.S:1.97 Sun May 29 09:04:19 2016
+++ src/sys/arch/amd64/amd64/locore.S Sun May 29 09:16:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.97 2016/05/29 09:04:19 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.98 2016/05/29 09:16:11 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -322,6 +322,7 @@ _C_LABEL(lapic_isr):
END(lapic_isr)
#endif /* NLAPIC > 0 */
+ .globl _C_LABEL(tablesize)
.globl _C_LABEL(nox_flag)
.globl _C_LABEL(cpuid_level)
.globl _C_LABEL(esym)
@@ -335,6 +336,9 @@ END(lapic_isr)
.globl _C_LABEL(gdtstore)
.globl _C_LABEL(cputype)
+ .type _C_LABEL(tablesize), @object
+_C_LABEL(tablesize): .long TABLESIZE
+END(tablesize)
.type _C_LABEL(nox_flag), @object
LABEL(nox_flag) .long 0 /* 32bit NOX flag, set if supported */
END(nox_flag)
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.125 src/sys/arch/i386/i386/locore.S:1.126
--- src/sys/arch/i386/i386/locore.S:1.125 Thu May 26 07:24:55 2016
+++ src/sys/arch/i386/i386/locore.S Sun May 29 09:16:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.125 2016/05/26 07:24:55 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.126 2016/05/29 09:16:12 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.125 2016/05/26 07:24:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.126 2016/05/29 09:16:12 maxv Exp $");
#include "opt_compat_oldboot.h"
#include "opt_copy_symtab.h"
@@ -255,6 +255,7 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1
*/
.data
+ .globl _C_LABEL(tablesize)
.globl _C_LABEL(nox_flag)
.globl _C_LABEL(cputype)
.globl _C_LABEL(cpuid_level)
@@ -302,6 +303,9 @@ LABEL(lapic_tpr)
END(lapic_tpr)
#endif
+ .type _C_LABEL(tablesize), @object
+_C_LABEL(tablesize): .long 0
+END(tablesize)
.type _C_LABEL(nox_flag), @object
LABEL(nox_flag) .long 0 /* 32bit NOX flag, set if supported */
END(nox_flag)
@@ -320,9 +324,6 @@ END(lwp0uarea)
.type _C_LABEL(PDPpaddr), @object
LABEL(PDPpaddr) .long 0 /* paddr of PDP, for libkvm */
END(PDPpaddr)
- .type _C_LABEL(tablesize), @object
-_C_LABEL(tablesize): .long 0
-END(tablesize)
/* Space for the temporary stack */
.size tmpstk, tmpstk - .
