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

diff --git a/DuetPkg/BootSector/start.S b/DuetPkg/BootSector/start.S
index 86aa4b7543f3bfcbef9cf72463b673909e404d90..58ac46d43f270688fb2ccc924cff1eb966fff58d 100644 (file)
--- a/DuetPkg/BootSector/start.S
+++ b/DuetPkg/BootSector/start.S
@@ -84,7 +84,7 @@ CheckVarStoreSize:
 \r
 LoadVarStore: \r
         movb    $0, %al\r
-        movb    %al, %es:4\r
+        movb    %al, %es:(4)\r
         movw    (%di), %cx\r
 #       ES:DI = 1500:0\r
         xorw    %di, %di\r
@@ -95,9 +95,9 @@ LoadVarStore:
 SaveVolumeId: \r
         popw    %es\r
         movw    VolId(%bp), %ax\r
-        movw    %ax, %es:0                     # Save Volume Id to 0:19000. we will find the correct volume according to this VolumeId\r
+        movw    %ax, %es:(0)                    # Save Volume Id to 0:19000. we will find the correct volume according to this VolumeId\r
         movw    VolId+2(%bp), %ax\r
-        movw    %ax, %es:2\r
+        movw    %ax, %es:(2)\r
 \r
 # Read Efildr\r
         popw    %cx\r
@@ -239,7 +239,7 @@ ReadCylinderLoop:
 LimitTransfer: \r
         pushw   %ax                                 # save ax\r
         movw    %es, %ax                            # ax = es\r
-        shrw    %ax                                 # ax = Number of blocks into mem system\r
+        shrw    $(BLOCK_SHIFT-4), %ax               # ax = Number of blocks into mem system\r
         andw    $0x7f, %ax                          # ax = Number of blocks into current seg\r
         addw    %bx, %ax                            # ax = End Block number of transfer\r
         cmpw    $0x80, %ax                          # See if it crosses a 64K boundry\r
@@ -271,7 +271,7 @@ NotCrossing64KBoundry:
         addl    %ebx, %esi                          # StartLBA = StartLBA + NumberOfBlocks\r
         subw    %bx, %cx                            # Blocks = Blocks - NumberOfBlocks\r
         movw    %es, %ax\r
-        shlw    %bx\r
+        shlw    $(BLOCK_SHIFT-4), %bx\r
         addw    %bx, %ax\r
         movw    %ax, %es                            # es:di = es:di + NumberOfBlocks*BLOCK_SIZE\r
         cmpw    $0, %cx\r
@@ -298,11 +298,11 @@ Halt:
 ErrorString: \r
         .byte 'S', 0x0c, 'E', 0x0c, 'r', 0x0c, 'r', 0x0c, 'o', 0x0c, 'r', 0x0c, '!',0x0c\r
 \r
-        .org     0x0241 # For Code size overflow, Modified this just for pass build\r
+        .org     0x01fa\r
 LBAOffsetForBootSector: \r
         .long   0x0\r
 \r
-        #.org    0x0227  # For Code size overflow, Modified this just for pass build\r
+        .org    0x01fe\r
         .word   0xaa55\r
 \r
 #******************************************************************************\r