Changeset 3569 for trunk/kStuff/kLdr/kLdrModLX.c

Timestamp:

Aug 31, 2007, 4:16:27 AM (18 years ago)

Author:

bird

Message:

Dropped kLdrBase.h

File:

• trunk/kStuff/kLdr/kLdrModLX.c (modified) (5 diffs)

trunk/kStuff/kLdr/kLdrModLX.c

@@ -268 +268 @@
      */
     cchFilename = kLdrHlpStrLen(kLdrRdrName(pRdr));
-    cb = KLDR_ALIGN_Z(sizeof(KLDRMODLX), 8)
-       + KLDR_ALIGN_Z(KLDR_OFFSETOF(KLDRMOD, aSegments[Hdr.e32_objcnt + 1]), 8)
-       + KLDR_ALIGN_Z(cchFilename + 1, 8)
+    cb = K_ALIGN_Z(sizeof(KLDRMODLX), 8)
+       + K_ALIGN_Z(K_OFFSETOF(KLDRMOD, aSegments[Hdr.e32_objcnt + 1]), 8)
+       + K_ALIGN_Z(cchFilename + 1, 8)
        + Hdr.e32_ldrsize + 2; /* +2 for two extra zeros. */
     pModLX = (PKLDRMODLX)kldrHlpAlloc(cb);
@@ -278 +278 @@
 
     /* KLDRMOD */
-    pMod = (PKLDRMOD)((KU8 *)pModLX + KLDR_ALIGN_Z(sizeof(KLDRMODLX), 8));
+    pMod = (PKLDRMOD)((KU8 *)pModLX + K_ALIGN_Z(sizeof(KLDRMODLX), 8));
     pMod->pvData = pModLX;
     pMod->pRdr = pRdr;
@@ -284 +284 @@
     pMod->cSegments = Hdr.e32_objcnt;
     pMod->cchFilename = cchFilename;
-    pMod->pszFilename = (char *)KLDR_ALIGN_P(&pMod->aSegments[pMod->cSegments], 8);
+    pMod->pszFilename = (char *)K_ALIGN_P(&pMod->aSegments[pMod->cSegments], 8);
     kLdrHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
     pMod->pszName = NULL; /* finalized further down */
@@ -337 +337 @@
     pModLX->Hdr = Hdr;
 
-    pModLX->pbLoaderSection = KLDR_ALIGN_P(pMod->pszFilename + pMod->cchFilename + 1, 16);
+    pModLX->pbLoaderSection = K_ALIGN_P(pMod->pszFilename + pMod->cchFilename + 1, 16);
     pModLX->pbLoaderSectionLast = pModLX->pbLoaderSection + pModLX->Hdr.e32_ldrsize - 1;
     pModLX->paObjs = NULL;
@@ -459 +459 @@
             ||  (pModLX->paObjs[i].o32_flags & OBJRSRC)
             ||  (pModLX->paObjs[i + 1].o32_flags & OBJRSRC))
-            pMod->aSegments[i].cbMapped = KLDR_ALIGN_Z(pModLX->paObjs[i].o32_size, OBJPAGELEN);
+            pMod->aSegments[i].cbMapped = K_ALIGN_Z(pModLX->paObjs[i].o32_size, OBJPAGELEN);
         else
             pMod->aSegments[i].cbMapped = pModLX->paObjs[i + 1].o32_base - pModLX->paObjs[i].o32_base;