Changeset 97574 in vbox for trunk/src/VBox/ValidationKit/bootsectors

Timestamp:

Nov 16, 2022 10:38:34 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154607

Message:

ValKit/bs3kit: Detect 320KB and 360KB image sizes and pad them too to make sure the FDC doesn't think they are 5.25" floppy images. bugref:9898

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• VBoxBs3Linker.cpp (modified) (1 diff)
• bs3-bootsector.asm (modified) (9 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/VBoxBs3Linker.cpp

@@ -330 +330 @@
        the bootsector adjust it's bMaxHeads value when getting a 20h error
        we end up with a garbaged image (seems somewhere in the BIOS/FDC it is
-       still treated as a double sided floppy and we get half the data we want and
-       with gaps). */
+       still treated as a double sided floppy and we get half the data we want
+       and with gaps).
+
+       Similarly, if the size is 320KB or 360KB the FDC detects it as a double
+       sided 5.25" floppy with 40 tracks, while the BIOS keeps reporting a
+       1.44MB 3.5" floppy. So, just avoid those sizes too. */
     uint32_t cbOutput = ftell(pOutput);
-    if (   cbOutput == 512 * 8 * 40 /* 160kB 5"1/4 */
-        || cbOutput == 512 * 9 * 40 /* 180kB 5"1/4 */)
+    if (   cbOutput == 512 * 8 * 40 * 1 /* 160kB 5"1/4 SS */
+        || cbOutput == 512 * 9 * 40 * 1 /* 180kB 5"1/4 SS */
+        || cbOutput == 512 * 8 * 40 * 2 /* 320kB 5"1/4 DS */
+        || cbOutput == 512 * 9 * 40 * 2 /* 360kB 5"1/4 DS */ )
     {
         static uint8_t const s_abZeroSector[512] = { 0 };

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-bootsector.asm

@@ -58 +58 @@
 ;; Halts on failure location. For debugging.
 ;%define HLT_ON_FAILURE 1
+
+;; Enables saving of initial register state.
+;; Dropping this is useful for making more room for debugging.
+%define BS3KIT_BOOTSECTOR_SAVE_INITIAL_STATE
 
 
@@ -126 +130 @@
         cli
 
+%ifdef BS3KIT_BOOTSECTOR_SAVE_INITIAL_STATE
         ; save the registers.
         mov     [cs:BS3_ADDR_REG_SAVE + BS3REGCTX.rax], ax
         mov     [cs:BS3_ADDR_REG_SAVE + BS3REGCTX.ds], ds
+%endif
 
         ; set up the DS segment reister so we can skip the CS prefix when saving more prefixes..
@@ -134 +140 @@
         mov     ds, ax
 
+%ifdef BS3KIT_BOOTSECTOR_SAVE_INITIAL_STATE
         mov     [BS3_ADDR_REG_SAVE + BS3REGCTX.rdi], di
         mov     di, BS3_ADDR_REG_SAVE
@@ -141 +148 @@
         mov     [di + BS3REGCTX.es], es
         mov     [di + BS3REGCTX.rbp], bp
+%endif
 
         ; set up the stack.
@@ -198 +206 @@
 .is_80286:
 CPU 286
+%ifdef BS3KIT_BOOTSECTOR_SAVE_INITIAL_STATE
         smsw    [di + BS3REGCTX.cr0 - 0x70]
+%endif
 .pre_80286:
 CPU 8086
+%ifdef BS3KIT_BOOTSECTOR_SAVE_INITIAL_STATE
         mov     [di - 0x70 + BS3REGCTX.rbx], bx
         mov     [di - 0x70 + BS3REGCTX.rdx], dx
         mov     [di - 0x70 + BS3REGCTX.rsi], si
+%endif
         jmp     .do_load
 
@@ -209 +221 @@
 CPU 386
 .is_386plus:
+%ifdef BS3KIT_BOOTSECTOR_SAVE_INITIAL_STATE
         shr     eax, 16
         mov     [di - 0x70 + BS3REGCTX.rax+2], ax
@@ -253 +266 @@
         mov     [di - 0x70 + BS3REGCTX.cr4], eax
 .no_cr4:
+%endif
         ; Make sure caching is enabled and alignment is off.
         mov     eax, cr0
+%ifdef BS3KIT_BOOTSECTOR_SAVE_INITIAL_STATE
         mov     [di - 0x70 + BS3REGCTX.cr0], eax
+%endif
         and     eax, ~(X86_CR0_NW | X86_CR0_CD | X86_CR0_AM)
         mov     cr0, eax
@@ -396 +412 @@
         mov     ax, 0201h               ; al=1 sector; ah=read function
         int     13h
-%ifndef HLT_ON_FAILURE
+ %ifndef HLT_ON_FAILURE
         jc      .failure
-%else
+ %else
         jnc     .read_ok
         cli
         hlt
 .read_ok:
-%endif
+ %endif
 
         ; advance to the next sector/head/cylinder.
@@ -482 +498 @@
         inc     ch
         jmp     .the_load_loop
-.read_one
+.read_one:
+%elifdef HLT_ON_FAILURE
+        je      .read_one_ok
+        cli
+        hlt
+.read_one_ok:
 %else
         jne     .failure