vbox的更動 106726 路徑 trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

時間撮記:

2024-10-27 下午09:39:04 (5 月 以前)

作者:

vboxsync

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

165609

訊息:

IPRT/ldrPE.cpp: Adjustments to new IMAGE_RUNTIME_FUNCTION_ENTRY definitions in pecoff.h. jiraref:VBP-1253

檔案:

• trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp (修改) (7 筆差異)

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

@@ -3512 +3512 @@
  * @param   uRva            The RVA of the function we want.
  */
-DECLINLINE(PCIMAGE_RUNTIME_FUNCTION_ENTRY)
-rtldrPE_LookupRuntimeFunctionEntry(PCIMAGE_RUNTIME_FUNCTION_ENTRY paFunctions, size_t iEnd, uint32_t uRva)
+DECLINLINE(PCIMAGE_AMD64_RUNTIME_FUNCTION_ENTRY)
+rtldrPE_LookupRuntimeFunctionEntry_Amd64(PCIMAGE_AMD64_RUNTIME_FUNCTION_ENTRY paFunctions, size_t iEnd, uint32_t uRva)
 {
     size_t iBegin = 0;
@@ -3519 +3519 @@
     {
         size_t const i = iBegin  + (iEnd - iBegin) / 2;
-        PCIMAGE_RUNTIME_FUNCTION_ENTRY pEntry = &paFunctions[i];
+        PCIMAGE_AMD64_RUNTIME_FUNCTION_ENTRY pEntry = &paFunctions[i];
         if (uRva < pEntry->BeginAddress)
             iEnd = i;
@@ -3606 +3606 @@
 
 static int rtldrPE_UnwindFrame_Amd64(PRTLDRMODPE pThis, void const *pvBits, PRTDBGUNWINDSTATE pState, uint32_t uRvaPc,
-                                     PCIMAGE_RUNTIME_FUNCTION_ENTRY pEntry)
+                                     PCIMAGE_AMD64_RUNTIME_FUNCTION_ENTRY pEntry)
 {
     /* Did we find any unwind information? */
@@ -3615 +3615 @@
      * Do the unwinding.
      */
-    IMAGE_RUNTIME_FUNCTION_ENTRY ChainedEntry;
+    IMAGE_AMD64_RUNTIME_FUNCTION_ENTRY ChainedEntry;
     unsigned iFrameReg   = ~0U;
     unsigned offFrameReg = 0;
@@ -3634 +3634 @@
             uint8_t  ab[  RT_OFFSETOF(IMAGE_UNWIND_INFO, aOpcodes)
                         + sizeof(IMAGE_UNWIND_CODE) * 256
-                        + sizeof(IMAGE_RUNTIME_FUNCTION_ENTRY)];
+                        + sizeof(IMAGE_AMD64_RUNTIME_FUNCTION_ENTRY)];
         } uBuf;
         rc = rtldrPEReadPartByRvaInfoBuf(pThis, pvBits, pEntry->UnwindInfoAddress, sizeof(uBuf), &uBuf);
@@ -3869 +3869 @@
         if (!(pInfo->Flags & IMAGE_UNW_FLAGS_CHAININFO))
             break;
-        ChainedEntry = *(PCIMAGE_RUNTIME_FUNCTION_ENTRY)&pInfo->aOpcodes[(cOpcodes + 1) & ~1];
+        ChainedEntry = *(PCIMAGE_AMD64_RUNTIME_FUNCTION_ENTRY)&pInfo->aOpcodes[(cOpcodes + 1) & ~1];
         pEntry = &ChainedEntry;
         AssertReturn(cChainLoops < 32, VERR_DBG_MALFORMED_UNWIND_INFO);
@@ -3949 +3949 @@
         {
             case RTLDRARCH_AMD64:
-                rc = rtldrPE_UnwindFrame_Amd64(pThis, pvBits, pState, uRvaPc,
-                                               rtldrPE_LookupRuntimeFunctionEntry((PCIMAGE_RUNTIME_FUNCTION_ENTRY)pvTable,
-                                                                                  cbTable / sizeof(IMAGE_RUNTIME_FUNCTION_ENTRY),
-                                                                                  (uint32_t)uRvaPc));
+            {
+                PCIMAGE_AMD64_RUNTIME_FUNCTION_ENTRY const pEntry
+                    = rtldrPE_LookupRuntimeFunctionEntry_Amd64((PCIMAGE_AMD64_RUNTIME_FUNCTION_ENTRY)pvTable,
+                                                               cbTable / sizeof(IMAGE_AMD64_RUNTIME_FUNCTION_ENTRY),
+                                                               (uint32_t)uRvaPc);
+                rc = rtldrPE_UnwindFrame_Amd64(pThis, pvBits, pState, uRvaPc, pEntry);
                 break;
+            }
 
             default: