From f3fb74cdac8a50bd5d92c9ccf6d55ed9e14503ca Mon Sep 17 00:00:00 2001 From: gikidy Date: Thu, 12 Mar 2009 02:54:02 +0000 Subject: 1. Fix some convert issue. 2. org address changed. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7864 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/BootSector/start.S | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'DuetPkg/BootSector') diff --git a/DuetPkg/BootSector/start.S b/DuetPkg/BootSector/start.S index 86aa4b7543..58ac46d43f 100644 --- a/DuetPkg/BootSector/start.S +++ b/DuetPkg/BootSector/start.S @@ -84,7 +84,7 @@ CheckVarStoreSize: LoadVarStore: movb $0, %al - movb %al, %es:4 + movb %al, %es:(4) movw (%di), %cx # ES:DI = 1500:0 xorw %di, %di @@ -95,9 +95,9 @@ LoadVarStore: SaveVolumeId: popw %es movw VolId(%bp), %ax - movw %ax, %es:0 # Save Volume Id to 0:19000. we will find the correct volume according to this VolumeId + movw %ax, %es:(0) # Save Volume Id to 0:19000. we will find the correct volume according to this VolumeId movw VolId+2(%bp), %ax - movw %ax, %es:2 + movw %ax, %es:(2) # Read Efildr popw %cx @@ -239,7 +239,7 @@ ReadCylinderLoop: LimitTransfer: pushw %ax # save ax movw %es, %ax # ax = es - shrw %ax # ax = Number of blocks into mem system + shrw $(BLOCK_SHIFT-4), %ax # ax = Number of blocks into mem system andw $0x7f, %ax # ax = Number of blocks into current seg addw %bx, %ax # ax = End Block number of transfer cmpw $0x80, %ax # See if it crosses a 64K boundry @@ -271,7 +271,7 @@ NotCrossing64KBoundry: addl %ebx, %esi # StartLBA = StartLBA + NumberOfBlocks subw %bx, %cx # Blocks = Blocks - NumberOfBlocks movw %es, %ax - shlw %bx + shlw $(BLOCK_SHIFT-4), %bx addw %bx, %ax movw %ax, %es # es:di = es:di + NumberOfBlocks*BLOCK_SIZE cmpw $0, %cx @@ -298,11 +298,11 @@ Halt: ErrorString: .byte 'S', 0x0c, 'E', 0x0c, 'r', 0x0c, 'r', 0x0c, 'o', 0x0c, 'r', 0x0c, '!',0x0c - .org 0x0241 # For Code size overflow, Modified this just for pass build + .org 0x01fa LBAOffsetForBootSector: .long 0x0 - #.org 0x0227 # For Code size overflow, Modified this just for pass build + .org 0x01fe .word 0xaa55 #****************************************************************************** -- cgit v1.2.3