]> granicus.if.org Git - file/commitdiff
Patch from Guy Harris, fixing a typo in the name, masks, and unhandled archs
authorChristos Zoulas <christos@zoulas.com>
Fri, 4 Jan 2013 21:46:59 +0000 (21:46 +0000)
committerChristos Zoulas <christos@zoulas.com>
Fri, 4 Jan 2013 21:46:59 +0000 (21:46 +0000)
magic/Magdir/mach

index 071c863dd8acdc234575109e39aac40abaacf8f1..503b85d8bb61500a56ad20274ff1168f595ef583 100644 (file)
 
 #------------------------------------------------------------
-# $File: mach,v 1.11 2012/10/31 16:48:13 christos Exp $
+# $File: mach,v 1.12 2012/11/01 04:26:40 christos Exp $
 # Mach has two magic numbers, 0xcafebabe and 0xfeedface.
 # Unfortunately the first, cafebabe, is shared with
 # Java ByteCode, so they are both handled in the file "cafebabe".
 # The "feedface" ones are handled herein.
 #------------------------------------------------------------
 
-0      name            mach-o-bed
+0      name            mach-o-be
 >0     byte            0xcf            64-bit
 >4     belong          <0
 >>4    belong          x               architecture=%ld
 >4     belong          1
->>8    belong          0               vax
->>8    belong          1               vax11/780
->>8    belong          2               vax11/785
->>8    belong          3               vax11/750
->>8    belong          4               vax11/730
->>8    belong          5               uvaxI
->>8    belong          6               uvaxII
->>8    belong          7               vax8200
->>8    belong          8               vax8500
->>8    belong          9               vax8600
->>8    belong          10              vax8650
->>8    belong          11              vax8800
->>8    belong          12              uvaxIII
+>>8    belong&0x00ffffff       0               vax
+>>8    belong&0x00ffffff       1               vax11/780
+>>8    belong&0x00ffffff       2               vax11/785
+>>8    belong&0x00ffffff       3               vax11/750
+>>8    belong&0x00ffffff       4               vax11/730
+>>8    belong&0x00ffffff       5               uvaxI
+>>8    belong&0x00ffffff       6               uvaxII
+>>8    belong&0x00ffffff       7               vax8200
+>>8    belong&0x00ffffff       8               vax8500
+>>8    belong&0x00ffffff       9               vax8600
+>>8    belong&0x00ffffff       10              vax8650
+>>8    belong&0x00ffffff       11              vax8800
+>>8    belong&0x00ffffff       12              uvaxIII
+>>8    belong&0x00ffffff       >12             vax subarchitecture=%ld
 >4     belong          2               romp
 >4     belong          3               architecture=3
 >4     belong          4               ns32032
 >4     belong          5               ns32332
 >4     belong          6               m68k
 >4     belong          7
