Changeset 46917 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

Jul 2, 2013 5:44:45 PM (11 years ago)

Author:

vboxsync

Message:

bs2 + VBoxInsTst hacking.

Location:

trunk/src/VBox/VMM/testcase/Instructions

Files:

• InstructionTestGen.py (modified) (3 diffs)
• env-bs2-r0-64.mac (added)
• env-bs2-r0.mac (copied) (copied from trunk/src/VBox/VMM/testcase/Instructions/env-iprt-r3.mac ) (2 diffs)
• env-common.mac (modified) (4 diffs)

trunk/src/VBox/VMM/testcase/Instructions/InstructionTestGen.py

@@ -134 +134 @@
 g_iMyRandSeed = int((os.urandom(4)).encode('hex'), 16);
 #g_iMyRandSeed = 286523426;
+#g_iMyRandSeed = 1994382324;
 g_oMyRand = random.Random(g_iMyRandSeed);
 #g_oMyRand = random.SystemRandom();
@@ -378 +379 @@
     'iprt-r3-32':   TargetEnv('iprt-r3-32', TargetEnv.ksInstrSet_32, TargetEnv.ksCpuMode_Protect, 3),
     'iprt-r3-64':   TargetEnv('iprt-r3-64', TargetEnv.ksInstrSet_64, TargetEnv.ksCpuMode_Long,    3),
+    'bs2-r0-64':    TargetEnv('bs2-r0-64',  TargetEnv.ksInstrSet_64, TargetEnv.ksCpuMode_Long,    0),
 };
 
@@ -838 +840 @@
                                 # SIB - currently only short list of inputs or things may get seriously out of hand.
                                 self.generateStdTestGregMemSib(oGen, cAddrBits, cbEffOp, cbMaxOp, oGen.iModReg, auShortInputs);
-                    break;
-                break;
+                    #break;
+                #break;
 
 

trunk/src/VBox/VMM/testcase/Instructions/env-bs2-r0.mac

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; Instruction Test Environment - IPRT, Ring-3, 32-bit and 64-bit.
+; Instruction Test Environment - Boot Sector Type 2, Ring-0.
 ;
 
@@ -16 +16 @@
 ;
 
-%ifndef ___env_iprt_r3_mac
-%define ___env_iprt_r3_mac
-
-;*******************************************************************************
-;*  Header Files                                                               *
-;*******************************************************************************
-%include "iprt/asmdefs.mac"
-
-
-;*******************************************************************************
-;*  Defined Constants And Macros                                               *
-;*******************************************************************************
-%define sAX xAX
-%define sBX xBX
-%define sCX xCX
-%define sDX xDX
-%define sSP xSP
-%define sBP xBP
-%define sSI xSI
-%define sDI xDI
-%define sCB xCB
+%ifndef ___env_bs2_r0_mac
+%define ___env_bs2_r0_mac
 
 
 ;; Same as BEGINPROC in asmdefs.mac.
 %macro VBINSTST_BEGINPROC 1
-BEGINPROC %1
+VBINSTST_GLOBALNAME_EX %1, function hidden
 %endm
 
 ;; Same as ENDPROC in asmdefs.mac.
-%macro VBINSTST_ENDPROC   1
-ENDPROC %1
+%macro VBINSTST_ENDPROC 1,
+VBINSTST_GLOBALNAME_EX %1 %+ _EndProc, function hidden
 %endm
 
 ;; Same as NAME in asmdefs.mac.
-%define VBINSTST_NAME(a_Name)   NAME(a_Name)
+%define VBINSTST_NAME(a_Name)   TMPL_NM(a_Name)
 
 ;; Same as GLOBALNAME_EX in asmdefs.mac.
-%define VBINSTST_GLOBALNAME_EX  GLOBALNAME_EX
+%macro VBINSTST_GLOBALNAME_EX 2,
+VBINSTST_NAME(%1):
+%endmacro
 
 ;; Same as BEGINCODE in asmdefs.mac.
-%define VBINSTST_BEGINCODE      BEGINCODE
+%macro VBINSTST_BEGINCODE 0,
+%endmacro
 
 ;; Same as BEGINDATA in asmdefs.mac.
-%define VBINSTST_BEGINDATA      BEGINDATA
+%macro VBINSTST_BEGINDATA 0,
+%endmacro
 
 
 ;; Call RTTestISub like function.
-%define VBINSTST_CALL_FN_SUB_TEST   call IMP2(RTTestISub)
-EXTERN_IMP2 RTTestISub
+%define VBINSTST_CALL_FN_SUB_TEST   call TMPL_NM_CMN(TestSub)
 
 ;; Call RTTestIFailure like function with simple message.
