Changeset 60009 in vbox

Timestamp:

Mar 13, 2016 4:34:32 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: Updates

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• Makefile.kmk (modified) (1 diff)
• bs3-cpu-basic-2-c.c (modified) (1 diff)
• bs3-cpu-basic-2-template.c (modified) (1 diff)
• bs3kit/VBoxBs3ObjConverter.cpp (modified) (1 diff)
• bs3kit/bs3-cmn-RegCtxConvertToRingX.c (modified) (2 diffs)
• bs3kit/bs3kit.mac (modified) (1 diff)

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

@@ -40 +40 @@
 # Include sub-makefile.
 #
+# The VBOX_WITH_BS3KIT feature requires NASM 2.12 and either MSVC or gcc
+# with ms_abi function attribute (gcc v4.4+, MSVC default).
+#
 if defined(VBOX_WITH_OPEN_WATCOM)
  if1of ($(KBUILD_TARGET), win)
   VBOX_WITH_BS3KIT = 1
  else if $(VBOX_GCC_VERSION_CC) >= 40400 # ms_abi was added in 4.4
-  if1of ($(KBUILD_TARGET), linux) # Requires patched NASM in tools.
-   VBOX_WITH_BS3KIT = 1
-  endif
+# Awaiting elf -> omf converter #  if1of ($(KBUILD_TARGET), linux)
+# Awaiting elf -> omf converter #   VBOX_WITH_BS3KIT = 1
+# Awaiting elf -> omf converter #  endif
  endif
  ifdef VBOX_WITH_BS3KIT

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

@@ -32 +32 @@
 
 
+BS3TESTMODE_PROTOTYPES_CMN(bs3CpuBasic2_Hello);
+
 //BS3TESTMODE_PROTOTYPES_CMN(bs3CpuBasic2_iret);
 //#pragma alias("_bs3CpuBasic2_iret_c64", "bs3CpuBasic2_iret_c64")
 
 BS3TESTMODE_PROTOTYPES_MODE(bs3CpuBasic2_iret);
-#pragma alias("_bs3CpuBasic2_iret_lm64", "bs3CpuBasic2_iret_lm64")
+
 
 static const BS3TESTMODEENTRY g_aModeTest[] =
 {
+    BS3TESTMODEENTRY_CMN("Hello", bs3CpuBasic2_Hello),
     //BS3TESTMODEENTRY_CMN("iret", bs3CpuBasic2_iret),
     BS3TESTMODEENTRY_MODE("iret", bs3CpuBasic2_iret),

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

@@ -2 +2 @@
 
 
-BS3_DECL(uint8_t) BS3_CMN_NM(Hello)(uint8_t bMode)
+BS3_DECL(uint8_t) BS3_CMN_NM(bs3CpuBasic2_Hello)(uint8_t bMode)
 {
-
+    Bs3Printf("Hello C Word: %#x\n", bMode);
     return UINT8_MAX;
 }

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/VBoxBs3ObjConverter.cpp

@@ -1571 +1571 @@
                         && pThis->paSymbols[iSym].enmType   == OMFSYMTYPE_PUBDEF)
                     {
-                        if (!omfWriter_PubDefAdd(pThis, paSymbols[iSym].Value,
-                                                 coffGetSymbolName(&paSymbols[iSym], pchStrTab, cbStrTab, szShort)) )
+                        const char *pszName = coffGetSymbolName(&paSymbols[iSym], pchStrTab, cbStrTab, szShort);
+                        if (!omfWriter_PubDefAdd(pThis, paSymbols[iSym].Value, pszName))
                             return false;
+
+                        /* If the symbol doesn't start with an underscore, add an underscore
+                           prefixed alias to ease access from 16-bit and 32-bit code. */
+                        if (*pszName != '_')
+                        {
+                            char   szCdeclName[512];
+                            size_t cchName = strlen(pszName);
+                            if (cchName > sizeof(szCdeclName) - 2)
+                                cchName = sizeof(szCdeclName) - 2;
+                            szCdeclName[0] = '_';
+                            memcpy(&szCdeclName[1], pszName, cchName);
+                            szCdeclName[cchName + 1] = '\0';
+                            if (!omfWriter_PubDefAdd(pThis, paSymbols[iSym].Value, szCdeclName))
+                                return false;
+                        }
+
                         pThis->paSymbols[iSym].idx = idxPubDef++;
                     }

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

@@ -38 +38 @@
  * @param   bRing           The target ring.
  */
-uint16_t bs3RegCtxConvertRealSegToRingX(uint16_t uSeg, uint8_t bRing)
+static uint16_t bs3RegCtxConvertRealSegToRingX(uint16_t uSeg, uint8_t bRing)
 {
     uint16_t uSel;
@@ -74 +74 @@
  * @param   bRing           The target ring.
  */
-uint16_t bs3RegCtxConvertProtSelToRingX(uint16_t uSel, uint8_t bRing)
+static uint16_t bs3RegCtxConvertProtSelToRingX(uint16_t uSel, uint8_t bRing)
 {
     if (   uSel > X86_SEL_RPL

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

@@ -600 +600 @@
 ;
 %macro BS3_PROC_BEGIN 1
+%if __BITS__ == 64
+ BS3_GLOBAL_NAME_EX _ %+ %1, function, (_ %+ %1 %+ _EndProc - %1)
+%endif
 BS3_GLOBAL_NAME_EX %1, function, (%1 %+ _EndProc - %1)
 %endmacro