->>8    belong          3               i386
->>8    belong          4               i486
->>8    belong          132             i486sx
->>8    belong          5               i586
->>8    belong          8               pentium_3
->>8    belong          9               pentiumM
->>8    belong          10              pentiumIV
->>8    belong          11              itanium
->>8    belong          12              xeon
->>8    belong          14              pentiumIV_M
->>8    belong          15              itanium2
->>8    belong          21              pentiumpro
->>8    belong          23              pentiumIII
->>8    belong          24              pentium_3_M
->>8    belong          25              pentiumV
->>8    belong          26              xeon_mp
->>8    belong          40              pentium_3_xeon
->>8    belong          113             celeron
->>8    belong          119             celeron_mobile
+>>8    belong&0x0000000f       3               i386
+>>8    belong&0x0000000f       4               i486
+>>>8   belong&0x00fffff0       0
+>>>8   belong&0x00fffff0       0x80            \bsx
+>>8    belong&0x0000000f       5               i586
+>>8    belong&0x0000000f       6
+>>>8   belong&0x00fffff0       0               p6
+>>>8   belong&0x00fffff0       1               pentium_pro
+>>>8   belong&0x00fffff0       >1              pentium_2_m%ld
+>>8    belong&0x0000000f       7               celeron
+>>>8   belong&0x00fffff0       0               _m%ld
+>>>8   belong&0x00fffff0       1               _m%ld
+>>>8   belong&0x00fffff0       2               _m%ld
+>>>8   belong&0x00fffff0       3               _m%ld
+>>>8   belong&0x00fffff0       4               _m%ld
+>>>8   belong&0x00fffff0       5               _m%ld
+>>>8   belong&0x00fffff0       6
+>>>8   belong&0x00fffff0       7               _mobile
+>>>8   belong&0x00fffff0       >7              _m%ld
+>>8    belong&0x0000000f       8               pentium_3
+>>>8   belong&0x00fffff0       0
+>>>8   belong&0x00fffff0       1               _m
+>>>8   belong&0x00fffff0       2               _xeon
+>>>8   belong&0x00fffff0       >2              _m%ld
+>>8    belong&0x0000000f       9               pentiumM
+>>>8   belong&0x00fffff0       0
+>>>8   belong&0x00fffff0       >0              _m%ld
+>>8    belong&0x0000000f       10              pentium_4
+>>>8   belong&0x00fffff0       0
+>>>8   belong&0x00fffff0       1               _m
+>>>8   belong&0x00fffff0       >1              _m%ld
+>>8    belong&0x0000000f       11              itanium
+>>>8   belong&0x00fffff0       0
+>>>8   belong&0x00fffff0       1               _2
+>>>8   belong&0x00fffff0       >1              _m%ld
+>>8    belong&0x0000000f       12              xeon
+>>>8   belong&0x00fffff0       0
+>>>8   belong&0x00fffff0       1               _mp
+>>>8   belong&0x00fffff0       >1              _m%ld
+>>8    belong&0x0000000f       >12             ia32 family=%ld
+>>>8   belong&0x00fffff0       0
+>>>8   belong&0x00fffff0       >0              model=%ld
 >4     belong          8               mips
->>8    belong          1               R2300
->>8    belong          2               R2600
->>8    belong          3               R2800
->>8    belong          4               R2000a
->>8    belong          5               R2000
->>8    belong          6               R3000a
->>8    belong          7               R3000
+>>8    belong&0x00ffffff       1               R2300
+>>8    belong&0x00ffffff       2               R2600
+>>8    belong&0x00ffffff       3               R2800
+>>8    belong&0x00ffffff       4               R2000a
+>>8    belong&0x00ffffff       5               R2000
+>>8    belong&0x00ffffff       6               R3000a
+>>8    belong&0x00ffffff       7               R3000
+>>8    belong&0x00ffffff       >7              subarchitecture=%ld
 >4     belong          9               ns32532
 >4     belong          10              mc98000
 >4     belong          11              hppa
->>8    belong          0               7100
->>8    belong          1               7100LC
->4     belong          12
->>8    belong          0               arm
->>8    belong          1               arm_v4t
->>8    belong          2               arm_v6
->>8    belong          3               arm_v5tej
->>8    belong          4               arm_xscale
->>8    belong          5               arm_v7
->>8    belong          6               arm_v7f
->>8    belong          7               arm_v7k
+>>8    belong&0x00ffffff       0               7100
+>>8    belong&0x00ffffff       1               7100LC
+>>8    belong&0x00ffffff       >1              subarchitecture=%ld
+>4     belong          12              arm
+>>8    belong&0x00ffffff       0
+>>8    belong&0x00ffffff       1               subarchitecture=%ld
+>>8    belong&0x00ffffff       2               subarchitecture=%ld
+>>8    belong&0x00ffffff       3               subarchitecture=%ld
+>>8    belong&0x00ffffff       4               subarchitecture=%ld
+>>8    belong&0x00ffffff       5               _v4t
+>>8    belong&0x00ffffff       6               _v6
+>>8    belong&0x00ffffff       7               _v5tej
+>>8    belong&0x00ffffff       8               _xscale
+>>8    belong&0x00ffffff       9               _v7
+>>8    belong&0x00ffffff       10              _v7f
+>>8    belong&0x00ffffff       11              subarchitecture=%ld
+>>8    belong&0x00ffffff       12              _v7k
+>>8    belong&0x00ffffff       >12             subarchitecture=%ld
 >4     belong          13
