Changeset 66168 in vbox

Timestamp:

Mar 20, 2017 1:40:32 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

114077

Message:

bs3kit: Added lower case mode name global variables and getter.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (2 diffs)
• bs3-cmn-GetModeNameShortLower.c (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-GetModeName.c ) (2 diffs)
• bs3-mode-NameShortLower.asm (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-Name.asm ) (1 diff)
• bs3kit-autostubs.kmk (modified) (2 diffs)
• bs3kit-mangling-code-define.h (modified) (1 diff)
• bs3kit-mangling-code-undef.h (modified) (1 diff)
• bs3kit.h (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -56 +56 @@
         bs3-cmn-A20Enable.asm \
         bs3-cmn-GetModeName.c \
+        bs3-cmn-GetModeNameShortLower.c \
         bs3-cmn-KbdRead.asm \
         bs3-cmn-KbdWait.asm \
@@ -265 +266 @@
 VBOX_BS3KIT_MODE_SOURCES = \
         bs3-mode-Name.asm \
+        bs3-mode-NameShortLower.asm \
         bs3-mode-SwitchToRM.asm \
         bs3-mode-SwitchToPE16.asm \

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-GetModeNameShortLower.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * BS3Kit - Bs3GetModeName
+ * BS3Kit - Bs3GetModeNameShortLower
  */
 
@@ -29 +29 @@
 
 
-#undef Bs3GetModeName
-BS3_CMN_DEF(const char BS3_FAR *, Bs3GetModeName,(uint8_t bMode))
+#undef Bs3GetModeNameShortLower
+BS3_CMN_DEF(const char BS3_FAR *, Bs3GetModeNameShortLower,(uint8_t bMode))
 {
     switch (bMode)
     {
-        case BS3_MODE_RM:           return g_szBs3ModeName_rm;
-        case BS3_MODE_PE16:         return g_szBs3ModeName_pe16;
-        case BS3_MODE_PE16_32:      return g_szBs3ModeName_pe16_32;
-        case BS3_MODE_PE16_V86:     return g_szBs3ModeName_pe16_v86;
-        case BS3_MODE_PE32:         return g_szBs3ModeName_pe32;
-        case BS3_MODE_PE32_16:      return g_szBs3ModeName_pe32_16;
-        case BS3_MODE_PEV86:        return g_szBs3ModeName_pev86;
-        case BS3_MODE_PP16:         return g_szBs3ModeName_pp16;
-        case BS3_MODE_PP16_32:      return g_szBs3ModeName_pp16_32;
-        case BS3_MODE_PP16_V86:     return g_szBs3ModeName_pp16_v86;
-        case BS3_MODE_PP32:         return g_szBs3ModeName_pp32;
-        case BS3_MODE_PP32_16:      return g_szBs3ModeName_pp32_16;
-        case BS3_MODE_PPV86:        return g_szBs3ModeName_ppv86;
-        case BS3_MODE_PAE16:        return g_szBs3ModeName_pae16;
-        case BS3_MODE_PAE16_32:     return g_szBs3ModeName_pae16_32;
-        case BS3_MODE_PAE16_V86:    return g_szBs3ModeName_pae16_v86;
-        case BS3_MODE_PAE32:        return g_szBs3ModeName_pae32;
-        case BS3_MODE_PAE32_16:     return g_szBs3ModeName_pae32_16;
-        case BS3_MODE_PAEV86:       return g_szBs3ModeName_paev86;
-        case BS3_MODE_LM16:         return g_szBs3ModeName_lm16;
-        case BS3_MODE_LM32:         return g_szBs3ModeName_lm32;
-        case BS3_MODE_LM64:         return g_szBs3ModeName_lm64;
-        case BS3_MODE_INVALID:      return "invalid";
-        default:                    return "unknow";
+        case BS3_MODE_RM:           return g_szBs3ModeNameShortLower_rm;
+        case BS3_MODE_PE16:         return g_szBs3ModeNameShortLower_pe16;
+        case BS3_MODE_PE16_32:      return g_szBs3ModeNameShortLower_pe16_32;
+        case BS3_MODE_PE16_V86:     return g_szBs3ModeNameShortLower_pe16_v86;
+        case BS3_MODE_PE32:         return g_szBs3ModeNameShortLower_pe32;
+        case BS3_MODE_PE32_16:      return g_szBs3ModeNameShortLower_pe32_16;
+        case BS3_MODE_PEV86:        return g_szBs3ModeNameShortLower_pev86;
+        case BS3_MODE_PP16:         return g_szBs3ModeNameShortLower_pp16;
+        case BS3_MODE_PP16_32:      return g_szBs3ModeNameShortLower_pp16_32;
+        case BS3_MODE_PP16_V86:     return g_szBs3ModeNameShortLower_pp16_v86;
+        case BS3_MODE_PP32:         return g_szBs3ModeNameShortLower_pp32;
+        case BS3_MODE_PP32_16:      return g_szBs3ModeNameShortLower_pp32_16;
+        case BS3_MODE_PPV86:        return g_szBs3ModeNameShortLower_ppv86;
+        case BS3_MODE_PAE16:        return g_szBs3ModeNameShortLower_pae16;
+        case BS3_MODE_PAE16_32:     return g_szBs3ModeNameShortLower_pae16_32;
+        case BS3_MODE_PAE16_V86:    return g_szBs3ModeNameShortLower_pae16_v86;
+        case BS3_MODE_PAE32:        return g_szBs3ModeNameShortLower_pae32;
+        case BS3_MODE_PAE32_16:     return g_szBs3ModeNameShortLower_pae32_16;
+        case BS3_MODE_PAEV86:       return g_szBs3ModeNameShortLower_paev86;
+        case BS3_MODE_LM16:         return g_szBs3ModeNameShortLower_lm16;
+        case BS3_MODE_LM32:         return g_szBs3ModeNameShortLower_lm32;
+        case BS3_MODE_LM64:         return g_szBs3ModeNameShortLower_lm64;
+        case BS3_MODE_INVALID:      return "inv";
+        default:                    return "unk";
     }
 }

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-NameShortLower.asm

@@ -29 +29 @@
 
 BS3_BEGIN_DATA16
-BS3_GLOBAL_NAME_EX RT_CONCAT3(g_szBs3ModeName, _, TMPL_MODE_LNAME), , %strlen(TMPL_MODE_STR)
-BS3_GLOBAL_NAME_EX RT_CONCAT3(_g_szBs3ModeName, _, TMPL_MODE_LNAME), , %strlen(TMPL_MODE_STR)
-        db TMPL_MODE_STR, 0
+%undef  MY_MODE_NAME_STR
+%defstr MY_MODE_NAME_STR TMPL_MODE_LNAME
+BS3_GLOBAL_NAME_EX RT_CONCAT3(g_szBs3ModeNameShortLower, _, TMPL_MODE_LNAME), , %strlen(MY_MODE_NAME_STR)
+BS3_GLOBAL_NAME_EX RT_CONCAT3(_g_szBs3ModeNameShortLower, _, TMPL_MODE_LNAME), , %strlen(MY_MODE_NAME_STR)
+        db MY_MODE_NAME_STR, 0
 

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

@@ -35 +35 @@
 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3RegCtxSaveEx,8)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestCheckRegCtxEx)
