Changeset 114

Timestamp:

Apr 8, 2017, 12:27:12 AM (8 years ago)

Author:

Ben Rietbroek

Message:

Make checking for valid LVM-sector use CF instead of ZF [v1.1.1-testing]

Both the checks for LVM Signature and CRC already use CF on return.
Doing the same for complete LVM-sector validation is more consistent.

CAUTION:
This is a testbuild !
AirBoot uses the BIOS to access disks and a small coding error can trash
partition tables or other vital disk structures. You are advised to make
backups of TRACK0 and EBRs before using this testbuild. More info at:
​https://rousseaux.github.io/netlabs.air-boot/pdf/AirBoot-v1.1.0-manual.pdf

Location:

trunk/bootcode

Files:

• regular/driveio.asm (modified) (2 diffs)
• special/lvm.asm (modified) (1 diff)

trunk/bootcode/regular/driveio.asm

@@ -1303 +1303 @@
 
         ; See if this is a valid LVM-sector
-        ; ZF=0 if valid
+        ; CY if valid
         call    LVM_ValidateSector
 
@@ -1327 +1327 @@
 
         ; Yep, we found the master LVM-sector
-        jnz     DriveIO_LoadMasterLVMSector_Found
+        jc      DriveIO_LoadMasterLVMSector_Found
+
         ; Try next location
         loop    DriveIO_LoadMasterLVMSector_NextTry

trunk/bootcode/special/lvm.asm

@@ -149 +149 @@
 
 ; Checks if a sector is a valid LVM-sector
-;  Sector is considered valid LVM-sector if both signature and CRC are correct.
-;        In: DS:SI - Sector that needs to get checked...
-;       Out: AL = 1 -> LVM Signature found
-;            AH = 1 -> CRC OK
-;            ZF = 0 -> Signature found and CRC OK, ZF = 1 -> Invalid LVM sector
-;      Note: AL thus indicates a valid signature and AH a valid CRC
+; Sector is considered valid LVM-sector if both signature and CRC are correct.
+; IN  : DS:SI - Buffer with LVM-sector that needs to be checked...
+; OUT : AL.0  - 1 -> LVM Signature found
+;       AL.1  - 1 -> CRC OK
+;       CY    - Signature and CRC OK, otherwise none or invalid LVM sector
 ; Destroyed: None
 LVM_ValidateSector              Proc Near
-        xor     ax, ax                      ; Start with all zero bits
+        xor     ax, ax                      ; Assume no Signature or valid CRC
         call    LVM_CheckSectorSignature    ; CF=1 -> Signature OK
-        rcl     al, 1                       ; Store CF in AL
-        call    LVM_CheckSectorCRC          ; CF=1 -> Checksum OK
-        rcl     ah, 1                       ; Store CF in AH
-        test    al, ah                      ; ZF=0 if both AL and AH are 1
+        rcl     al, 1                       ; Store CF in AL.0
+        call    LVM_CheckSectorCRC          ; CF=1 -> CRC OK
+        rcl     ah, 1                       ; Store CF in AH.0
+        shl     ah, 1                       ; Move it to AH.1
+        or      al, ah                      ; Merge CY results to AL
+        cmp     al, 3                       ; AH=3 -> Signature and CRC OK
+        clc                                 ; Assume invalid LVM-sector
+        jne     @F
+        stc                                 ; AH=3 -> Indicate valid LVM-sector
+    @@:
+        mov     ah, 0                       ; Don't leave garbage in AH
         ret
 LVM_ValidateSector              EndP