Changeset 60000 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-PrintChr.asm

Timestamp:

Mar 11, 2016 7:12:05 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: v8086, long, fixes, updates.

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-PrintChr.asm (modified) (3 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-PrintChr.asm

@@ -25 +25 @@
 ;
 
+
+;*********************************************************************************************************************************
+;*  Header Files                                                                                                                 *
+;*********************************************************************************************************************************
 %include "bs3kit-template-header.mac"
+
+
+;*********************************************************************************************************************************
+;*  External Symbols                                                                                                             *
+;*********************************************************************************************************************************
+%if TMPL_BITS == 16
+BS3_EXTERN_DATA16 g_bBs3CurrentMode
+%endif
+BS3_EXTERN_CMN Bs3Syscall
+
+
+TMPL_BEGIN_TEXT
 
 ;;
@@ -38 +54 @@
         push    xBX
 
-%ifdef TMPL_16BIT
-        ; If we're not in protected mode, call the VGA BIOS directly.
-        smsw    bx
-        test    bx, X86_CR0_PE
-        jnz     .protected_mode
+%if TMPL_BITS == 16
+        ; If we're in real mode or v8086 mode, call the VGA BIOS directly.
+        mov     bl, [g_bBs3CurrentMode]
+        cmp     bl, BS3_MODE_RM
+        je      .do_vga_bios_call
+;later ;        and     bl, BS3_MODE_CODE_MASK
+;later ;        cmp     bl, BS3_MODE_CODE_V86
+        jne     .do_system_call
 
+.do_vga_bios_call:
         mov     al, [xBP + xCB*2]       ; Load the char
         mov     bx, 0ff00h
@@ -49 +69 @@
         int     10h
         jmp     .return
-
-.protected_mode:
 %endif
 
+.do_system_call:
         mov     cl, [xBP + xCB*2]       ; Load the char
         mov     ax, BS3_SYSCALL_PRINT_CHR
-        int     BS3_TRAP_SYSCALL
+        call    Bs3Syscall              ; (no BS3_CALL!)
 
 .return: