Changeset 445 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Initialization

Timestamp:

Aug 29, 2012, 12:59:23 PM (12 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• A speed optimization to the eSHL_IM macro for 386 and higher. This change breaks emulation in the sense that the macro will fail when given a memory operand as the first parameter.
• Memory_SumCXbytesFromESSItoAL now returns with the zero flag set/cleared according to the result.
• Unrolled all the 8 bit READ transfer loops to do 16 bytes per iteration. Added a new macro (UNROLL_SECTORS_IN_CX_TO_OWORDS) as part of it. Size wise this is expensive but I think it should be worth the ROM space. The WRITE transfer loops were left as is since writes are rare anyway (<10% of all disk I/O IIRC).
• Minor optimizations and fixes here and there.

File:

• trunk/XTIDE_Universal_BIOS/Src/Initialization/AtaID.asm (modified) (7 diffs)

trunk/XTIDE_Universal_BIOS/Src/Initialization/AtaID.asm

@@ -4 +4 @@
 
 ;
-; XTIDE Universal BIOS and Associated Tools 
+; XTIDE Universal BIOS and Associated Tools
 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
 ;
@@ -11 +11 @@
 ; the Free Software Foundation; either version 2 of the License, or
 ; (at your option) any later version.
-; 
+;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.      
+; GNU General Public License for more details.
 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-;       
+;
 
 ; Section containing code
@@ -28 +28 @@
 ;   Returns:
 ;       CF:     Set if failed to verify ATA-ID
-;               Cleared if ATA-ID verified succesfully
+;               Cleared if ATA-ID verified successfully
 ;   Corrupts registers:
 ;       AX, BX, CX
@@ -44 +44 @@
     call    .CompareCHorSfromOffsetBXtoMaxValueInCX
 
-    add     bx, BYTE ATA1.wHeadCnt - ATA1.wCylCnt
+    mov     bl, ATA1.wHeadCnt & 0FFh
     mov     cx, MAX_VALID_PCHS_HEADS
     call    .CompareCHorSfromOffsetBXtoMaxValueInCX
 
-    add     bx, BYTE ATA1.wSPT - ATA1.wHeadCnt
+    mov     bl, ATA1.wSPT & 0FFh
     mov     cl, MAX_VALID_PCHS_SECTORS_PER_TRACK
     call    .CompareCHorSfromOffsetBXtoMaxValueInCX
@@ -69 +69 @@
     ; Check checksum byte
     mov     cx, ATA6_size
-    call    Memory_SumCXbytesFromESSItoAL
-    test    al, al
+    call    Memory_SumCXbytesFromESSItoAL       ; Returns with ZF set according to result
     jnz     SHORT .FailedToVerifyAtaID
 
@@ -119 +118 @@
     mov     bx, [es:si+ATA1.bPioMode]
     mov     ax, bx                  ; AH = 0, AL = PIO mode 0, 1 or 2
-    shl     bx, 1                   ; Shift for WORD lookup
+    eSHL_IM bx, 1                   ; Shift for WORD lookup
     mov     cx, [cs:bx+.rgwPio0to2CycleTimeInNanosecs]
 
@@ -187 +186 @@
 ;--------------------------------------------------------------------
 AtaID_GetActiveTimeToAXfromPioModeInBX:
-    shl     bx, 1
-    mov     ax, [cs:bx+.rgwPioModeToActiveTimeNs]
-    shr     bx, 1
-    ret
-
-.rgwPioModeToActiveTimeNs:
-    dw      PIO_0_MIN_ACTIVE_TIME_NS
-    dw      PIO_1_MIN_ACTIVE_TIME_NS
-    dw      PIO_2_MIN_ACTIVE_TIME_NS
-    dw      PIO_3_MIN_ACTIVE_TIME_NS
-    dw      PIO_4_MIN_ACTIVE_TIME_NS
-    dw      PIO_5_MIN_ACTIVE_TIME_NS
-    dw      PIO_6_MIN_ACTIVE_TIME_NS
+    eMOVZX  ax, [cs:bx+.rgbPioModeToActiveTimeNs]
+    ret
+
+.rgbPioModeToActiveTimeNs:
+    db      PIO_0_MIN_ACTIVE_TIME_NS
+    db      PIO_1_MIN_ACTIVE_TIME_NS
+    db      PIO_2_MIN_ACTIVE_TIME_NS
+    db      PIO_3_MIN_ACTIVE_TIME_NS
+    db      PIO_4_MIN_ACTIVE_TIME_NS
+    db      PIO_5_MIN_ACTIVE_TIME_NS
+    db      PIO_6_MIN_ACTIVE_TIME_NS
 
 %endif ; MODULE_ADVANCED_ATA