X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fdefs.asm;h=a3de82928aefc9e6b5c2503f5930614f7845c6ec;hb=190b2ef9470c23c275754b74745933d973f8c439;hp=77993e456ec18b30a14b2c3fc5ac26c1bce8ad3b;hpb=c6ae41adef1bd7d54bc7e74abc4a5438e203d754;p=palacios-OLD.git

diff --git a/palacios/src/geekos/defs.asm b/palacios/src/geekos/defs.asm
index 77993e4..a3de829 100644
--- a/palacios/src/geekos/defs.asm
+++ b/palacios/src/geekos/defs.asm
@@ -1,6 +1,6 @@
 ; Definitions for use in GeekOS boot code
 ; Copyright (c) 2001, David H. Hovemeyer <daveho@cs.umd.edu>
-; $Revision: 1.2 $
+; $Revision: 1.6 $
 
 ; This is free software.  You are permitted to use,
 ; redistribute, and modify it as specified in the file "COPYING".
@@ -16,14 +16,11 @@
 %ifndef DEFS_ASM
 %define DEFS_ASM
 
-TOP_OF_MEM   equ 0x40000000
-VM_SIZE      equ 0x20000000
-START_OF_VM  equ 0x0
 VM_KERNEL_TARGET	equ 0x100000
 	
 ; BIOS loads the boot sector at offset 0 in this segment
 BOOTSEG equ 0x07C0
-
+ 
 ; We'll move the boot sector up to higher memory.
 ; Note that the "ISA hole" begins at segment 0xA000 == 640K.
 INITSEG equ 0x9000
@@ -36,6 +33,12 @@ SETUPSEG equ 0x9020
 ; will be passed on the command line.
 KERNSEG equ 0x1000
 
+;; Load Segment for moving guest kernel to extended memory
+;; Note that this segment must not colide with where the VMM kernel
+;; is initially loaded.  At this point, we just place it in the last
+;; 64K of RAM available before the ISA hole and hope for the best
+VMSEG equ 0x8000		;
+
 ; Size of PFAT boot record.
 ; Keep up to date with <geekos/pfat.h>.
 PFAT_BOOT_RECORD_SIZE equ 28
@@ -83,7 +86,7 @@ KERNEL_DS equ 2<<3	; kernel data segment is GDT entry 2
 ; the one we construct for Main().  Keep these up to date with defs.h.
 ; We put them at 1MB, for no particular reason.
 	;;  Moved to just after where the VM will go
-KERN_THREAD_OBJ equ (START_OF_VM+VM_SIZE)
+KERN_THREAD_OBJ equ 4096
 KERN_STACK equ KERN_THREAD_OBJ + 4096
 
 %endif