Changeset 561 in xtideuniversalbios for trunk

Timestamp:

Jul 9, 2013, 6:00:38 PM (11 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• MODULE_VERY_LATE_INITIALIZATION is not included on AT builds by default.
• Very late initialization now uses 32h instead of 20h for temporary vector (untested but 20h might cause problems with ROM DOS).

Location:

trunk/XTIDE_Universal_BIOS

Files:

• Src/Handlers/Int13h.asm (modified) (1 diff)
• Src/Handlers/Int13hBiosInit.asm (modified) (1 diff)
• Src/Handlers/Int19h.asm (modified) (1 diff)
• Src/Initialization/Initialize.asm (modified) (1 diff)
• makefile (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h.asm

@@ -176 +176 @@
     ; Simulate INT by pushing flags and return address
     push    WORD [bp+IDEPACK.intpack+INTPACK.flags]
+%if 0
+    ; No standard INT 13h function uses FLAGS as parameters so no need to restore them
     popf
-    pushf                               ; Simulate INT by pushing flags
+    pushf
+%endif
     push    cs
     ePUSH_T di, .ReturnFromAnotherBios  ; Can not corrupt flags

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13hBiosInit.asm

@@ -22 +22 @@
 SECTION .text
 
-TEMPORARY_VECTOR_FOR_SYSTEM_INT13h      EQU     20h ; MS-DOS so BIOSes most likely do not use this
+TEMPORARY_VECTOR_FOR_SYSTEM_INT13h      EQU     32h ; Unused by BIOS
 
 

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm

@@ -31 +31 @@
     sti                                         ; Enable interrupts
     cld                                         ; String instructions to increment pointers
+%ifdef MODULE_VERY_LATE_INITIALIZATION
+    LOAD_BDA_SEGMENT_TO ds, ax                  ; Load BDA segment (zero) to DS
+    les     ax, [TEMPORARY_VECTOR_FOR_SYSTEM_INT13h*4]
+    mov     [BIOS_DISK_INTERRUPT_13h*4], ax
+    mov     [BIOS_DISK_INTERRUPT_13h*4+2], es
+    push    ds                                  ; BDA segment (zero)...
+    pop     es                                  ; ...to ES
+%else
     LOAD_BDA_SEGMENT_TO es, ax                  ; Load BDA segment (zero) to ES
-%ifdef MODULE_VERY_LATE_INITIALIZATION
-    lds     ax, [es:TEMPORARY_VECTOR_FOR_SYSTEM_INT13h*4]
-    mov     [es:BIOS_DISK_INTERRUPT_13h*4], ax
-    mov     [es:BIOS_DISK_INTERRUPT_13h*4+2], ds
 %endif
     ; Fall to .PrepareBootLoaderStack

trunk/XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm

@@ -52 +52 @@
     ; when our INT 19h is not called
     les     ax, [BIOS_DISK_INTERRUPT_13h*4] ; Load system INT 13h handler
+    mov     WORD [BIOS_DISK_INTERRUPT_13h*4], Int13hBiosInit_Handler
+    mov     [BIOS_DISK_INTERRUPT_13h*4+2], cs
     mov     [TEMPORARY_VECTOR_FOR_SYSTEM_INT13h*4], ax
     mov     [TEMPORARY_VECTOR_FOR_SYSTEM_INT13h*4+2], es
-    mov     WORD [BIOS_DISK_INTERRUPT_13h*4], Int13hBiosInit_Handler
-    mov     [BIOS_DISK_INTERRUPT_13h*4+2], cs
     pop     es
 %endif

trunk/XTIDE_Universal_BIOS/makefile

@@ -101 +101 @@
 # Assembler preprocessor defines.                               #
 #################################################################
-DEFINES_COMMON = MODULE_STRINGS_COMPRESSED MODULE_HOTKEYS MODULE_8BIT_IDE MODULE_EBIOS MODULE_SERIAL MODULE_SERIAL_FLOPPY MODULE_VERY_LATE_INITIALIZATION MODULE_FEATURE_SETS RESERVE_DIAGNOSTIC_CYLINDER
+DEFINES_COMMON = MODULE_STRINGS_COMPRESSED MODULE_HOTKEYS MODULE_8BIT_IDE MODULE_EBIOS MODULE_SERIAL MODULE_SERIAL_FLOPPY MODULE_FEATURE_SETS RESERVE_DIAGNOSTIC_CYLINDER
 DEFINES_COMMON_LARGE = MODULE_BOOT_MENU MODULE_8BIT_IDE_ADVANCED MODULE_COMPATIBLE_TABLES
 
-DEFINES_XT = $(DEFINES_COMMON) ELIMINATE_CGA_SNOW MODULE_8BIT_IDE_ADVANCED
+DEFINES_XT = $(DEFINES_COMMON) ELIMINATE_CGA_SNOW MODULE_8BIT_IDE_ADVANCED MODULE_VERY_LATE_INITIALIZATION
 DEFINES_XTPLUS = $(DEFINES_COMMON) $(DEFINES_XT) USE_186
 DEFINES_AT = $(DEFINES_COMMON) USE_AT USE_286 MODULE_IRQ MODULE_ADVANCED_ATA MODULE_COMPATIBLE_TABLES