Changeset 2976

Timestamp:

Feb 15, 2007, 4:30:48 AM (18 years ago)

Author:

bird

Message:

More fixup bugs.

File:

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

trunk/kLdr/kLdrModMachO.c

@@ -1961 +1961 @@
              * Calc the symbol value.
              */
-            /* The addend is stored in the code. */
-            /** @todo Deal with unaligned accesses on non x86 platforms. */
+            /* Calc the linked symbol address / addend. */
             switch (Fixup.r.r_length)
             {
+                /** @todo Deal with unaligned accesses on non x86 platforms. */
                 case 0: SymAddr = *uFixVirgin.pi8; break;
                 case 1: SymAddr = *uFixVirgin.pi16; break;
@@ -1971 +1971 @@
             }
             if (Fixup.r.r_pcrel)
-                SymAddr += Fixup.r.r_address;
+                SymAddr += Fixup.r.r_address + pFixupSect->LinkAddress;
 
             /* Add symbol / section address. */
@@ -1993 +1993 @@
                         pSymSect = &pModMachO->paSections[pSym->n_sect - 1];
 
-                        SymAddr += pSym->n_value - pModMachO->LinkAddress + pSymSect->RVA;
+                        SymAddr += pSym->n_value - pSymSect->LinkAddress + pSymSect->RVA + NewBaseAddress;
                         break;
                     }
@@ -2017 +2017 @@
 
                 SymAddr -= pSymSect->LinkAddress;
-                SymAddr += NewBaseAddress + pSymSect->RVA;
+                SymAddr += pSymSect->RVA + NewBaseAddress;
             }
 
@@ -2055 +2055 @@
             SymAddr -= Value;                   /* (-> addend only) */
 
-            /* Calc the section number from the r_value and adjust the value in case the section moved. */
+            /* Find the section number from the r_value. */
             pSymSect = NULL;
             for (iSymSect = 0; iSymSect < pModMachO->cSections; iSymSect++)
@@ -2070 +2070 @@
             if (!pSymSect)
                 return KLDR_ERR_BAD_FIXUP;
-            Value -= pSymSect->LinkAddress;
 
             /* Calc the symbol address. */
-            SymAddr += NewBaseAddress + pSymSect->RVA + Value;
+            SymAddr += Value - pSymSect->LinkAddress + pSymSect->RVA + NewBaseAddress;
             if (Fixup.s.r_pcrel)
                 SymAddr -= Fixup.s.r_address + pFixupSect->RVA + NewBaseAddress;