Changeset 16439 in vbox for trunk

Timestamp:

Jan 31, 2009 1:55:36 AM (16 years ago)

Author:

vboxsync

Message:

ldrkStuff: 64-bit darwin changes, better error assertions.

File:

• trunk/src/VBox/Runtime/common/ldr/ldrkStuff.cpp (modified) (10 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrkStuff.cpp

@@ -49 +49 @@
 #include <k/kLdr.h>
 #include <k/kRdrAll.h>
+#include <k/kErr.h>
 #include <k/kErrors.h>
 #include <k/kMagics.h>
@@ -170 +171 @@
         case KLDR_ERR_SYMBOL_NOT_FOUND:                     return VERR_SYMBOL_NOT_FOUND;
         case KLDR_ERR_FORWARDER_SYMBOL:                     return VERR_BAD_EXE_FORMAT;
-        case KLDR_ERR_BAD_FIXUP:                            return VERR_BAD_EXE_FORMAT;
+        case KLDR_ERR_BAD_FIXUP:                            AssertMsgFailedReturn(("KLDR_ERR_BAD_FIXUP\n"), VERR_BAD_EXE_FORMAT);
         case KLDR_ERR_IMPORT_ORDINAL_OUT_OF_BOUNDS:         return VERR_BAD_EXE_FORMAT;
         case KLDR_ERR_NO_DEBUG_INFO:                        return VERR_FILE_NOT_FOUND;
@@ -192 +193 @@
         case KLDR_ERR_NOT_DLL:
         case KLDR_ERR_NOT_EXE:
-            return VERR_GENERAL_FAILURE;
+            AssertMsgFailedReturn(("krc=%d (%#x): %s\n", krc, krc, kErrName(krc)), VERR_GENERAL_FAILURE);
 
 
@@ -203 +204 @@
         case KLDR_ERR_PE_BAD_FIXUP:
         case KLDR_ERR_PE_BAD_IMPORT:
-            return VERR_GENERAL_FAILURE;
+            AssertMsgFailedReturn(("krc=%d (%#x): %s\n", krc, krc, kErrName(krc)), VERR_GENERAL_FAILURE);
 
         case KLDR_ERR_LX_BAD_HEADER:
@@ -217 +218 @@
         case KLDR_ERR_LX_BAD_FORWARDER:
         case KLDR_ERR_LX_NRICHAIN_NOT_SUPPORTED:
-            return VERR_GENERAL_FAILURE;
+            AssertMsgFailedReturn(("krc=%d (%#x): %s\n", krc, krc, kErrName(krc)), VERR_GENERAL_FAILURE);
 
         case KLDR_ERR_MACHO_OTHER_ENDIAN_NOT_SUPPORTED:
@@ -238 +239 @@
         case KLDR_ERR_MACHO_BAD_SYMBOL:
         case KLDR_ERR_MACHO_UNSUPPORTED_FIXUP_TYPE:
-            AssertMsgFailed(("krc=%d (%#x); KLDR_ERR_MACHO_BASE=%d; off=%d\n", krc, krc, KLDR_ERR_MACHO_BASE, krc - KLDR_ERR_MACHO_BASE));
-            return VERR_GENERAL_FAILURE;
+            AssertMsgFailedReturn(("krc=%d (%#x): %s\n", krc, krc, kErrName(krc)), VERR_GENERAL_FAILURE);
 
         default:
             if (RT_FAILURE(krc))
                 return krc;
-            AssertMsgFailed(("krc=%d (%#x)\n", krc, krc));
-            return VERR_NO_TRANSLATION;
+            AssertMsgFailedReturn(("krc=%d (%#x): %s\n", krc, krc, kErrName(krc)), VERR_NO_TRANSLATION);
     }
 }
@@ -501 +500 @@
     }
 
-#if defined(RT_OS_OS2) || (defined(RT_OS_DARWIN) && defined(RT_ARCH_X86))
+#if defined(RT_OS_OS2) || defined(RT_OS_DARWIN)
     /* skip the underscore prefix. */
     if (*pszSymbol == '_')
@@ -568 +567 @@
     }
 
-#if defined(RT_OS_OS2) || (defined(RT_OS_DARWIN) && defined(RT_ARCH_X86))
+#if defined(RT_OS_OS2) || defined(RT_OS_DARWIN)
     /* skip the underscore prefix. */
     if (*pszSymbol == '_')
@@ -605 +604 @@
     KLDRADDR uValue;
 
-#if defined(RT_OS_OS2) || (defined(RT_OS_DARWIN) && defined(RT_ARCH_X86))
+#if defined(RT_OS_OS2) || defined(RT_OS_DARWIN)
     /*
      * Add underscore prefix.
@@ -663 +662 @@
             pNewMod->pMod = pMod;
             *phLdrMod = &pNewMod->Core;
+
+#ifdef LOG_ENABLED
+            Log(("rtldrkLdrOpen: '%s' (%s) %u segments\n",
+                 pMod->pszName, pMod->pszFilename, pMod->cSegments));
+            for (unsigned iSeg = 0; iSeg < pMod->cSegments; iSeg++)
+            {
+                Log(("Segment #%-2u: RVA=%08llx cb=%08llx '%.*s'\n", iSeg,
+                     pMod->aSegments[iSeg].RVA,
+                     pMod->aSegments[iSeg].cb,
+                     pMod->aSegments[iSeg].cchName,
+                     pMod->aSegments[iSeg].pchName));
+            }
+#endif
             return VINF_SUCCESS;
         }