Changeset 102129 in vbox

Timestamp:

Nov 16, 2023 11:36:17 PM (14 months ago)

Author:

vboxsync

Message:

ValKit/bs3-cpu-basic-2: Working on LEA testing. bugref:10371

File:

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

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

@@ -2070 +2070 @@
 
          %assign iIndex     0
-         %assign cShift     0
+         %assign cShift     0 ; we don't have enough room for checking all the shifts in the 16-bit segment or the total image.
          %rep 8
           %if iIndex == 0
@@ -2092 +2092 @@
           %endif
 
-          ;%assign cShift    0
-          ;%rep 4
+          %if TMPL_BITS == 32
+            %assign cShiftLoops 1 ;; @todo split out the LEA tests, they are too big and we haven't done 64-bit mode yet.
+          %else
+            %assign cShiftLoops 1
+          %endif
+          %rep cShiftLoops
 
         ;
-        ; 32-bit operand size first.
+        ; We don't have room to test both 32-bit and 16-bit operand sizes here for 16-bit code.
         ;
         call    .load_regs
-           %if iBase == 4
+          %if iBase == 4 || iDstReg == 4
+        mov     esp, LEA_ESP
+          %endif
+
+        ; lea
+          %assign   iValue  iBase_Value + (iIndex_Value << cShift)
+        db      MY_O32 8dh, X86_MODRM_MAKE(iMod, iDstReg, iMemReg), X86_SIB_MAKE(iBase, iIndex, cShift)
+          %if iMod == X86_MOD_MEM1
+        db      -119
+           %assign  iValue  iValue - 119
+          %elif iMod == X86_MOD_MEM4 || (iMod == 0 && iBase == 5)
+        dd      -04353f1ech
+           %assign  iValue  iValue - 04353f1ech
+          %endif
+
+        ; cmp iDstReg, iValue
+        db      MY_CMP_O32 81h, X86_MODRM_MAKE(X86_MOD_REG, 7, iDstReg)
+        dd      iValue & 0ffffffffh
+          %if iBase == 4 || iDstReg == 4
+        mov     esp, [BS3_DATA_NM(g_bs3CpuBasic2_lea_rsp)]
+          %endif
+        jz      $+3
+        int3
+
+          %if TMPL_BITS == 32
+        call    .load_regs
+           %if iBase == 4 || iDstReg == 4
         mov     esp, LEA_ESP
            %endif
@@ -2117 +2147 @@
         db      MY_CMP_O32 81h, X86_MODRM_MAKE(X86_MOD_REG, 7, iDstReg)
         dd      iValue & 0ffffffffh
-           %if iBase == 4
+           %if iBase == 4 || iDstReg == 4
         mov     esp, [BS3_DATA_NM(g_bs3CpuBasic2_lea_rsp)]
            %endif
         jz      $+3
         int3
-
-           %assign cShift   (cShift + 1) & 3
-           ;%endrep
+          %endif ; TMPL_BITS == 32
+
+           %assign cShift    (cShift + 1) & 3
+          %endrep
           %assign iIndex    iIndex + 1
          %endrep