Changeset 52 for trunk/BOOTCODE/REGULAR

Timestamp:

Apr 13, 2014, 4:45:41 PM (12 years ago)

Author:

Ben Rietbroek

Message:

Added BOOKMARK Comments [2013-02-27]

I recently added the 'addons' plugin to Geany, the editor I use on
Linux, and it contains a very handy feature to scan sources for tags
like FIXME:, BOOKMARK: and the like. Custom tags can also be defined.

So I added some major bookmark locations to easily navigate around
multiple sources. What's also nice is that of course these tags can be
listed with grep. For instance, grep -r -n 'BOOKMARK:' *.ASM will
display a list of all bookmark comments with line-numbers in the
assembler sources in the current and underlying directories.

Changes:

o Started fixing the CRC issue

Since AiR-BOOT now updates the PBR on HPFS and JFS, the CRC needs to
be recalculated and stored in the IPT. Otherwise AB will think the
PBR is infected and a virus message will appear.

o Changed PART_UpdateBootRecordCRC

Only PartitionSector could be CRC'd because it was hard coded.
Also, SI got immediately overwritten and that might have been an
unsurfaced bug, even in v.106. Have to investigate this further.
Changed to use BX as a pointer to the sector to be CRC'd.

Location:

trunk/BOOTCODE/REGULAR

Files:

• PARTMAIN.ASM (modified) (17 diffs)
• STD_TEXT.ASM (modified) (1 diff)

trunk/BOOTCODE/REGULAR/PARTMAIN.ASM

@@ -134 +134 @@
 ;        In: DS:SI - IPT-Entry of partition
 ;            DS:PartitionSector - Actual Boot-Record of partition
-;       Out: *none* (BootRecordCRD updated)
+;       Out: *none* (BootRecordCRC updated)
+; CHECKME: Verify the change (BX points to sector to CRC) is working OK
 PART_UpdateBootRecordCRC        Proc Near Uses bx
-        mov     si, offset PartitionSector
+        push    si
+        ;~ mov     si, offset PartitionSector
+        mov     si, bx
         mov     bx, 4B4Dh            ; Magic: 'MK'
         call    MBR_GetCheckOfSector
+        pop     si
         mov     [si+LocIPT_BootRecordCRC], bx
         ret
@@ -144 +148 @@
 
 
-;
-; What happens here ?
-;
 
 ; Rousseau:
@@ -167 +168 @@
 ; presumably pointed to an area where a null byte was near.
 ;
-; Fix:
-; Test BX for zero and if so, skip the
+; BOOKMARK: The nasty pointer bug
 
 
@@ -781 +781 @@
 
 
-; Rousseau: added
+
 ; Compare a volume-label in the IPT to the install-volume
 ; SI holds pointer to entry in IPT
@@ -858 +858 @@
 
 
-; Setup Phase1
+
 ; If found CY=1, AL=partnum, else CY=0, AL=0FFH
+; BOOKMARK: Setup Phase1
 PART_SetupPhase1    Proc    Uses bx cx dx si di
 
@@ -1142 +1143 @@
     ; This loads the MBR in case of PRI or the EBR in case of LOG partitions.
     ;
+    ; BOOKMARK: PBR/EBR loading
     call    DriveIO_LoadPartition         ; Load Table...                [LOAD]
 
@@ -1235 +1237 @@
 
     ;
-    ; Setup 'I13X' signature.
+    ; BOOKMARK: Setup 'I13X' signature.
     ;
     PSP_ForceI13X:
@@ -1492 +1494 @@
         jz      PSP_NoVIBR
 
+
         ; ----------------------------------------------------- CHECKS FOR VIBR
+        ; BOOKMARK: Check for virus in PBR
         push    si
             mov     si, offset PartitionSector
@@ -1699 +1703 @@
         ;
 
-        ;
-        ; Fix hidden sectors field
-        ;
+        ; BOOKMARK: Fix hidden sectors field
         mov     ax,[si+LocIPT_AbsoluteBegin]
         mov     es:[di+1ch], ax     ; Low word of 32-bits "hidden sectors"
@@ -1726 +1728 @@
 
 
-        ; FIXME:
+        ;
         ; The PBR is already loaded, no need to load it again in the
         ; calls below.
@@ -1732 +1734 @@
         ; Better use the already done discovery to determine the system.
         ;
-
+        ; FIXME: PBR Already loaded
+        
         ; When FAT12/FAT16/HPFS/JFS then boot-drive-letter can be tested
         ; or adjusted.
@@ -1955 +1958 @@
         ; WE CONTINUE BOOTING BUT OS/2 - eCS WILL MOST PROBABLY FAIL TO BOOT.
 
-        ; FIXME:
-        ; ISSUE SOME KIND OF WARNING...
-
+        ; FIXME: Issue some kind of warning
+        
         ;mov     ah,07h
         ;mov     si,offset CheckID_MBR
@@ -2035 +2037 @@
         pop     si
 
+        
+        ; BOOKMARK: Update the CRC of the Partition Boot Record.
+        ; FIXME:    Update CRC on PBR
+        ;~ mov     bx, offset [PBRSector]
+        ;~ call    PART_UpdateBootRecordCRC
+
+        
         ; Setup the registers for the partition location.
         mov     ax, wptr [si+LocIPT_AbsoluteBegin+0]
@@ -2042 +2051 @@
         mov     dl, [si+LocIPT_Drive]
 
-        ; Write the adjusted JFS PBR to disk.
+        
+        ; BOOKMARK: Write the adjusted HPFS/JFS PBR to disk.
         mov     si, offset [PBRSector]
         call    DriveIO_SaveSector
@@ -2048 +2058 @@
     no_jfs_pbr:
         popa
-
-
-        ;xor     ax,ax
-        ;int     16h
-
-
 
 
@@ -2090 +2094 @@
     boot_from_floppy:
 
-        ;
-        ; Here we copy the prepared partition boot-record to 0000:7C00h
+
+    
+
+        ;
+        ; Here we copy the prepared boot-record to 0000:7C00h
         ; to give it control later on.
         ;
@@ -2197 +2204 @@
 
 
-
+        ; BOOKMARK: JUMP TO PBR CODE
         ; ###############################
         ; # JUMP TO THE PBR LOADER CODE #

trunk/BOOTCODE/REGULAR/STD_TEXT.ASM

@@ -58 +58 @@
             ;~ db ' M. Kiewitz  <<@ Interim Release @>> (bld: '
             ;~ db ' M. Kiewitz  <<Release Candidate 2>> (bld: '
-            db ' M. Kiewitz  <<Release Candidate 3>> (bld: '
+            db ' M. Kiewitz  <<Release Candidate 4>> (bld: '
             db BLDLVL_YEAR
             db BLDLVL_MONTH