-%define VBINSTST_CALL_FN_FAILURE    call NAME(VBInsTstFailure)
-extern NAME(VBInsTstFailure)
+%define VBINSTST_CALL_FN_FAILURE    call TMPL_NM_CMN(TestFailedF)
 
 ;; Call RTTestIFailure like function with format message + 1 arg.
-%define VBINSTST_CALL_FN_FAILURE_1  call NAME(VBInsTstFailure1)
-extern NAME(VBInsTstFailure1)
+%define VBINSTST_CALL_FN_FAILURE_1  call TMPL_NM_CMN(TestFailedF)
 
 ;; Call RTTestIFailure like function with format message + 2 args.
-%define VBINSTST_CALL_FN_FAILURE_2  call NAME(VBInsTstFailure2)
-extern NAME(VBInsTstFailure2)
+%define VBINSTST_CALL_FN_FAILURE_2  call TMPL_NM_CMN(TestFailedF)
 
 ;; Call RTTestIFailure like function with format message + 3 args.
-%define VBINSTST_CALL_FN_FAILURE_3  call NAME(VBInsTstFailure3)
-extern NAME(VBInsTstFailure3)
+%define VBINSTST_CALL_FN_FAILURE_3  call TMPL_NM_CMN(TestFailedF)
 
 ;; Call RTTestIFailure like function with format message + 4 args.
-%define VBINSTST_CALL_FN_FAILURE_4  call NAME(VBInsTstFailure4)
-extern NAME(VBInsTstFailure4)
+%define VBINSTST_CALL_FN_FAILURE_4  call TMPL_NM_CMN(TestFailedF)
 
 

trunk/src/VBox/VMM/testcase/Instructions/env-common.mac

@@ -138 +138 @@
         VBINSTST_CALL_FN_FAILURE_4
 
+%elifdef ASM_CALL64_BS2
+        mov     sBX, [VBINSTST_NAME(g_uVBInsTstSubTestIndicator) xWrtRIP]
+        mov     sCX, [xBP + xCB + xCB]     ; expected
+        mov     sAX, [xBP + xCB + xCB + sCB*1] ; actual
+        mov     sDX, [xBP + xCB + xCB + sCB*2] ; reg#
+        lea     sSI, [.szFmt xWrtRIP]
+        mov     qword [xSP + xCB + 3*sCB], sBX
+        mov     qword [xSP + xCB + 2*sCB], sCX
+        mov     qword [xSP + xCB + 1*sCB], sAX
+        mov     qword [xSP + xCB], sDX
+        mov     [xSP], sSI
+        VBINSTST_CALL_FN_FAILURE_4
+
 %else
         mov     sBX, [VBINSTST_NAME(g_uVBInsTstSubTestIndicator)]
-        mov     sCX, [xBP + 4 + xCB]     ; expected
-        mov     sAX, [xBP + 4 + xCB + 4] ; actual
-        mov     sDX, [xBP + 4 + xCB + 8] ; reg#
+        mov     sCX, [xBP + xCB + xCB]     ; expected
+        mov     sAX, [xBP + xCB + xCB + sCB*1] ; actual
+        mov     sDX, [xBP + xCB + xCB + sCB*2] ; reg#
         mov     [xSP + xCB + 3*sCB], sBX
         mov     [xSP + xCB + 2*sCB], sCX
@@ -155 +168 @@
         ret     3*sCB
 %if ARCH_BITS == 64
-.szFmt: db 'Bad register %#llx value %#018llx, expected %#018llx (line %llu)', 0
-%else
-.szFmt: db 'Bad register %lx value %#010lx, expected %#010lx (line %lu)', 0
+.szFmt: db 'Bad register 0x%RX32 value 0x%RX64, expected 0x%RX64 (line %RU64)', 13, 0
+%else
+.szFmt: db 'Bad register 0x%RX32 value 0x%RX32, expected 0x%RX32 (line %RU32)', 13, 0
 %endif
 VBINSTST_ENDPROC   Common_BadValue
@@ -167 +180 @@
 ; For address calculation reasons, these must be qword aligned.
 ;
-BEGINDATA
+VBINSTST_BEGINDATA
         dd      09d8af498h, 09ab3e5f8h
 VBINSTST_GLOBALNAME_EX g_u64Data, data hidden
@@ -186 +199 @@
         dd      058daffe2h
 
-BEGINCODE
+VBINSTST_BEGINCODE
 
 ;;