Changeset 47047 in vbox for trunk

Timestamp:

Jul 8, 2013 5:54:36 PM (12 years ago)

Author:

vboxsync

Message:

Two image BS2 so we can drop the test size restrictions. Rewrite the BS2 makefile to use MISCBINS and kBuild stuff instead of all custom rules.

Location:

trunk/src/VBox/VMM/testcase/Instructions

Files:

• InstructionTestGen.py (modified) (1 diff)
• env-bs2-r0-64-big.mac (copied) (copied from trunk/src/VBox/VMM/testcase/Instructions/env-bs2-r0-64.mac ) (2 diffs)
• env-bs2-r0-big.mac (copied) (copied from trunk/src/VBox/VMM/testcase/Instructions/env-bs2-r0.mac ) (3 diffs)

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

@@ -388 +388 @@
 ## Target environments.
 g_dTargetEnvs = {
-    '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),
+    '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),
+    'bs2-r0-64-big':    TargetEnv('bs2-r0-64-big',  TargetEnv.ksInstrSet_64, TargetEnv.ksCpuMode_Long,    0),
 };
 

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

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; Instruction Test Environment - Boot Sector Type 2, Ring-0, 64-Bit.
+; Instruction Test Environment - Big Boot Sector Type 2, Ring-0, 64-Bit.
 ;
 
@@ -32 +32 @@
 %define RTCCPTR_PRE     qword
 
-%include "env-bs2-r0.mac"
+%include "env-bs2-r0-big.mac"
 

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

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; Instruction Test Environment - Boot Sector Type 2, Ring-0.
+; Instruction Test Environment - Big Boot Sector Type 2, Ring-0.
 ;
 
@@ -16 +16 @@
 ;
 
-%ifndef ___env_bs2_r0_mac
-%define ___env_bs2_r0_mac
+%ifndef ___env_bs2_r0_big_mac
+%define ___env_bs2_r0_big_mac
+
+;
+; Include the BS2 API for BIG images.
+;
+%include "bootsector2-api.mac"
 
 
@@ -48 +53 @@
 
 ;; Call RTTestISub like function.
-%define VBINSTST_CALL_FN_SUB_TEST   call TMPL_NM_CMN(TestSub)
+%define VBINSTST_CALL_FN_SUB_TEST   call [TMPL_NM_CMN(g_pfnTestSub) xWrtRIP]
 
 ;; Call RTTestIFailure like function with simple message.
-%define VBINSTST_CALL_FN_FAILURE    call TMPL_NM_CMN(TestFailedF)
+%define VBINSTST_CALL_FN_FAILURE    call [TMPL_NM_CMN(g_pfnTestFailedF) xWrtRIP]
 
 ;; Call RTTestIFailure like function with format message + 1 arg.
-%define VBINSTST_CALL_FN_FAILURE_1  call TMPL_NM_CMN(TestFailedF)
+%define VBINSTST_CALL_FN_FAILURE_1  call [TMPL_NM_CMN(g_pfnTestFailedF) xWrtRIP]
 
 ;; Call RTTestIFailure like function with format message + 2 args.
-%define VBINSTST_CALL_FN_FAILURE_2  call TMPL_NM_CMN(TestFailedF)
+%define VBINSTST_CALL_FN_FAILURE_2  call [TMPL_NM_CMN(g_pfnTestFailedF) xWrtRIP]
 
 ;; Call RTTestIFailure like function with format message + 3 args.
-%define VBINSTST_CALL_FN_FAILURE_3  call TMPL_NM_CMN(TestFailedF)
+%define VBINSTST_CALL_FN_FAILURE_3  call [TMPL_NM_CMN(g_pfnTestFailedF) xWrtRIP]
 
 ;; Call RTTestIFailure like function with format message + 4 args.
-%define VBINSTST_CALL_FN_FAILURE_4  call TMPL_NM_CMN(TestFailedF)
+%define VBINSTST_CALL_FN_FAILURE_4  call [TMPL_NM_CMN(g_pfnTestFailedF) xWrtRIP]