Module Name: src
Committed By: maxv
Date: Sat Nov 14 14:01:23 UTC 2015
Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/amd64/conf: kern.ldscript
Log Message:
KNF, and fix some comments
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amd64/conf/kern.ldscript
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.78 src/sys/arch/amd64/amd64/locore.S:1.79
--- src/sys/arch/amd64/amd64/locore.S:1.78 Sun Aug 30 01:46:02 2015
+++ src/sys/arch/amd64/amd64/locore.S Sat Nov 14 14:01:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.78 2015/08/30 01:46:02 uebayasi Exp $ */
+/* $NetBSD: locore.S,v 1.79 2015/11/14 14:01:23 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -355,10 +355,9 @@ tmpstk:
/*
* Some hackage to deal with 64bit symbols in 32 bit mode.
- * This may not be needed it things are cleaned up a little.
+ * This may not be needed if things are cleaned up a little.
*/
-
.text
.globl _C_LABEL(kernel_text)
.set _C_LABEL(kernel_text),KERNTEXTOFF
@@ -782,7 +781,7 @@ longmode_hi:
/*
* Xen info:
* - %rsi -> start_info struct
- * - %rsp -> stack, *theorically* the last used page
+ * - %rsp -> stack, *theoretically* the last used page
* by Xen bootstrap
*/
movq %rsi, %rbx
@@ -811,7 +810,7 @@ longmode_hi:
* - console
* - Xen bootstrap page tables
* - kernel stack. provided by Xen
- * - guaranted 512kB padding
+ * - guaranteed 512kB padding
*
* As we want to rebuild our page tables and place our stack
* in proc0 struct, all data starting from after console can be
Index: src/sys/arch/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.15 src/sys/arch/amd64/conf/kern.ldscript:1.16
--- src/sys/arch/amd64/conf/kern.ldscript:1.15 Tue Aug 25 08:07:24 2015
+++ src/sys/arch/amd64/conf/kern.ldscript Sat Nov 14 14:01:23 2015
@@ -1,70 +1,73 @@
-/* $NetBSD: kern.ldscript,v 1.15 2015/08/25 08:07:24 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.16 2015/11/14 14:01:23 maxv Exp $ */
#include "assym.h"
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- {
- *(.text)
- *(.text.*)
- *(.stub)
- }
- _etext = . ;
- PROVIDE (etext = .) ;
-
- .rodata :
- {
- *(.rodata)
- *(.rodata.*)
- }
-
- /* Adjust the address for the data segment. We want to adjust up to
- the same address within the page on the next page up. */
- . = ALIGN(0x100000) + (. & (0x100000 - 1));
- __data_start = . ;
- .data :
- {
- *(.data)
- }
-
- . = ALIGN(COHERENCY_UNIT);
- .data.cacheline_aligned :
- {
- *(.data.cacheline_aligned)
- }
- . = ALIGN(COHERENCY_UNIT);
- .data.read_mostly :
- {
- *(.data.read_mostly)
- }
- . = ALIGN(COHERENCY_UNIT);
-
- _edata = . ;
- PROVIDE (edata = .) ;
- __bss_start = . ;
- .bss :
- {
- *(.bss)
- *(.bss.*)
- *(COMMON)
- . = ALIGN(64 / 8);
- }
- . = ALIGN(64 / 8);
- _end = . ;
- PROVIDE (end = .) ;
- .note.netbsd.ident :
- {
- KEEP(*(.note.netbsd.ident));
- }
+ /* Read-only sections, merged into text segment: */
+ .text :
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ }
+ _etext = . ;
+ PROVIDE (etext = .) ;
+
+ .rodata :
+ {
+ *(.rodata)
+ *(.rodata.*)
+ }
+
+ /*
+ * Adjust the address for the data segment. We want to adjust up to
+ * the same address within the page on the next page up.
+ */
+ . = ALIGN(0x100000) + (. & (0x100000 - 1));
+ __data_start = . ;
+ .data :
+ {
+ *(.data)
+ }
+
+ . = ALIGN(COHERENCY_UNIT);
+ .data.cacheline_aligned :
+ {
+ *(.data.cacheline_aligned)
+ }
+ . = ALIGN(COHERENCY_UNIT);
+ .data.read_mostly :
+ {
+ *(.data.read_mostly)
+ }
+ . = ALIGN(COHERENCY_UNIT);
+
+ _edata = . ;
+ PROVIDE (edata = .) ;
+ __bss_start = . ;
+ .bss :
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ . = ALIGN(64 / 8);
+ }
+ . = ALIGN(64 / 8);
+ _end = . ;
+ PROVIDE (end = .) ;
+ .note.netbsd.ident :
+ {
+ KEEP(*(.note.netbsd.ident));
+ }
}
+
SECTIONS
{
- .text :
- AT (ADDR(.text) & 0x0fffffff)
- {
- *(.text)
- } =0
+ .text :
+ AT (ADDR(.text) & 0x0fffffff)
+ {
+ *(.text)
+ } = 0
}
