Changeset 66454 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Timestamp:

Apr 6, 2017 9:12:29 AM (8 years ago)

Author:

vboxsync

Message:

bs3kit: Added Bs3GetCpuVendor.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• bs3kit-autostubs.kmk (modified) (2 diffs)
• bs3kit-mangling-code-define.h (modified) (2 diffs)
• bs3kit-mangling-code-undef.h (modified) (2 diffs)
• bs3kit.h (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-autostubs.kmk

@@ -40 +40 @@
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestFailedF)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestFailedV)
+$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3GetCpuVendor)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3StrCpy)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3GetModeName)
@@ -136 +137 @@
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,bs3PagingGetLegacyPte)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,bs3PagingGetPaePte)
-$(call BS3KIT_FN_GEN_MODE_NEARSTUB,bs3kit-common-16,Bs3GetCpuVendor)
 $(call BS3KIT_FN_GEN_MODE_NEARSTUB,bs3kit-common-16,Bs3SwitchTo32BitAndCallC)
 $(call BS3KIT_FN_GEN_MODE_NEARSTUB,bs3kit-common-16,Bs3TrapInit)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code-define.h

@@ -38 +38 @@
 #define Bs3ExtCtxRestore BS3_CMN_MANGLER(Bs3ExtCtxRestore)
 #define Bs3ExtCtxSave BS3_CMN_MANGLER(Bs3ExtCtxSave)
+#define Bs3GetCpuVendor BS3_CMN_MANGLER(Bs3GetCpuVendor)
 #define Bs3GetModeName BS3_CMN_MANGLER(Bs3GetModeName)
 #define Bs3GetModeNameShortLower BS3_CMN_MANGLER(Bs3GetModeNameShortLower)
@@ -166 +167 @@
 #ifndef BS3_CMN_ONLY
 # define Bs3CpuDetect BS3_MODE_MANGLER(Bs3CpuDetect)
-# define Bs3GetCpuVendor BS3_MODE_MANGLER(Bs3GetCpuVendor)
 # define Bs3SwitchTo32BitAndCallC BS3_MODE_MANGLER(Bs3SwitchTo32BitAndCallC)
 # define Bs3TestDoModes BS3_MODE_MANGLER(Bs3TestDoModes)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code-undef.h

@@ -38 +38 @@
 #undef Bs3ExtCtxRestore
 #undef Bs3ExtCtxSave
+#undef Bs3GetCpuVendor
 #undef Bs3GetModeName
 #undef Bs3GetModeNameShortLower
@@ -166 +167 @@
 #ifndef BS3_CMN_ONLY
 # undef Bs3CpuDetect
-# undef Bs3GetCpuVendor
 # undef Bs3SwitchTo32BitAndCallC
 # undef Bs3TestDoModes

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -1501 +1501 @@
 BS3_CMN_PROTO_STUB(const char BS3_FAR *, Bs3GetModeNameShortLower,(uint8_t bMode));
 
+/** CPU vendors. */
+typedef enum BS3CPUVENDOR
+{
+    BS3CPUVENDOR_INVALID = 0,
+    BS3CPUVENDOR_INTEL,
+    BS3CPUVENDOR_AMD,
+    BS3CPUVENDOR_VIA,
+    BS3CPUVENDOR_CYRIX,
+    BS3CPUVENDOR_UNKNOWN,
+    BS3CPUVENDOR_END
+} BS3CPUVENDOR;
+
+/**
+ * Tries to detect the CPU vendor.
+ *
+ * @returns CPU vendor.
+ */
+BS3_CMN_PROTO_STUB(BS3CPUVENDOR, Bs3GetCpuVendor,(void));
+
 /**
  * Shutdown the system, never returns.
@@ -3748 +3767 @@
 extern uint16_t g_uBs3CpuDetected;
 
-/** CPU vendors. */
-typedef enum BS3CPUVENDOR
-{
-    BS3CPUVENDOR_INVALID = 0,
-    BS3CPUVENDOR_INTEL,
-    BS3CPUVENDOR_AMD,
-    BS3CPUVENDOR_VIA,
-    BS3CPUVENDOR_CYRIX,
-    BS3CPUVENDOR_UNKNOWN,
-    BS3CPUVENDOR_END
-} BS3CPUVENDOR;
-
-/**
- * Tries to detect the CPU vendor.
- *
- * @returns CPU vendor.
- */
-BS3_MODE_PROTO_STUB(BS3CPUVENDOR, Bs3GetCpuVendor,(void));
-
 /**
  * Call 32-bit prot mode C function.