From 76ac4f88a45bf118da66e1b269946283287292dd Mon Sep 17 00:00:00 2001
From: josh <josh@5b3e749e-e535-0410-8002-a9bb6afbdfca>
Date: Wed, 6 Jan 2010 05:37:04 +0000
Subject: [PATCH] set virtual offset to 0x0, kernel now runs in qemu /
 VirtualBox

git-svn-id: svn://anubis/hos/trunk@73 5b3e749e-e535-0410-8002-a9bb6afbdfca
---
 kernel/boot/boot.asm         | 6 +++---
 kernel/include/hos_defines.h | 2 +-
 kernel/link.ld               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/boot/boot.asm b/kernel/boot/boot.asm
index 36e7c20..1d2b80a 100644
--- a/kernel/boot/boot.asm
+++ b/kernel/boot/boot.asm
@@ -7,7 +7,7 @@
 %define MULTIBOOT_HEADER_MAGIC      0x1BADB002
 %define MULTIBOOT_HEADER_FLAGS      0x00000003
 
-%define VIRTUAL_OFFSET              0xE0000000          ; kernel virtual addr
+%define VIRTUAL_OFFSET              0x00000000          ; kernel virtual addr
 %define CONSOLE_MEMORY              0xB8000
 
 %define PAGE_SIZE                   0x1000              ; 4KB pages
@@ -131,7 +131,7 @@ KERNEL_CODE_32_TMP_SEG equ $-gdt_tmp32  ; 8
     db      0x00        ; base   23:16
     db      0x9a        ; access
     db      0xcf        ; flags / limit 19:16
-    db      0x20        ; base   31:24
+    db      0x00        ; base   31:24
 
 KERNEL_DATA_32_TMP_SEG equ $-gdt_tmp32  ; 16
     db      0xff        ; limit  7:0
@@ -141,6 +141,6 @@ KERNEL_DATA_32_TMP_SEG equ $-gdt_tmp32  ; 16
     db      0x00        ; base   23:16
     db      0x92        ; access
     db      0xcf        ; flags / limit 19:16
-    db      0x20        ; base   31:24
+    db      0x00        ; base   31:24
 
 gdt_end_tmp32:
diff --git a/kernel/include/hos_defines.h b/kernel/include/hos_defines.h
index 42f9b55..d1231b8 100644
--- a/kernel/include/hos_defines.h
+++ b/kernel/include/hos_defines.h
@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-#define KERNEL_OFFSET           0xE0000000
+#define KERNEL_OFFSET           0x00000000
 
 #define PAGE_LOG_SIZE           12
 #define PAGE_SIZE               (1 << PAGE_LOG_SIZE)
diff --git a/kernel/link.ld b/kernel/link.ld
index 99c742c..40b33aa 100644
--- a/kernel/link.ld
+++ b/kernel/link.ld
@@ -1,6 +1,6 @@
 OUTPUT_FORMAT(elf32-i386)
 ENTRY(start)
-virt = 0xE0100000;
+virt = 0x00100000;
 phys = 0x00100000;
 SECTIONS
 {