]> granicus.if.org Git - file/commitdiff
better printout for mach-o, avoid dup.
authorChristos Zoulas <christos@zoulas.com>
Wed, 31 Oct 2012 16:32:01 +0000 (16:32 +0000)
committerChristos Zoulas <christos@zoulas.com>
Wed, 31 Oct 2012 16:32:01 +0000 (16:32 +0000)
magic/Magdir/cafebabe
magic/Magdir/mach

index d924f39633965fdc814b09da4dc14404845a3eba..4fd0612a2de2eb06d77b5f7db7895300fa81b6d1 100644 (file)
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: cafebabe,v 1.8 2009/09/19 16:28:08 christos Exp $
+# $File: cafebabe,v 1.9 2012/10/30 23:14:18 christos Exp $
 # Cafe Babes unite!
 #
 # Since Java bytecode and Mach-O fat-files have the same magic number, the test
 ### MACH-O START ###
 
 # 16777216 = 0x01000000
-0      name            mach-o          \b 
->0     belong          0xffffffff      Any
->0     belong          1               Vax
->0     belong          6               MC680x0
->0     belong          7               I386
->0     belong          8               MIPS
->0     belong          10              MC98000
->0     belong          11              HPPA
->0     belong          12              ARM
->0     belong          13              MC88000
->0     belong          14              SPARC
->0     belong          15              I860
->0     belong          16              ALPHA
->0     belong          17              POWERPC
->0     belong          16777223        X86_64
->0     belong          16777233        POWERPC64
+0      name            mach-o          \b 
+>0     belong          0xffffffff      \bAny
+>0     belong          1               \bVax
+>0     belong          6               \bMC680x0
+>0     belong          7               \bI386
+>0     belong          8               \bMIPS
+>0     belong          10              \bMC98000
+>0     belong          11              \bHPPA
+>0     belong          12              \bARM
+>0     belong          13              \bMC88000
+>0     belong          14              \bSPARC
+>0     belong          15              \bI860
+>0     belong          16              \bALPHA
+>0     belong          17              \bPOWERPC
+>0     belong          16777223        \bX86_64
+>0     belong          16777233        \bPOWERPC64
 >&(8.L)        indirect                        : 
