add virt() instead of virt[] for binstream

1 files changed, 59 insertions, 22 deletions

diff --git a/example/disas_and_graph.py b/example/disas_and_graph.py
index ba68c44f..57ea3f90 100755
--- a/example/disas_and_graph.py
+++ b/example/disas_and_graph.py
@@ -9,6 +9,9 @@ from miasm.core import asmbloc
 from miasm.core import parse_asm
 from elfesteem import pe
 from miasm.arch import ia32_arch
+from miasm.arch import arm_arch
+from optparse import OptionParser
+
 try:
     from miasm.arch.java_arch import java_mn
 except ImportError:
@@ -18,23 +21,46 @@ import pickle
 import sys
 
 
+
+
 print sys.argv
 
-fname = sys.argv[1]
-ad_to_dis = None
-if len(sys.argv) >2:
-    ad_to_dis = sys.argv[2]
 
+parser = OptionParser()
+parser.add_option('-a', "--address", dest="address", metavar="ADDRESS",
+                  help="address to disasemble")
+parser.add_option('-m', "--architecture", dest="machine",metavar="MACHINE",
+                  help="architecture to use for disasm: arm, x86, ppc, java")
+parser.add_option('-M', "--architecture-options", dest="machine-options",
+                  metavar="MACHINEOPTS",
+                  help="architecture options (16/32/64 bits, ...)")
+parser.add_option('-r', "--rawfile", dest="rawfile", action="store_true",
+                  default=False, metavar=None,
+                  help="dont use PE/ELF/CLASS autodetect, disasm raw file")
+
+(options, args) = parser.parse_args(sys.argv[1:])
+print options, args
+
+fname = args[0]
+ad_to_dis = options.address
 
 
 dll_dyn_funcs = {}
 data = open(fname, 'rb').read()
-if data.startswith("MZ"):
+
+if options.rawfile:
+    in_str = bin_stream.bin_stream(data)
+    if ad_to_dis == None:
+        ad_to_dis = 0
+    else:
+        ad_to_dis = int(ad_to_dis, 16)
+    mnemo = ia32_arch.x86_mn
+elif data.startswith("MZ"):
     e = pe_init.PE(open(fname, 'rb').read())
-    if len(sys.argv) <=2:
+    if ad_to_dis == None:
         ad_to_dis = e.rva2virt(e.Opthdr.AddressOfEntryPoint)
     else:
-        ad_to_dis = int(sys.argv[2], 16)
+        ad_to_dis = int(ad_to_dis, 16)
     in_str = bin_stream.bin_stream(e.virt)
     try:
         dll_dyn_funcs = get_import_address(e)
@@ -44,10 +70,10 @@ if data.startswith("MZ"):
 
 elif data.startswith("\x7fELF") :
     e = elf_init.ELF(open(fname, 'rb').read())
-    if len(sys.argv) <=2:
+    if ad_to_dis == None:
         ad_to_dis = e.Ehdr.entry
     else:
-        ad_to_dis = int(sys.argv[2], 16)
+        ad_to_dis = int(ad_to_dis, 16)
     in_str = bin_stream.bin_stream(e.virt)
     try:
         dll_dyn_funcs = get_import_address_elf(e)
@@ -59,13 +85,13 @@ elif data.startswith("\xca\xfe\xba\xbe"):
     def java_usage():
         print 'usage:'
         print '%s methodname methodtype'%sys.argv[0]
-        print 'possible methods:'
-        for i, (c_name, c_type) in enumerate(methods):
-            print i, str(c_name), str(c_type)
+        print 'possible methods: (use -a N)'
+        for i, ((c_name, c_type), code) in enumerate(methods):
+            print i, "->", str(c_name), str(c_type)
         sys.exit(-1)
 
     e = jclass_init.JCLASS(data)
-    methods = {}
+    methods = []
     for m in e.description.methods:
         name = m.name
         descr = m.descriptor
@@ -73,12 +99,13 @@ elif data.startswith("\xca\xfe\xba\xbe"):
         if not c:
             continue
         code = c[0].code
-        methods[(name, descr)] = code
-    if len(sys.argv) != 4:
+        methods.append(((name, descr), code))
+    if ad_to_dis == None:
         java_usage()
-    if not (sys.argv[2], sys.argv[3]) in methods:
+    ad_to_dis = int(ad_to_dis)
+    if not (0<=ad_to_dis<len(methods)):
         java_usage()
-    in_str = bin_stream.bin_stream(methods[(sys.argv[2], sys.argv[3])])
+    in_str = bin_stream.bin_stream(methods[ad_to_dis][1])
     ad_to_dis = 0
     mnemo = java_mn
     try:
@@ -89,11 +116,22 @@ elif data.startswith("\xca\xfe\xba\xbe"):
 
 
 else:
-    in_str = bin_stream.bin_stream(data)
-    ad_to_dis = 0
-    mnemo = ia32_arch.x86_mn
+    raise ValueError('cannot autodetect file type')
+
+
+if options.machine:
+    machine_dct = {"ia32":ia32_arch.x86_mn,
+                   "arm":arm_arch.arm_mn,
+                   "java":java_mn,
+                   }
+    if not options.machine in machine_dct:
+        raise ValueError('unknown machine', options.machine)
+    if mnemo:
+        print "WARNING forcing machine disasm to ", options.machine
+
+    mnemo = machine_dct[options.machine]
 
-print 'dis', fname, 'at', "0x%.8X"%ad_to_dis
+print 'dis', fname, 'at', "0x%.8X"%ad_to_dis, 'using', mnemo
 
 
 
@@ -106,7 +144,6 @@ from miasm.graph.graph_qt import graph_blocs
 #test symbols from ida
 for (n,f), ad in dll_dyn_funcs.items():
     l = asmbloc.asm_label("%s_%s"%(n, f), ad)
-    print l
     symbol_pool.add(l)