Changeset 114 in kStuff for trunk/kLdr/kLdrModLX.c

Timestamp:

Oct 28, 2018 1:36:48 PM (6 years ago)

Author:

bird

Message:

kLdrModLX.c: Some fixes.

File:

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

trunk/kLdr/kLdrModLX.c

@@ -193 +193 @@
     KSIZE cb;
     KSIZE cchFilename;
+    KSIZE offLdrStuff;
     KU32 off, offEnd;
     KU32 i;
@@ -285 +286 @@
     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. */
+       + K_ALIGN_Z(cchFilename + 1, 8);
+    offLdrStuff = cb;
+    cb += Hdr.e32_ldrsize + 2; /* +2 for two extra zeros. */
     pModLX = (PKLDRMODLX)kHlpAlloc(cb);
     if (!pModLX)
@@ -353 +355 @@
     kHlpMemCopy(&pModLX->Hdr, &Hdr, sizeof(Hdr));
 
-    pModLX->pbLoaderSection = K_ALIGN_P(pMod->pszFilename + pMod->cchFilename + 1, 16);
+    pModLX->pbLoaderSection = (KU8 *)pModLX + offLdrStuff;
     pModLX->pbLoaderSectionLast = pModLX->pbLoaderSection + pModLX->Hdr.e32_ldrsize - 1;
     pModLX->paObjs = NULL;