X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Ffd_boot.asm;h=1250665d891944eadfadb128ac365289517f2c1e;hb=f032dd8f6f03c414f9d1f208845464ff76050b6c;hp=7aa231b1ed07ff43a5dc52a7539d5644dbc5af22;hpb=bc90ff64cfcd32d978a790f6ee70846a754fba9b;p=palacios-OLD.git

diff --git a/palacios/src/geekos/fd_boot.asm b/palacios/src/geekos/fd_boot.asm
index 7aa231b..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.7 $
+; 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,22 +36,6 @@
 [ORG 0x0]
 
 BeginText:	; needed to calculate padding bytes to fill the sector
-	;; temporalily for io performance test
-	mov dx, 0x995
-	mov eax, 0x12345678
-	out dx, eax
-	mov dx, 0x999
-	xor eax, eax
-	cpuid
-	rdtsc
-	;; 	mov [time], eax
-	;; 	mov eax, 0x12345678
-	out dx, eax
-	cpuid
-	rdtsc
-	sub eax, [time]
-	out dx, eax
-
 	; Copy the boot sector into INITSEG.
 	mov	ax, BOOTSEG
 	mov	ds, ax			; source segment for string copy
@@ -116,7 +102,7 @@ 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
 
@@ -384,8 +370,6 @@ bootsect_dst_base:
 	dw	0		;	! limit16,base24 =0
 	dw	0,0,0,0		;	! BIOS CS
 	dw	0,0,0,0		;	! BIOS DS
-time:
-	dw      0,0
 
 
 ; Padding to make the PFAT Boot Record sit just before the BIOS signature.