X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Ffd_boot.asm;h=1250665d891944eadfadb128ac365289517f2c1e;hb=7617d3cee4bd93b90558206b1bb1681c07f0396a;hp=46f920fcdff4decb4b642a5cea2dc94931351bdf;hpb=3706417c637c227575fb134fe479b03e52301ea1;p=palacios.git

diff --git a/palacios/src/geekos/fd_boot.asm b/palacios/src/geekos/fd_boot.asm
index 46f920f..1250665 100644
--- a/palacios/src/geekos/fd_boot.asm
+++ b/palacios/src/geekos/fd_boot.asm
@@ -1,7 +1,9 @@
 ; Boot sector for GeekOS
 ; Copyright (c) 2001,2004 David H. Hovemeyer <daveho@cs.umd.edu>
 ; Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
-; $Revision: 1.5 $
+; Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu
+; Copyright (c) 2008, Peter Dinda <pdinda@northwestern.edu
+; $Revision: 1.8 $
 
 ; This is free software.  You are permitted to use,
 ; redistribute, and modify it as specified in the file "COPYING".
@@ -34,7 +36,6 @@
 [ORG 0x0]
 
 BeginText:	; needed to calculate padding bytes to fill the sector
-
 	; Copy the boot sector into INITSEG.
 	mov	ax, BOOTSEG
 	mov	ds, ax			; source segment for string copy
@@ -89,6 +90,8 @@ load_setup:
 	cmp	word [sec_count], bx
 	jl	.again
 
+
+	
 load_kernel:
 	; Load the kernel image from sectors KERN_START_SEC..n of the
 	; floppy into memory at KERNSEG.  Note that there are 128 sectors
@@ -99,57 +102,11 @@ load_kernel:
 	; Figure out start sector and max sector
 
 	mov	ax, word [kernelStart]
-	mov	word [sec_count], ax
+	mov	word [sec_count], aX
 	add	ax, word [kernelSize]
 	mov	word [max_sector], ax
-.again:
-	mov	ax, [sec_count]		; logical sector on the floppy
-;	mov     dx, ax
-;	call    PrintHex
-;	call    PrintNL
-	push	ax			; 1st param to ReadSector (log sec num)
-	sub	ax, [kernelStart]	; convert to 0-indexed
-	mov	cx, ax			; save in cx
-	shr	ax, 7			; divide by 128
-	shl	ax, 12			;  ...and multiply by 0x1000
-	add	ax, KERNSEG		;  ...to get base relative to KERNSEG
-;	mov     dx, ax
-;	call    PrintHex
-;	call    PrintNL
-	push	ax			; 2nd param to ReadSector (seg base)
-	and	cx, 0x7f		; mod sector by 128
-	shl	cx, 9			;  ...and multiply by 512
-	push	cx			; to get offset in segment (3rd parm)
-;	mov     dx, cx
-;	call    PrintHex
-;	call    PrintNL
-
-
-	; read the sector from the floppy
-	call	ReadSector
-	add	sp, 6			; clear 3 word params
-
-
-	; on to next sector
-	inc	word [sec_count]
 
-	; have we loaded all of the sectors?
-	mov	bx, word [max_sector]
-	cmp	word [sec_count], bx
-	jl	.again
-
-load_vm:
-	; Load the guest image starting at 1MB
-	; floppy into memory at KERNSEG.  Note that there are 128 sectors
-	; per 64K segment.  So, when figuring out which segment to
-	; load the sector  into, we shift right by 7 bits (which is
-	; equivalent to dividing by 128).
-
-	; Figure out start sector and max sector
-	mov	ax, word [vmStart]
-	mov	word [sec_count], ax
-	add	ax, word [vmSize]
-	mov	word [max_sector], ax
+	
 .again2:
 
 	mov	ax, [sec_count]		; logical sector on the floppy
@@ -456,13 +413,7 @@ kernelStart:
 kernelSize:
 	dw	NUM_KERN_SECTORS
 
-	;; part of pfat boot record
-vmStart:
-	dw	1+NUM_SETUP_SECTORS+NUM_KERN_SECTORS
-	;; part of pfat boot record
 
-vmSize:
-	dw	NUM_VM_KERNEL_SECTORS
 
 
 	; Finish by writing the BIOS signature to mark this as