+$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestFailed)
+$(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,Bs3StrCpy)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3GetModeName)
+$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3GetModeNameShortLower)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingAlias)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingInitRootForLM)
@@ -93 +97 @@
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabListFree)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabListInit)
-$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestFailed)
-$(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,Bs3TestInit)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestPrintf)

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

@@ -32 +32 @@
 #define Bs3A20EnableViaPortA BS3_CMN_MANGLER(Bs3A20EnableViaPortA)
 #define Bs3GetModeName BS3_CMN_MANGLER(Bs3GetModeName)
+#define Bs3GetModeNameShortLower BS3_CMN_MANGLER(Bs3GetModeNameShortLower)
 #define Bs3KbdRead BS3_CMN_MANGLER(Bs3KbdRead)
 #define Bs3KbdWait BS3_CMN_MANGLER(Bs3KbdWait)

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

@@ -32 +32 @@
 #undef Bs3A20EnableViaPortA
 #undef Bs3GetModeName
+#undef Bs3GetModeNameShortLower
 #undef Bs3KbdRead
 #undef Bs3KbdWait

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

@@ -1494 +1494 @@
 
 /**
+ * Translate a mode into a short lower case string.
+ *
+ * @returns Pointer to read-only short mode name string.
+ * @param   bMode       The mode value (BS3_MODE_XXX).
+ */
+BS3_CMN_PROTO_STUB(const char BS3_FAR *, Bs3GetModeNameShortLower,(uint8_t bMode));
+
+/**
  * Shutdown the system, never returns.
  *
@@ -3414 +3422 @@
  * These are all in DATA16 so they can be accessed from any code.  */
 BS3_MODE_EXPAND_EXTERN_DATA16(const char, g_szBs3ModeName, []);
+/** The TMPL_MODE_LNAME value for each mode.
+ * These are all in DATA16 so they can be accessed from any code.  */
+BS3_MODE_EXPAND_EXTERN_DATA16(const char, g_szBs3ModeNameShortLower, []);
+
 
 /**