summaryrefslogtreecommitdiff
path: root/bootasm.S
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2011-08-08 13:30:08 -0400
committerFrans Kaashoek <[email protected]>2011-08-08 13:30:08 -0400
commita56c8d609b24e4c1c3a8a5bacdced6ae53376ee2 (patch)
tree9d049eae2080a7c330fb7ac3ec9ff6e557a310e4 /bootasm.S
parent11b7438b1046eecca6135b52ddbe686008099fa5 (diff)
downloadxv6-labs-a56c8d609b24e4c1c3a8a5bacdced6ae53376ee2.tar.gz
xv6-labs-a56c8d609b24e4c1c3a8a5bacdced6ae53376ee2.tar.bz2
xv6-labs-a56c8d609b24e4c1c3a8a5bacdced6ae53376ee2.zip
One definition of several macros and constants
Diffstat (limited to 'bootasm.S')
-rw-r--r--bootasm.S8
1 files changed, 3 insertions, 5 deletions
diff --git a/bootasm.S b/bootasm.S
index 3cc23e7..c75434b 100644
--- a/bootasm.S
+++ b/bootasm.S
@@ -1,15 +1,12 @@
#include "asm.h"
+#include "memlayout.h"
+#include "mmu.h"
# Start the first CPU: switch to 32-bit protected mode, jump into C.
# The BIOS loads this code from the first sector of the hard disk into
# memory at physical address 0x7c00 and starts executing in real mode
# with %cs=0 %ip=7c00.
-#define SEG_KCODE 1 // kernel code
-#define SEG_KDATA 2 // kernel data+stack
-
-#define CR0_PE 1 // protected mode enable bit
-
.code16 # Assemble for 16-bit mode
.globl start
start:
@@ -88,3 +85,4 @@ gdt:
gdtdesc:
.word (gdtdesc - gdt - 1) # sizeof(gdt) - 1
.long gdt # address gdt
+