Changeset 2968 for trunk

Timestamp:

Feb 13, 2007, 11:59:34 PM (18 years ago)

Author:

bird

Message:

Made tst-3 load.

File:

• trunk/kLdr/kLdrModMachO.c (modified) (6 diffs)

trunk/kLdr/kLdrModMachO.c

@@ -62 +62 @@
     /** The size of the section (in bytes). */
     KLDRSIZE                cb;
+    /** The link address of this section. */
+    KLDRADDR                LinkAddress;
     /** The RVA of this section. */
     KLDRADDR                RVA;
@@ -835 +837 @@
                             pSectExtra->cb = pSect->size;
                             pSectExtra->RVA = pSect->addr;
+                            pSectExtra->LinkAddress = pSect->addr;
                             pSectExtra->offFile = pSect->offset ? pSect->offset : -1;
                             pSectExtra->cFixups = pSect->nreloc;
@@ -1965 +1968 @@
                 case 3: SymAddr = *uFixVirgin.pi64; break;
             }
+            if (Fixup.r.r_pcrel)
+                SymAddr += Fixup.r.r_address;
 
             /* Add symbol / section address. */
@@ -2008 +2013 @@
                     return KLDR_ERR_BAD_FIXUP;
                 pSymSect = &pModMachO->paSections[Fixup.r.r_symbolnum - 1];
+
+                SymAddr -= pSymSect->LinkAddress;
                 SymAddr += NewBaseAddress + pSymSect->RVA;
             }
@@ -2041 +2048 @@
                 case 3: SymAddr = *uFixVirgin.pi64; break;
             }
+            if (Fixup.s.r_pcrel)
+                Value += Fixup.s.r_address;
 
             /* Calc the section number from the r_value and adjust the value. */
             pSymSect = NULL;
-            Value = Fixup.s.r_value - pModMachO->LinkAddress;
+            Value = Fixup.s.r_value;
             for (iSymSect = 0; iSymSect < pModMachO->cSections; iSymSect++)
             {
-                KLDRADDR off = Value - pModMachO->paSections[iSymSect].RVA;
+                KLDRADDR off = Value - pModMachO->paSections[iSymSect].LinkAddress;
                 if (off < pModMachO->paSections[iSymSect].cb)
                 {
@@ -2058 +2067 @@
             if (!pSymSect)
                 return KLDR_ERR_BAD_FIXUP;
-
-            /** @todo this looking up of the r_value section isn't strictly required unless we're going to remove sections from the link. */
-            SymAddr += NewBaseAddress + pSymSect->RVA + (Value - pSymSect->RVA);
-
-            /* adjust for PC relative */
+            Value -= pSymSect->LinkAddress;
+
+            /* Calc the symbol address. */
+            SymAddr += NewBaseAddress + pSymSect->RVA + Value;
             if (Fixup.s.r_pcrel)
                 SymAddr -= Fixup.s.r_address + pFixupSect->RVA + NewBaseAddress;