Changeset 3585 for trunk/kStuff/kLdr

Timestamp:

Sep 3, 2007, 3:18:26 AM (18 years ago)

Author:

bird

Message:

Cpu / architecture cleanup...

Location:

trunk/kStuff/kLdr

Files:

• Makefile.kmk (modified) (2 diffs)
• kLdrMisc.c (deleted)
• kLdrMod.c (modified) (2 diffs)
• kLdrModLX.c (modified) (1 diff)
• kLdrModMachO.c (modified) (4 diffs)
• kLdrModNative.c (modified) (1 diff)
• kLdrModPE.c (modified) (1 diff)
• tstkLdrMod.c (modified) (2 diffs)

trunk/kStuff/kLdr/Makefile.kmk

@@ -122 +122 @@
         kLdrDyldOS.c \
         kLdrDyLdSem.c \
-        kLdrMisc.c \
         kLdrMod.c \
         kLdrModLX.c \
@@ -137 +136 @@
 kLdr_LIBS += \
         $(PATH_LIB)/kRdrStatic$(SUFF_LIB) \
+        $(PATH_LIB)/kCpuStatic$(SUFF_LIB) \
         $(PATH_LIB)/kHlpBareStatic$(SUFF_LIB) \
         $(PATH_LIB)/kErrStatic$(SUFF_LIB)

trunk/kStuff/kLdr/kLdrMod.c

@@ -31 +31 @@
 #include <k/kLdr.h>
 #include "kLdrInternal.h"
+#include <k/kCpu.h>
 #include <k/kLdrFmts/mz.h>
 #if 1 /* testing headers */
@@ -340 +341 @@
  *                          This can be used by some module interpreters to reduce memory consumption.
  */
-int     kLdrModCanExecuteOn(PKLDRMOD pMod, const void *pvBits, KLDRARCH enmArch, KLDRCPU enmCpu)
+int     kLdrModCanExecuteOn(PKLDRMOD pMod, const void *pvBits, KCPUARCH enmArch, KCPU enmCpu)
 {
     KLDRMOD_VALIDATE(pMod);
     if (pMod->pOps->pfnCanExecuteOn)
         return pMod->pOps->pfnCanExecuteOn(pMod, pvBits, enmArch, enmCpu);
-    return kLdrCompareCpus(pMod->enmArch, pMod->enmCpu, enmArch, enmCpu);
+    return kCpuCompare(pMod->enmArch, pMod->enmCpu, enmArch, enmCpu);
 }
 

trunk/kStuff/kLdr/kLdrModLX.c

@@ -290 +290 @@
     {
         case E32CPU286:
-            pMod->enmCpu = KLDRCPU_I80286;
-            pMod->enmArch = KLDRARCH_X86_16;
+            pMod->enmCpu = KCPU_I80286;
+            pMod->enmArch = KCPUARCH_X86_16;
             break;
         case E32CPU386:
-            pMod->enmCpu = KLDRCPU_I386;
-            pMod->enmArch = KLDRARCH_X86_32;
+            pMod->enmCpu = KCPU_I386;
+            pMod->enmArch = KCPUARCH_X86_32;
             break;
         case E32CPU486:
-            pMod->enmCpu = KLDRCPU_I486;
-            pMod->enmArch = KLDRARCH_X86_32;
+            pMod->enmCpu = KCPU_I486;
+            pMod->enmArch = KCPUARCH_X86_32;
             break;
     }

trunk/kStuff/kLdr/kLdrModMachO.c

