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

Timestamp:

Apr 19, 2016 3:01:35 AM (9 years ago)

Author:

vboxsync

Message:

bs3kit: move real mode version of Bs3TestDoModes out of the default 16-bit code segment.

File:

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

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

@@ -35 +35 @@
 ;*      Global Variables                                                                                                         *
 ;*********************************************************************************************************************************
-extern Bs3X0Text16_EndOfSegment
-extern Bs3X1Text16_EndOfSegment
+BS3_EXTERN_DATA16 Bs3RmText16_EndOfSegment
+BS3_EXTERN_DATA16 Bs3X0Text16_EndOfSegment
+BS3_EXTERN_DATA16 Bs3X1Text16_EndOfSegment
 
 
@@ -43 +44 @@
 ;
 BS3_BEGIN_TEXT16
+BS3_BEGIN_RMTEXT16
 BS3_BEGIN_X0TEXT16
 BS3_BEGIN_X1TEXT16
@@ -77 +79 @@
 
         mov     ax, dx
-        sub     ax, BS3TEXT16
+        sub     ax, CGROUP16
         cmp     ax, 1000h
         jb      .bs3text16
 
         mov     ax, dx
-        sub     ax, BS3X0TEXT16
+        sub     ax, BS3GROUPRMTEXT16
+        mov     bx, Bs3RmText16_EndOfSegment wrt BS3GROUPRMTEXT16
+        add     bx, 15
+        shr     bx, cl
+        cmp     ax, bx
+        jb      .bs3rmtext16
+
+        mov     ax, dx
+        sub     ax, BS3GROUPX0TEXT16
         mov     bx, Bs3X0Text16_EndOfSegment wrt BS3GROUPX0TEXT16
         add     bx, 15
@@ -90 +100 @@
 
         mov     ax, dx
-        sub     ax, BS3X1TEXT16
+        sub     ax, BS3GROUPX1TEXT16
         mov     bx, Bs3X1Text16_EndOfSegment wrt BS3GROUPX1TEXT16
         add     bx, 15
@@ -104 +114 @@
         ;
 .bs3x1text16:
-        mov     dx, BS3X1TEXT16
+        mov     dx, BS3GROUPX1TEXT16
         jmp     .calc_return
 .bs3x0text16:
-        mov     dx, BS3X0TEXT16
+        mov     dx, BS3GROUPX0TEXT16
+        jmp     .calc_return
+.bs3rmtext16:
+        mov     dx, BS3GROUPRMTEXT16
         jmp     .calc_return
 .bs3text16:
-        mov     dx, BS3X0TEXT16
+        mov     dx, CGROUP16
 .calc_return:
         ; Convert the real-mode frame into the low 16-bit base (BX).