Changeset 97510 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-template.mac

Timestamp:

Nov 11, 2022 12:21:18 PM (2 years ago)

Author:

vboxsync

Message:

ValKit/bs3-cpu-basic-2: More updates on the far jumps test (intel). bugref:9898

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-template.mac (modified) (4 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-template.mac

@@ -1329 +1329 @@
  %else
         dd      .again wrt FLAT
-  %if %2 != 0
-        dd      0fffff000h
-  %endif
         dw      BS3_SEL_R2_CS64 | 2
  %endif
@@ -1366 +1363 @@
         BS3_CPUBAS2_JMP_FAR_MEM_LABEL   .fpfn, 0
 .fpfn:
-  %if TMPL_BITS != 64 || %2 == 0
-        dw      .again wrt CGROUP16
-  %else
-        dd      .again wrt CGROUP16, 0
-  %endif
+  ;%if TMPL_BITS != 64 || %2 == 0
+        dw      .again wrt CGROUP16
+  ;%else
+  ;      dd      .again wrt CGROUP16, 0
+  ;%endif
         dw      BS3_SEL_R0_CS16
         times 4 int3
@@ -1384 +1381 @@
         BS3_CPUBAS2_JMP_FAR_MEM_LABEL   .fpfn, 0
 .fpfn:
-  %if TMPL_BITS != 64
-        dd      .again wrt FLAT
-  %else
-        dd      .again wrt FLAT
-   %if %2 != 0
-        dd      0
-   %endif
-  %endif
+        dd      .again wrt FLAT
         dw      BS3_SEL_R0_CS32
         times 4 int3
@@ -1436 +1426 @@
  %else
         dd      .jmp_target wrt FLAT
-  %if %2 != 0
-        dd      0fffff000h
-  %endif
  %endif
         dw      BS3_SEL_SPARE_00        ; ASSUMES this is set up as CGROUP16 but with L=1.