Changeset 41498 in vbox for trunk/src/VBox

Timestamp:

May 30, 2012 2:49:23 PM (13 years ago)

Author:

vboxsync

Message:

Windows build issues.

Location:

trunk/src/VBox/Devices/PC/BIOS-new

Files:

• MakeDebianBiosAssembly.cpp (modified) (6 diffs)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/PC/BIOS-new/MakeDebianBiosAssembly.cpp

@@ -344 +344 @@
 static bool disStringData(uint32_t uFlatAddr, uint32_t cb)
 {
-    uint8_t const  *pb = &g_pbImg[uFlatAddr - VBOX_BIOS_BASE];
-    size_t          cchOnLine = 0;
+    uint8_t const  *pb        = &g_pbImg[uFlatAddr - VBOX_BIOS_BASE];
+    uint32_t        cchOnLine = 0;
     while (cb > 0)
     {
@@ -416 +416 @@
 {
     uint8_t const  *pb        = &g_pbImg[uFlatAddr - VBOX_BIOS_BASE];
-    size_t          cchOnLine = 0;
+    uint32_t        cchOnLine = 0;
     uint8_t         bPrev     = 255;
     while (cb > 0)
@@ -864 +864 @@
             && ASMMemIsAll8(pb, RT_MIN(cb, 8), 0) == NULL)
         {
-            void  *pv      = ASMMemIsAll8(pb, cb, 0);
-            size_t cbZeros = pv ? (uint8_t const *)pv - pb : cb;
+            void    *pv      = ASMMemIsAll8(pb, cb, 0);
+            uint32_t cbZeros = pv ? (uint32_t)((uint8_t const *)pv - pb) : cb;
             if (!outputPrintf("    times %#x db 0\n", cbZeros))
                 return false;
@@ -1079 +1079 @@
     }
     pMap->iLine++;
-    pMap->cch   = strlen(pMap->szLine);
+    pMap->cch   = (uint32_t)strlen(pMap->szLine);
 
     /* Check out leading white space. */
@@ -1394 +1394 @@
         || psz[cch - 1] != '+'
        )
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "%s:%d: Expected section box: +-----...", pMap->pszMapFile, pMap->iLine);
+    {
+        RTMsgError("%s:%d: Expected section box: +-----...", pMap->pszMapFile, pMap->iLine);
+        return false;
+    }
 
     /* There may be a few lines describing the table notation now, surrounded by blank lines. */
@@ -1480 +1483 @@
         uint32_t iSeg = g_cSegs;
         if (iSeg >= RT_ELEMENTS(g_aSegs))
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "%s:%u: Too many segments", pMap->pszMapFile, pMap->iLine);
+        {
+            RTMsgError("%s:%u: Too many segments", pMap->pszMapFile, pMap->iLine);
+            return false;
+        }
 
         char *psz = pMap->szLine;

trunk/src/VBox/Devices/PC/BIOS-new/Makefile.kmk

@@ -98 +98 @@
 PROGRAMS += MakeDebianBiosAssembly ## TODO this is build program, really. later.
 MakeDebianBiosAssembly_TEMPLATE = VBOXR3EXE
-MakeDebianBiosAssembly_SOURCES = MakeDebianBiosAssembly.cpp
-MakeDebianBiosAssembly_LIBS = \
+MakeDebianBiosAssembly_DEFS     = IN_DIS
+MakeDebianBiosAssembly_SOURCES  = MakeDebianBiosAssembly.cpp
+MakeDebianBiosAssembly_LIBS     = \
         $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) \
         $(LIB_RUNTIME)