->>8    belong          0               mc88000
->>8    belong          1               mc88100
->>8    belong          2               mc88110
+>>8    belong&0x00ffffff       0               mc88000
+>>8    belong&0x00ffffff       1               mc88100
+>>8    belong&0x00ffffff       2               mc88110
+>>8    belong&0x00ffffff       >2              mc88000 subarchitecture=%ld
 >4     belong          14              sparc
 >4     belong          15              i860g
 >4     belong          16              alpha
 >4     belong          17              rs6000
->4     belong          18
->>8    belong          0               ppc
->>8    belong          1               ppc_601
->>8    belong          2               ppc_602
->>8    belong          3               ppc_603
->>8    belong          4               ppc_603e
->>8    belong          5               ppc_603ev
->>8    belong          6               ppc_604
->>8    belong          7               ppc_604e
->>8    belong          8               ppc_620
->>8    belong          9               ppc_650
->>8    belong          10              ppc_7400
->>8    belong          11              ppc_7450
->>8    belong          100             ppc_970
->4     belong          16777223
->>8    belong          3               x86_64
->>8    belong          4               x86_64_arch1
->4     belong          16777234
->>8    belong          0               ppc64
->>8    belong          1               ppc64_601
->>8    belong          2               ppc64_602
->>8    belong          3               ppc64_603
->>8    belong          4               ppc64_603e
->>8    belong          5               ppc64_603ev
->>8    belong          6               ppc64_604
->>8    belong          7               ppc64_604e
->>8    belong          8               ppc64_620
->>8    belong          9               ppc64_650
->>8    belong          10              ppc64_7400
->>8    belong          11              ppc64_7450
->>8    belong          100             ppc64_970
+>4     belong          18              ppc
+>>8    belong&0x00ffffff       0
+>>8    belong&0x00ffffff       1               \b_601
+>>8    belong&0x00ffffff       2               \b_602
+>>8    belong&0x00ffffff       3               \b_603
+>>8    belong&0x00ffffff       4               \b_603e
+>>8    belong&0x00ffffff       5               \b_603ev
+>>8    belong&0x00ffffff       6               \b_604
+>>8    belong&0x00ffffff       7               \b_604e
+>>8    belong&0x00ffffff       8               \b_620
+>>8    belong&0x00ffffff       9               \b_650
+>>8    belong&0x00ffffff       10              \b_7400
+>>8    belong&0x00ffffff       11              \b_7450
+>>8    belong&0x00ffffff       100             \b_970
+>>8    belong&0x00ffffff       >100            subarchitecture=%ld
+>4     belong          16777223        x86_64
+>>8    belong&0x00ffffff       0               subarchitecture=%ld
+>>8    belong&0x00ffffff       1               subarchitecture=%ld
+>>8    belong&0x00ffffff       2               subarchitecture=%ld
+>>8    belong&0x00ffffff       3
+>>8    belong&0x00ffffff       4               \b_arch1
+>>8    belong&0x00ffffff       >4              subarchitecture=%ld
+>4     belong          16777234        ppc64
+>>8    belong&0x00ffffff       0
+>>8    belong&0x00ffffff       1               \b_601
+>>8    belong&0x00ffffff       2               \b_602
+>>8    belong&0x00ffffff       3               \b_603
+>>8    belong&0x00ffffff       4               \b_603e
+>>8    belong&0x00ffffff       5               \b_603ev
+>>8    belong&0x00ffffff       6               \b_604
+>>8    belong&0x00ffffff       7               \b_604e
+>>8    belong&0x00ffffff       8               \b_620
+>>8    belong&0x00ffffff       9               \b_650
+>>8    belong&0x00ffffff       10              \b_7400
+>>8    belong&0x00ffffff       11              \b_7450
+>>8    belong&0x00ffffff       100             \b_970
+>>8    belong&0x00ffffff       >100            subarchitecture=%ld
 >4     belong          >16777234
 >>4    belong          x               architecture=%ld
 >12    belong          1               object
 >12    belong          7               dynamic linker
 >12    belong          8               bundle
 >12    belong          9               dynamically linked shared library stub
->12    belong          >9
+>12    belong          10              dSYM companion file
+>12    belong          11              kext bundle
+>12    belong          >11
 >>12   belong          x               filetype=%ld
 
 #