@@ -324 +324 @@
     {
         case CPU_TYPE_X86:
-            pMod->enmArch = KLDRARCH_X86_32;
+            pMod->enmArch = KCPUARCH_X86_32;
             pMod->enmEndian = KLDRENDIAN_LITTLE;
             switch (s.Hdr32.cpusubtype)
             {
-                case CPU_SUBTYPE_I386_ALL:          pMod->enmCpu = KLDRCPU_X86_32_BLEND; break;
-                /*case CPU_SUBTYPE_386: ^^           pMod->enmCpu = KLDRCPU_I386; break;*/
-                case CPU_SUBTYPE_486:               pMod->enmCpu = KLDRCPU_I486; break;
-                case CPU_SUBTYPE_486SX:             pMod->enmCpu = KLDRCPU_I486SX; break;
+                case CPU_SUBTYPE_I386_ALL:          pMod->enmCpu = KCPU_X86_32_BLEND; break;
+                /*case CPU_SUBTYPE_386: ^^           pMod->enmCpu = KCPU_I386; break;*/
+                case CPU_SUBTYPE_486:               pMod->enmCpu = KCPU_I486; break;
+                case CPU_SUBTYPE_486SX:             pMod->enmCpu = KCPU_I486SX; break;
                 /*case CPU_SUBTYPE_586: vv */
-                case CPU_SUBTYPE_PENT:              pMod->enmCpu = KLDRCPU_I586; break;
+                case CPU_SUBTYPE_PENT:              pMod->enmCpu = KCPU_I586; break;
                 case CPU_SUBTYPE_PENTPRO:
                 case CPU_SUBTYPE_PENTII_M3:
@@ -341 +341 @@
                 case CPU_SUBTYPE_PENTIUM_3:
                 case CPU_SUBTYPE_PENTIUM_3_M:
-                case CPU_SUBTYPE_PENTIUM_3_XEON:    pMod->enmCpu = KLDRCPU_I686; break;
+                case CPU_SUBTYPE_PENTIUM_3_XEON:    pMod->enmCpu = KCPU_I686; break;
                 case CPU_SUBTYPE_PENTIUM_M:
                 case CPU_SUBTYPE_PENTIUM_4:
                 case CPU_SUBTYPE_PENTIUM_4_M:
                 case CPU_SUBTYPE_XEON:
-                case CPU_SUBTYPE_XEON_MP:           pMod->enmCpu = KLDRCPU_P4; break;
+                case CPU_SUBTYPE_XEON_MP:           pMod->enmCpu = KCPU_P4; break;
                     break;
                 default:
@@ -354 +354 @@
 
         case CPU_TYPE_X86_64:
-            pMod->enmArch = KLDRARCH_AMD64;
+            pMod->enmArch = KCPUARCH_AMD64;
             pMod->enmEndian = KLDRENDIAN_LITTLE;
             switch (s.Hdr32.cpusubtype)
             {
-                case CPU_SUBTYPE_X86_64_ALL:        pMod->enmCpu = KLDRCPU_AMD64_BLEND; break;
+                case CPU_SUBTYPE_X86_64_ALL:        pMod->enmCpu = KCPU_AMD64_BLEND; break;
                 default:
                     return KLDR_ERR_MACHO_UNSUPPORTED_MACHINE;
@@ -670 +670 @@
                       : sizeof(macho_nlist_64_t);
                 if (    u.pSymTab->symoff >= cbFile
-                    ||  (KU64)u.pSymTab->symoff + u.pSymTab->nsyms * cbSym > kRdrSize(pRdr))
+                    ||  (KU64)u.pSymTab->symoff + u.pSymTab->nsyms * cbSym > cbFile)
                     return KLDR_ERR_MACHO_BAD_LOAD_COMMAND;
                 if (    u.pSymTab->stroff >= cbFile

trunk/kStuff/kLdr/kLdrModNative.c

@@ -320 +320 @@
     pMod->cchName = cchFilename - (pMod->pszName - pMod->pszFilename);
 #if defined(__i386__) || defined(__X86__) || defined(_M_IX86)
-    pMod->enmCpu = KLDRCPU_I386;
-    pMod->enmArch = KLDRARCH_X86_32;
+    pMod->enmCpu = KCPU_I386;
+    pMod->enmArch = KCPUARCH_X86_32;
     pMod->enmEndian = KLDRENDIAN_LITTLE;
 #elif defined(__X86_64__) || defined(__x86_64__) || defined(__AMD64__) || defined(_M_IX64)
-    pMod->enmCpu = KLDRCPU_K8;
-    pMod->enmArch = KLDRARCH_AMD64;
+    pMod->enmCpu = KCPU_K8;
+    pMod->enmArch = KCPUARCH_AMD64;
     pMod->enmEndian = KLDRENDIAN_LITTLE;
 #else

trunk/kStuff/kLdr/kLdrModPE.c

@@ -222 +222 @@
     {
         case IMAGE_FILE_MACHINE_I386:
-            pMod->enmCpu = KLDRCPU_I386;
-            pMod->enmArch = KLDRARCH_X86_32;
+            pMod->enmCpu = KCPU_I386;
+            pMod->enmArch = KCPUARCH_X86_32;
             pMod->enmEndian = KLDRENDIAN_LITTLE;
             break;
 
         case IMAGE_FILE_MACHINE_AMD64:
-            pMod->enmCpu = KLDRCPU_K8;
-            pMod->enmArch = KLDRARCH_AMD64;
+            pMod->enmCpu = KCPU_K8;
+            pMod->enmArch = KCPUARCH_AMD64;
             pMod->enmEndian = KLDRENDIAN_LITTLE;
             break;

trunk/kStuff/kLdr/tstkLdrMod.c

@@ -385 +385 @@
 
 
-/*int     kLdrModCanExecuteOn(PKLDRMOD pMod, const void *pvBits, KLDRARCH enmArch, KLDRCPU enmCpu);
+/*int     kLdrModCanExecuteOn(PKLDRMOD pMod, const void *pvBits, KCPUARCH enmArch, KCPU enmCpu);
 */
 
@@ -422 +422 @@
     if (pMod->enmType >= KLDRTYPE_END || pMod->enmType <= KLDRTYPE_INVALID)
         return Failure("Bad enmType: %d", pMod->enmType);
-    if (pMod->enmArch >= KLDRARCH_END || pMod->enmArch <= KLDRARCH_INVALID)
+    if (!K_ARCH_IS_VALID(pMod->enmArch))
         return Failure("Bad enmArch");
-    if (pMod->enmCpu >= KLDRCPU_END || pMod->enmCpu <= KLDRCPU_INVALID)
+    if (pMod->enmCpu >= KCPU_END || pMod->enmCpu <= KCPU_INVALID)
         return Failure("Bad enmCpu");
     if (pMod->enmEndian >= KLDRENDIAN_END || pMod->enmEndian <= KLDRENDIAN_INVALID)