Changeset 2974 for trunk/kLdr/kLdrModLX.c

Timestamp:

Feb 14, 2007, 11:12:44 AM (18 years ago)

Author:

bird

Message:

off_t -> KLDRFOFF.

File:

• trunk/kLdr/kLdrModLX.c (modified) (15 diffs)

trunk/kLdr/kLdrModLX.c

@@ -70 +70 @@
 
     /** The offset of the LX header. */
-    off_t                   offHdr;
+    KLDRFOFF                offHdr;
     /** Copy of the LX header. */
     struct e32_exe          Hdr;
@@ -116 +116 @@
 static int kldrModLXRelocateBits(PKLDRMOD pMod, void *pvBits, KLDRADDR NewBaseAddress, KLDRADDR OldBaseAddress,
                                  PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
-static int kldrModLXDoCreate(PKLDRRDR pRdr, off_t offNewHdr, PKLDRMODLX *ppModLX);
+static int kldrModLXDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX);
 static const uint8_t *kldrModLXDoNameTableLookupByOrdinal(const uint8_t *pbNameTable, int32_t cbNameTable, uint32_t iOrdinal);
 static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, uint32_t cchSymbol, uint32_t *piSymbol);
@@ -133 +133 @@
 static int kldrModLXDoLoadFixupSection(PKLDRMODLX pModLX);
 static int32_t kldrModLXDoCall(uintptr_t uEntrypoint, uintptr_t uHandle, uint32_t uOp, void *pvReserved);
-static int kldrModLXDoReloc(uint8_t *pbPage, int off, KLDRADDR PageAddress, const struct r32_rlc *prlc, 
+static int kldrModLXDoReloc(uint8_t *pbPage, int off, KLDRADDR PageAddress, const struct r32_rlc *prlc,
                             int iSelector, KLDRADDR uValue, uint32_t fKind);
 
@@ -148 +148 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModLXCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, off_t offNewHdr, PPKLDRMOD ppMod)
+static int kldrModLXCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODLX pModLX;
@@ -173 +173 @@
  * simplify cleanup on failure.
  */
-static int kldrModLXDoCreate(PKLDRRDR pRdr, off_t offNewHdr, PKLDRMODLX *ppModLX)
+static int kldrModLXDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX)
 {
     struct e32_exe Hdr;
@@ -208 +208 @@
 
     /* Some rough sanity checks. */
-    offEnd = kLdrRdrSize(pRdr) >= (off_t)~(uint32_t)16 ? ~(uint32_t)16 : (uint32_t)kLdrRdrSize(pRdr);
+    offEnd = kLdrRdrSize(pRdr) >= (KLDRFOFF)~(uint32_t)16 ? ~(uint32_t)16 : (uint32_t)kLdrRdrSize(pRdr);
     if (    Hdr.e32_itermap > offEnd
         ||  Hdr.e32_datapage > offEnd
@@ -249 +249 @@
         &&  (Hdr.e32_fpagetab < off || Hdr.e32_fpagetab > offEnd))
     {
-        /* 
+        /*
          * wlink mixes the fixup section and the loader section.
          */
@@ -2105 +2105 @@
                         else
                             uValue = pMod->aSegments[iSeg].MapAddress;
-                        if (    (u.prlc->nr_stype & NRALIAS) 
+                        if (    (u.prlc->nr_stype & NRALIAS)
                             ||  (pMod->aSegments[iSeg].fFlags & KLDRSEG_FLAG_16BIT))
                             iSelector = pMod->aSegments[iSeg].Sel16bit;
@@ -2242 +2242 @@
 
                     /* common / simple */
-                    if (    (u.prlc->nr_stype & NRSRCMASK) == NROFF32 
-                        &&  off >= 0 
+                    if (    (u.prlc->nr_stype & NRSRCMASK) == NROFF32
+                        &&  off >= 0
                         &&  off <= OBJPAGELEN - 4)
                         *(uint32_t *)&pbPage[off] = uValue;
-                    else if (    (u.prlc->nr_stype & NRSRCMASK) == NRSOFF32 
-                            &&  off >= 0 
+                    else if (    (u.prlc->nr_stype & NRSRCMASK) == NRSOFF32
+                            &&  off >= 0
                             &&  off <= OBJPAGELEN - 4)
                         *(uint32_t *)&pbPage[off] = uValue - (PageAddress + off);
@@ -2321 +2321 @@
 /**
  * Applies the relocation to one 'source' in a page.
- * 
- * This takes care of the more esotic case while the common cases 
+ *
+ * This takes care of the more esotic case while the common cases
  * are dealt with seperately.
  *
@@ -2331 +2331 @@
  * @param   fKind       The target kind.
  */
-static int kldrModLXDoReloc(uint8_t *pbPage, int off, KLDRADDR PageAddress, const struct r32_rlc *prlc, 
+static int kldrModLXDoReloc(uint8_t *pbPage, int off, KLDRADDR PageAddress, const struct r32_rlc *prlc,
                             int iSelector, KLDRADDR uValue, uint32_t fKind)
 {
-    static const uint8_t s_acb[16] = 
+    static const uint8_t s_acb[16] =
     {
         1, /* 0: NRSBYT */
@@ -2340 +2340 @@
         2, /* 2: NRSSEG - selector */
         4, /* 3: NRSPTR - 16:16 */
-        0, 
+        0,
         2, /* 5: NRSOFF - 16-bit offset */
         6, /* 6: NRPTR48 - 16:32 */
@@ -2348 +2348 @@
     };
 #pragma pack(1) /* just to be sure */
-    union 
+    union
     {
         uint8_t     ab[6];
@@ -2354 +2354 @@
         uint16_t    off16;
         uint8_t     off8;
-        struct 
+        struct
         {
             uint16_t off;
             uint16_t Sel;
         }           Far16;
-        struct 
+        struct
         {
             uint32_t off;
@@ -2375 +2375 @@
     switch (prlc->nr_stype & NRSRCMASK)
     {
-        case NRSBYT:        
+        case NRSBYT:
             uData.off8 = (uint8_t)uValue;
             cb = 1;