Improve printing and remove unnecessary unpack() export

Author: staticfloat

src/Abstract/ObjectHandle.jl

@@ -2,7 +2,6 @@
 export ObjectHandle,
        readmeta,
        seek, seekstart, skip, start, iostream, position, read, readuntil, eof,
-       unpack,
        endianness, is64bit, isrelocatable, isexecutable, islibrary, 
        mangle_section_name, mangle_symbol_name, handle, header, format_string,
        section_header_offset, section_header_size, section_header_type,

src/COFF/COFFHandle.jl

@@ -1,7 +1,5 @@
 export COFFHandle
 
-import Base: show
-
 """
     COFFHandle
 

src/COFF/COFFHeader.jl

@@ -1,5 +1,7 @@
 export COFFHeader
 
+import Base: show
+
 @io struct COFFHeader
     Machine::UInt16
     NumberOfSections::UInt16
@@ -31,3 +33,11 @@ isrelocatable(h::COFFHeader) = !isexecutable(h) && !islibrary(h)
 
 num_sections(h::COFFHeader) = h.NumberOfSections
 num_symbols(h::COFFHeader) = h.NumberOfSymbols
+
+function show(io::IO, header::COFFHeader)
+    println(io, "COFF Header")
+    println(io, "  Machine ", header.Machine)
+    println(io, "  Number of Sections ", header.NumberOfSections)
+    println(io, "  Time Date Stamp ", header.TimeDateStamp)
+    println(io, "  Number of Symbols ", header.NumberOfSymbols)
+end

src/ELF/ELFHandle.jl

@@ -1,11 +1,8 @@
 # Export Datatypes
 export ELFHandle
 
-# Import FileIO methods
-#import FileIO: load, save, File
-
 # Import Base methods
-import Base: start, show, getindex
+import Base: start, getindex
 
 
 """

src/ELF/ELFHeader.jl

@@ -41,22 +41,6 @@ end
     e_shstrndx::UInt16
 end
 
-function show(io::IO, header::ELFHeader)
-    printentry(io,"Type",filetype(header.e_type))
-    printentry(io,"Machine",machinetype(header.e_machine))
-    # Skip e_version (not particularly useful)
-    printentry(io,"Entrypoint","0x",hex(header.e_entry))
-    printentry(io,"PH Offset","0x",hex(header.e_phoff))
-    printentry(io,"SH Offset","0x",hex(header.e_shoff))
-    # Skip flags
-    printentry(io,"Header Size","0x",hex(header.e_ehsize))
-    printentry(io,"PH Entry Size","0x",hex(header.e_phentsize))
-    printentry(io,"PH Entry Count",dec(header.e_phnum))
-    printentry(io,"SH Entry Size","0x",hex(header.e_shentsize))
-    printentry(io,"SH Entry Count",dec(header.e_shnum))
-    printentry(io,"Strtab Index",dec(header.e_shstrndx))
-end
-
 function filetype(e_type)
     if haskey(ET_TYPES, e_type)
         return ET_TYPES[e_type]
@@ -71,3 +55,21 @@ function machinetype(e_machine)
     end
     return string("Unknown (0x",hex(e_machine),")")
 end
+
+
+function show(io::IO, header::ELFHeader)
+    println(io, "ELF Header")
+    println(io, "  Type ", filetype(header.e_type))
+    println(io, "  Machine ", machinetype(header.e_machine))
+    # Skip e_version (not particularly useful)
+    println(io, "  Entrypoint ", "0x", hex(header.e_entry))
+    println(io, "  PH Offset ", "0x", hex(header.e_phoff))
+    println(io, "  SH Offset ", "0x", hex(header.e_shoff))
+    # Skip flags
+    println(io, "  Header Size ", "0x", hex(header.e_ehsize))
+    println(io, "  PH Entry Size ", "0x", hex(header.e_phentsize))
+    println(io, "  PH Entry Count ", dec(header.e_phnum))
+    println(io, "  SH Entry Size ", "0x", hex(header.e_shentsize))
+    println(io, "  SH Entry Count ", dec(header.e_shnum))
+    println(io, "  Strtab Index ", dec(header.e_shstrndx))
+end

src/MachO/MachOHandle.jl

@@ -1,5 +1,4 @@
 export MachOHandle, FatMachOHandle
-import Base: show
 
 struct MachOHandle{T <: IO} <: ObjectHandle
     # Backing IO and start point within the IOStream of this MachO object

src/MachO/MachOHeader.jl

@@ -1,5 +1,7 @@
 export MachHeader, MachHeader32, MachHeader64, MachFatArch, MachFatHeader
 
+import Base: show
+
 """
     MachHeader
 
@@ -77,4 +79,13 @@ function macho_endianness(magic::UInt32)
     else
         throw(MagicMismatch("Invalid Magic ($(hex(magic)))!"))
     end
+end
+
+function show(io::IO, header::MachOHeader)
+    println(io, "MachO Header")
+    println(io, "  CPU Type ", header.cputype)
+    println(io, "  CPU Subtype ", header.cpusubtype)
+    println(io, "  File Type ", header.filetype)
+    println(io, "  Number of load commands ", header.ncmds)
+    println(io, "  Flags ", header.flags)
 end

test/runtests.jl

@@ -114,6 +114,9 @@ function test_libfoo_and_fooifier(fooifier_path, libfoo_path)
             # Show printing of a Handle
             tshow(oh_lib)
 
+            # Test showing of the header
+            tshow(header(oh_lib))
+
             # Test showing of Sections
             sects = Sections(oh_exe)
             tshow(sects)