-
-# Mach object (BE)
-0      belong          0xfeedface      [contains: 
->4     belong          6
->>8    belong          1               mc68030
->>8    belong          2               mc68040
->>8    belong          3               mc68030_only
->>8    belong          3               x86_64
->>8    belong          4               x86_64_arch1
->>12   belong          1               object
->>12   belong          2               executable
->>12   belong          3               fvmlib
->>12   belong          4               core
->>12   belong          5               preload
->>12   belong          6               dylib
->>12   belong          7               dylinker
->>12   belong          8               bundle
->0     belong          x               \b]
-
-# Mach object (LE32)
-0      lelong          0xfeedface      [contains: 
->0     use             macho-le
-
-# Mach object (LE64)
-0      lelong          0xfeedfacf      [contains:
->0     use             macho-le
-
-0      name            macho-le
->4     lelong          1
->>8    lelong          0               vax
->>8    lelong          1               vax11/780
->>8    lelong          2               vax11/785
->>8    lelong          3               vax11/750
->>8    lelong          4               vax11/730
->>8    lelong          5               uvaxI
->>8    lelong          6               uvaxII
->>8    lelong          7               vax8200
->>8    lelong          8               vax8500
->>8    lelong          9               vax8600
->>8    lelong          10              vax8650
->>8    lelong          11              vax8800
->>8    lelong          12              uvaxIII
->4     lelong          7
->>8    lelong          3               i386
->>8    lelong          4               i486
->>8    lelong          132             i486sx
->>8    lelong          5               i586
->>8    lelong          8               pentium_3
->>8    lelong          9               pentiumM
->>8    lelong          10              pentiumIV
->>8    lelong          11              itanium
->>8    lelong          12              xeon
->>8    lelong          14              pentiumIV_M
->>8    lelong          15              itanium2
->>8    lelong          21              pentiumpro
->>8    lelong          23              pentiumIII
->>8    lelong          24              pentium_3_M
->>8    lelong          25              pentiumV
->>8    lelong          26              xeon_mp
->>8    lelong          40              pentium_3_xeon
->>8    lelong          113             celeron
->>8    lelong          119             celeron_mobile
->4     lelong          16777223
->>8    lelong          3               \b x86_64
->>8    lelong          4               \b x86_64_arch1
->12    lelong          1               \b object
->12    lelong          2               \b executable
->12    lelong          3               \b fvmlib
->12    lelong          4               \b core
->12    lelong          5               \b preload
->12    lelong          6               \b dylib
->12    lelong          7               \b dylinker
->12    lelong          8               \b bundle
 >0     belong          x               \b]
 
 0      belong          0xcafebabe
index 534b2611f5c0474fab129c957627b561c22fba1e..041aa88074a2d85cb6659dbb88e1bc7b6a77515f 100644 (file)
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------
-# $File$
+# $File: mach,v 1.9 2009/09/19 16:28:10 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".
@@ -8,26 +8,47 @@
 #------------------------------------------------------------
 0      lelong&0xfffffffe       0xfeedface      Mach-O
 >0     byte            0xcf            64-bit
->12    lelong          1               object
->12    lelong          2               executable
->12    lelong          3               fixed virtual memory shared library
->12    lelong          4               core
->12    lelong          5               preload executable
->12    lelong          6               dynamically linked shared library
->12    lelong          7               dynamic linker
->12    lelong          8               bundle
->12    lelong          9               dynamically linked shared library stub
->12    lelong          >9
->>12   lelong          x               filetype=%ld
 >4     lelong          <0
 >>4    lelong          x               architecture=%ld
->4     lelong          1               vax
+>4     lelong          1
+>>8    lelong          0               vax
+>>8    lelong          1               vax11/780
+>>8    lelong          2               vax11/785
+>>8    lelong          3               vax11/750
+>>8    lelong          4               vax11/730
+>>8    lelong          5               uvaxI
+>>8    lelong          6               uvaxII
+>>8    lelong          7               vax8200
+>>8    lelong          8               vax8500
+>>8    lelong          9               vax8600
+>>8    lelong          10              vax8650
+>>8    lelong          11              vax8800
+>>8    lelong          12              uvaxIII
 >4     lelong          2               romp
 >4     lelong          3               architecture=3
 >4     lelong          4               ns32032
 >4     lelong          5               ns32332
 >4     lelong          6               m68k
->4     lelong          7               i386
+>4     lelong          7
+>>8    lelong          3               i386
+>>8    lelong          4               i486
+>>8    lelong          132             i486sx
+>>8    lelong          5               i586
+>>8    lelong          8               pentium_3
+>>8    lelong          9               pentiumM
+>>8    lelong          10              pentiumIV
+>>8    lelong          11              itanium
+>>8    lelong          12              xeon
+>>8    lelong          14              pentiumIV_M
+>>8    lelong          15              itanium2
+>>8    lelong          21              pentiumpro
+>>8    lelong          23              pentiumIII
+>>8    lelong          24              pentium_3_M
+>>8    lelong          25              pentiumV
+>>8    lelong          26              xeon_mp
+>>8    lelong          40              pentium_3_xeon
+>>8    lelong          113             celeron
+>>8    lelong          119             celeron_mobile
 >4     lelong          8               mips
 >4     lelong          9               ns32532
 >4     lelong          10              architecture=10
 >4     lelong          16              i860
 >4     lelong          17              rs6000
 >4     lelong          18              ppc
+>4     lelong          16777223
+>>8    lelong          3               x86_64
+>>8    lelong          4               x86_64_arch1
 >4     lelong          16777234        ppc64
 >4     lelong          >16777234
 >>4    lelong          x               architecture=%ld
+>12    lelong          1               object
+>12    lelong          2               executable
+>12    lelong          3               fixed virtual memory shared library
+>12    lelong          4               core
+>12    lelong          5               preload executable
+>12    lelong          6               dynamically linked shared library
+>12    lelong          7               dynamic linker
+>12    lelong          8               bundle
+>12    lelong          9               dynamically linked shared library stub
+>12    lelong          >9
+>>12   lelong          x               filetype=%ld
 #
 0      belong&0xfffffffe       0xfeedface      Mach-O
 >3     byte            0xcf            64-bit
->12    belong          1               object
->12    belong          2               executable
->12    belong          3               fixed virtual memory shared library
->12    belong          4               core
->12    belong          5               preload executable
->12    belong          6               dynamically linked shared library
->12    belong          7               dynamic linker
->12    belong          8               bundle
->12    belong          9               dynamically linked shared library stub
->12    belong          >9
->>12   belong          x               filetype=%ld
 >4     belong          <0
 >>4    belong          x               architecture=%ld
->4     belong          1               vax
+>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
 >4     belong          2               romp
 >4     belong          3               architecture=3
 >4     belong          4               ns32032
 >>8    belong          2               (mc68040)
 >>8    belong          3               (mc68030 only)
 >4     belong          7               i386
+>>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
 >4     belong          8               mips
 >4     belong          9               ns32532
 >4     belong          10              architecture=10
 >4     belong          16              i860
 >4     belong          17              rs6000
 >4     belong          18              ppc
+>4     belong          16777223
+>>8    belong          3               x86_64
+>>8    belong          4               x86_64_arch1
 >4     belong          16777234        ppc64
 >4     belong          >16777234
 >>4    belong          x               architecture=%ld
+>12    belong          1               object
+>12    belong          2               executable
+>12    belong          3               fixed virtual memory shared library
+>12    belong          4               core
+>12    belong          5               preload executable
+>12    belong          6               dynamically linked shared library
+>12    belong          7               dynamic linker
+>12    belong          8               bundle
+>12    belong          9               dynamically linked shared library stub
+>12    belong          >9
+>>12   belong          x               filetype=%ld