Changeset 85555 in vbox for trunk/src

Timestamp:

Jul 30, 2020 1:11:50 PM (5 years ago)

Author:

vboxsync

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

139623

Message:

SUP: Fix for solaris VBoxDDR0.r0 loading issue (inverted test in the "it's complicated" part of the code). bugref:9801

File:

• trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp (modified) (6 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp

@@ -393 +393 @@
     {
         pArgs->uEndRva = uRvaSeg + cbMapped;
-        Log2(("supLoadModuleCompileSegmentsCB: -> merged\n"));
+        Log2(("supLoadModuleCompileSegmentsCB: -> merged, end %#x\n", pArgs->uEndRva));
         return VINF_SUCCESS;
     }
@@ -420 +420 @@
             {
                 pArgs->uEndRva = uRvaSeg + cbMapped;
-                Log2(("supLoadModuleCompileSegmentsCB: -> merge, %#x common, upgrading prot to %#x\n", cbCommon, pArgs->fProt));
+                Log2(("supLoadModuleCompileSegmentsCB: -> merge, %#x common, upgrading prot to %#x, end %#x\n",
+                      cbCommon, pArgs->fProt, pArgs->uEndRva));
                 return VINF_SUCCESS; /* New segment was smaller than a page. */
             }
@@ -438 +439 @@
                 pArgs->fProt   = fProt;
                 pArgs->uEndRva = uRvaSeg + cbMapped;
-                Log2(("supLoadModuleCompileSegmentsCB: -> upgrade current protection\n"));
+                Log2(("supLoadModuleCompileSegmentsCB: -> upgrade current protection, end %#x\n", pArgs->uEndRva));
                 return VINF_SUCCESS; /* Current segment was smaller than a page. */
             }
@@ -446 +447 @@
         {
             /* Create a new segment for the common page with the combined protection. */
-            Log2(("supLoadModuleCompileSegmentsCB: -> its complicated...\n"));
+            Log2(("supLoadModuleCompileSegmentsCB: -> it's complicated...\n"));
             pArgs->uEndRva &= ~(uint32_t)PAGE_OFFSET_MASK;
             if (pArgs->uEndRva > pArgs->uStartRva)
@@ -466 +467 @@
 
             uint32_t const cbCommon = PAGE_SIZE - (uRvaSeg & PAGE_OFFSET_MASK);
-            if (cbCommon <= cbMapped)
+            if (cbCommon >= cbMapped)
             {
                 fProt |= pArgs->fProt;
@@ -769 +770 @@
             SegArgs.uEndRva = (uint32_t)CalcArgs.cbImage; /* overflow is checked later */
             if (SegArgs.uEndRva > SegArgs.uStartRva)
+            {
+                Log2(("supLoadModule:                  SUP Seg #%u: %#x LB %#x prot %#x\n",
+                      SegArgs.iSegs, SegArgs.uStartRva, SegArgs.uEndRva - SegArgs.uStartRva, SegArgs.fProt));
                 SegArgs.iSegs++;
+            }
 
             const uint32_t offSymTab = RT_ALIGN_32(CalcArgs.cbImage, 8);