Implement a proper block layer with partition support.

[pintos-anon] / src / threads / kernel.lds.S

diff --git a/src/threads/kernel.lds.S b/src/threads/kernel.lds.S
index 6154d08dd93bec35c0e2db890b5766e81484ec58..19082d5d3896111dae63de572d7ef5649e8220d3 100644 (file)
--- a/src/threads/kernel.lds.S
+++ b/src/threads/kernel.lds.S
@@ -5,17 +5,19 @@ OUTPUT_ARCH("i386")
 ENTRY(start)                   /* Kernel starts at "start" symbol. */
 SECTIONS
 {
-  /* Specifies the virtual address for the kernel base. */
-  . = LOADER_PHYS_BASE + LOADER_KERN_BASE;
+  /* Specify the kernel base address. */
+  _start = LOADER_PHYS_BASE + LOADER_KERN_BASE;
 
-  _start = .;
+  /* Make room for the ELF headers. */
+  . = _start + SIZEOF_HEADERS;
 
   /* Kernel starts with code, followed by read-only data and writable data. */
   .text : { *(.start) *(.text) } = 0x90
   .rodata : { *(.rodata) *(.rodata.*) 
              . = ALIGN(0x1000); 
              _end_kernel_text = .; }
-  .data : { *(.data) }
+  .data : { *(.data) 
+           _signature = .; LONG(0xaa55aa55) }
 
   /* BSS (zero-initialized data) is after everything else. */
   _start_bss = .;
@@ -23,4 +25,6 @@ SECTIONS
   _end_bss = .;
 
   _end = .;
+
+  ASSERT (_end - _start <= 512K, "Kernel image is too big.")
 }