Changeset 3585 for trunk/kStuff/kLdr/kLdrModMachO.c

Timestamp:

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

Author:

bird

Message:

Cpu / architecture cleanup...

File:

• trunk/kStuff/kLdr/kLdrModMachO.c (modified) (4 diffs)

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