Changeset 2828

Timestamp:

Oct 22, 2006, 8:21:04 PM (19 years ago)

Author:

bird

Message:

Lx header. renaming some helpers.

Location:

trunk/kLdr

Files:

• kLdrDy.c (modified) (1 diff)
• kLdrHlp.c (modified) (3 diffs)
• kLdrHlp.h (modified) (3 diffs)
• kLdrMod.c (modified) (1 diff)
• kLdrModLX.h (added)
• kLdrRdrFile.c (modified) (3 diffs)

trunk/kLdr/kLdrDy.c

@@ -78 +78 @@
      */
     kLdrFlags = pArgs->fFlags;
-    kLdrMemCopy(kLdrLibraryPath, pArgs->szLibPath, KLDR_MIN(sizeof(pArgs->szLibPath), sizeof(kLdrLibraryPath)));
+    kLdrHlpMemCopy(kLdrLibraryPath, pArgs->szLibPath, KLDR_MIN(sizeof(pArgs->szLibPath), sizeof(kLdrLibraryPath)));
     int rc = kldrInit();
     if (rc)

trunk/kLdr/kLdrHlp.c

@@ -61 +61 @@
     if (!rc)
     {
-        size_t cch = strlen(pszValue);
+        size_t cch = kLdrHlpStrLen(pszValue);
         if (pszVal)
         {
             if (*pcchVal > cch)
             {
-                memcpy(pszVal, pszValue, cch + 1);
+                kLdrHlpMemCopy(pszVal, pszValue, cch + 1);
                 *pcchVal = cch;
             }
             else if (*pcchVal)
             {
-                memcpy(pszVal, pszValue, *pcchVal);
+                kLdrHlpMemCopy(pszVal, pszValue, *pcchVal);
                 pszVal[*pcchVal - 1] = '\0';
                 rc = ERROR_BUFFER_OVERFLOW;
@@ -167 +167 @@
 
     DosWrite((HFILE)2, s_szMsg1, sizeof(s_szMsg1) - 1, &cbWritten);
-    DosWrite((HFILE)2, pszExpr, kLdrStrLen(pszExpr), &cbWritten);
+    DosWrite((HFILE)2, pszExpr, kLdrHlpStrLen(pszExpr), &cbWritten);
     DosWrite((HFILE)2, s_szMsg2, sizeof(s_szMsg2) - 1, &cbWritten);
-    DosWrite((HFILE)2, pszFile, kLdrStrLen(pszFile), &cbWritten);
+    DosWrite((HFILE)2, pszFile, kLdrHlpStrLen(pszFile), &cbWritten);
     DosWrite((HFILE)2, "(", sizeof("(") - 1, &cbWritten);
     int2dec(szLine, iLine);
-    DosWrite((HFILE)2, szLine, kLdrStrLen(szLine), &cbWritten);
+    DosWrite((HFILE)2, szLine, kLdrHlpStrLen(szLine), &cbWritten);
     DosWrite((HFILE)2, ") ", sizeof(") ") - 1, &cbWritten);
-    DosWrite((HFILE)2, pszFunction, kLdrStrLen(pszFunction), &cbWritten);
+    DosWrite((HFILE)2, pszFunction, kLdrHlpStrLen(pszFunction), &cbWritten);
     DosWrite((HFILE)2, s_szMsg3, sizeof(s_szMsg3) - 1, &cbWritten);
 
@@ -186 +186 @@
 
     WriteFile(hStdErr, s_szMsg1, sizeof(s_szMsg1) - 1, &cbWritten, NULL);
-    WriteFile(hStdErr, pszExpr, kLdrStrLen(pszExpr), &cbWritten, NULL);
+    WriteFile(hStdErr, pszExpr, kLdrHlpStrLen(pszExpr), &cbWritten, NULL);
     WriteFile(hStdErr, s_szMsg2, sizeof(s_szMsg2) - 1, &cbWritten, NULL);
-    WriteFile(hStdErr, pszFile, kLdrStrLen(pszFile), &cbWritten, NULL);
+    WriteFile(hStdErr, pszFile, kLdrHlpStrLen(pszFile), &cbWritten, NULL);
     WriteFile(hStdErr, "(", sizeof("(") - 1, &cbWritten, NULL);
     int2dec(szLine, iLine);
-    WriteFile(hStdErr, szLine, kLdrStrLen(szLine), &cbWritten, NULL);
+    WriteFile(hStdErr, szLine, kLdrHlpStrLen(szLine), &cbWritten, NULL);
     WriteFile(hStdErr, ") ", sizeof(") ") - 1, &cbWritten, NULL);
-    WriteFile(hStdErr, pszFunction, kLdrStrLen(pszFunction), &cbWritten, NULL);
+    WriteFile(hStdErr, pszFunction, kLdrHlpStrLen(pszFunction), &cbWritten, NULL);
     WriteFile(hStdErr, s_szMsg3, sizeof(s_szMsg3) - 1, &cbWritten, NULL);
 

trunk/kLdr/kLdrHlp.h

@@ -63 +63 @@
 #ifdef __GNUC__
 /** memcmp */
-# define kLdrMemComp(a,b,c) __builtin_memcmp(a,b,c)
+# define kLdrHlpMemComp(a,b,c) __builtin_memcmp(a,b,c)
 /** memcpy */
-# define kLdrMemCopy(a,b,c) __builtin_memcpy(a,b,c)
+# define kLdrHlpMemCopy(a,b,c) __builtin_memcpy(a,b,c)
 /** memset */
-# define kLdrMemSet(a,b,c)  __builtin_memset(a,b,c)
+# define kLdrHlpMemSet(a,b,c)  __builtin_memset(a,b,c)
 /** strlen */
-# define kLdrStrLen(a)      __builtin_strlen(a)
+# define kLdrHlpStrLen(a)      __builtin_strlen(a)
 /** alloca */
-# define kLdrAllocA(a)      __builtin_alloca(a)
+# define kLdrHlpAllocA(a)      __builtin_alloca(a)
 /** int3 */
 # define kldrHlpBreakpoint() do { __asm__ __volatile__ ("int3\n\tnop"); } while (0)
@@ -85 +85 @@
 # pragma intrinsic(memcmp, memcpy, memset, strlen, __debugbreak)
 /** memcmp */
-# define kLdrMemComp(a,b,c) memcmp(a,b,c)
+# define kLdrHlpMemComp(a,b,c) memcmp(a,b,c)
 /** memcpy */
-# define kLdrMemCopy(a,b,c) memcpy(a,b,c)
+# define kLdrHlpMemCopy(a,b,c) memcpy(a,b,c)
 /** memset */
-# define kLdrMemSet(a,b,c)  memset(a,b,c)
+# define kLdrHlpMemSet(a,b,c)  memset(a,b,c)
 /** strlen */
-# define kLdrStrLen(a)      strlen(a)
+# define kLdrHlpStrLen(a)      strlen(a)
 /** alloca */
-# define kLdrAllocA(a)      alloca(a)
+# define kLdrHlpAllocA(a)      alloca(a)
 /** int3 */
 # define kldrHlpBreakpoint() __debugbreak()
@@ -102 +102 @@
 #endif
 
-#if !defined(kLdrMemComp) \
- || !defined(kLdrMemCopy) \
- || !defined(kLdrMemSet) \
- || !defined(kLdrStrLen) \
- || !defined(kLdrAllocA) \
+#if !defined(kLdrHlpMemComp) \
+ || !defined(kLdrHlpMemCopy) \
+ || !defined(kLdrHlpMemSet) \
+ || !defined(kLdrHlpStrLen) \
+ || !defined(kLdrHlpAllocA) \
  || !defined(kldrHlpBreakpoint)
 # error "Needs porting to your compiler."

trunk/kLdr/kLdrMod.c

@@ -35 +35 @@
 #if 1 /* testing headers */
 # include "kLdrModPE.h"
-//# include "kLdrModLX.h"
+# include "kLdrModLX.h"
 # include "kLdrModELF32.h"
 # include "kLdrModELF64.h"

trunk/kLdr/kLdrRdrFile.c

@@ -352 +352 @@
     if ((uintptr_t)pszFilename >= 0x20000000)
     {
-        char *psz = (char *)kLdrAllocA(cchFilename + 1);
-        kLdrMemCopy(psz, pszFilename, cchFilename + 1);
+        char *psz = (char *)kLdrHlpAllocA(cchFilename + 1);
+        kLdrHlpMemCopy(psz, pszFilename, cchFilename + 1);
         pszFilename = psz;
     }
@@ -404 +404 @@
      * Allocate the reader instance.
      */
-    cchFilename = kLdrStrLen(pszFilename);
+    cchFilename = kLdrHlpStrLen(pszFilename);
     pRdrFile = (PKLDRRDRFILE)kldrHlpAlloc(sizeof(*pRdrFile) + cchFilename);
     if (!pRdrFile)
@@ -427 +427 @@
     pRdrFile->File = File;
     pRdrFile->off = 0;
-    kLdrMemCopy(&pRdrFile->szFilename[0], pszFilename, cchFilename + 1);
+    kLdrHlpMemCopy(&pRdrFile->szFilename[0], pszFilename, cchFilename + 1);
 
     *ppRdr = &pRdrFile->Core;