parse_asm: clean space; fix examples asm_bloc api

4 files changed, 19 insertions, 19 deletions

diff --git a/example/asm_arm.py b/example/asm_arm.py
index 2072f519..8cd5e303 100755
--- a/example/asm_arm.py
+++ b/example/asm_arm.py
@@ -45,7 +45,7 @@ open("graph.txt" , "w").write(g)
 for b in all_bloc[0]:
     print b
 symbol_pool.add_label('base_address', 0x0)
-symbol_pool.getby_name("toto").offset = 0x0
+symbol_pool.set_offset(symbol_pool.getby_name("toto"), 0x0)
 
 resolved_b, patches = asmbloc.asm_resolve_final(my_mn, all_bloc[0], symbol_pool)
 print patches
diff --git a/example/asm_box.py b/example/asm_box.py
index f1e4bde5..e610eda1 100644
--- a/example/asm_box.py
+++ b/example/asm_box.py
@@ -27,8 +27,8 @@ msg:
 .string "World!"
 ''')
 symbol_pool.add_label('base_address', 0)
-symbol_pool.getby_name("MessageBoxA").offset = e.DirImport.get_funcvirt('MessageBoxA')
-symbol_pool.getby_name("main").offset = e.rva2virt(s_text.addr)
+symbol_pool.set_offset(symbol_pool.getby_name("MessageBoxA"),e.DirImport.get_funcvirt('MessageBoxA'))
+symbol_pool.set_offset(symbol_pool.getby_name("main"), e.rva2virt(s_text.addr))
 resolved_b, patches = asmbloc.asm_resolve_final(x86_mn, all_bloc[0], symbol_pool)
 for p in patches:
     e.virt[p] = patches[p]
diff --git a/example/asm_x86.py b/example/asm_x86.py
index 82bba972..d4a621f6 100755
--- a/example/asm_x86.py
+++ b/example/asm_x86.py
@@ -57,7 +57,7 @@ eend:
 
 #fix shellcode addr
 symbol_pool.add_label('base_address', 0x400000)
-symbol_pool.getby_name("main").offset = 0x401000
+symbol_pool.set_offset(symbol_pool.getby_name("main"), 0x401000)
 e.Opthdr.AddressOfEntryPoint = s_text.addr
 
 for b in all_bloc[0]:
diff --git a/miasm/core/parse_asm.py b/miasm/core/parse_asm.py
index 7a1dc242..bec9e366 100644
--- a/miasm/core/parse_asm.py
+++ b/miasm/core/parse_asm.py
@@ -27,8 +27,8 @@ def guess_next_new_label(symbol_pool, gen_label_index = 0):
         if l == None:
             return symbol_pool.add_label(i)
         i+=1
-        
-    
+
+
 def parse_txt(mnemo, txt, symbol_pool = None, gen_label_index = 0):
     if symbol_pool == None:
         symbol_pool = asm_symbol_pool()
@@ -88,9 +88,9 @@ def parse_txt(mnemo, txt, symbol_pool = None, gen_label_index = 0):
             if directive == 'split': #custom command
                 lines.append(asm_raw(line.strip()))
                 continue
-            
+
             raise ValueError("unknown directive %s"%str(directive))
-        
+
         #label
         r = re.match(r'\s*(\S+)\s*:', line)
         if r:
@@ -98,7 +98,7 @@ def parse_txt(mnemo, txt, symbol_pool = None, gen_label_index = 0):
             l = symbol_pool.getby_name_create(l)
             lines.append(l)
             continue
-        
+
         #code
         if ';' in line:
             line = line[:line.find(';')]
@@ -138,7 +138,7 @@ def parse_txt(mnemo, txt, symbol_pool = None, gen_label_index = 0):
     #gen_label_index = 0
 
 
-    
+
     all_blocs_sections = []
     bloc_num = 0
     for lines in [lines_text, lines_data, lines_bss]:
@@ -166,7 +166,7 @@ def parse_txt(mnemo, txt, symbol_pool = None, gen_label_index = 0):
                     if bloc_to_nlink:
                         bloc_to_nlink.addto(asm_constraint(b.label, asm_constraint.c_next))
                         bloc_to_nlink = None
-                
+
             #in bloc
             elif state == 1:
                 #asm_raw
@@ -199,7 +199,7 @@ def parse_txt(mnemo, txt, symbol_pool = None, gen_label_index = 0):
                             l = symbs[0][0]
                             lines[i].setdstflow([l])
                             b.addto(asm_constraint(l, asm_constraint.c_to))
-                            
+
                         # TODO XXX redo this really
 
                         if not lines[i].breakflow() and i+1 < len(lines):
@@ -217,13 +217,13 @@ def parse_txt(mnemo, txt, symbol_pool = None, gen_label_index = 0):
                         block_may_link = True
                     else:
                         block_may_link = False
-                            
-                    
-                    i+=1        
-    
-    
-                        
-    
+
+
+                    i+=1
+
+
+
+
     for b in all_blocs_sections[0]:
         log_asmbloc.info( b)