about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--example/expression/solve_condition_stp.py2
-rw-r--r--miasm2/arch/aarch64/arch.py6
-rw-r--r--miasm2/arch/arm/arch.py2
-rw-r--r--miasm2/arch/mips32/arch.py2
-rw-r--r--miasm2/arch/msp430/arch.py2
-rw-r--r--miasm2/arch/sh4/arch.py2
-rw-r--r--miasm2/arch/x86/arch.py2
-rw-r--r--miasm2/core/cpu.py4
-rw-r--r--miasm2/core/parse_asm.py8
-rw-r--r--test/arch/aarch64/unit/asm_test.py2
-rw-r--r--test/arch/mips32/unit/asm_test.py2
-rw-r--r--test/arch/x86/arch.py4
-rw-r--r--test/arch/x86/unit/asm_test.py2
13 files changed, 20 insertions, 20 deletions
diff --git a/example/expression/solve_condition_stp.py b/example/expression/solve_condition_stp.py
index 67d536d5..2a3b42fd 100644
--- a/example/expression/solve_condition_stp.py
+++ b/example/expression/solve_condition_stp.py
@@ -143,7 +143,7 @@ if __name__ == '__main__':
         else:
             return ExprId(string_parsed, size=32)
 
-    my_var_parser = parse_ast(my_ast_id2expr, my_ast_int2expr)
+    my_var_parser = ParseAst(my_ast_id2expr, my_ast_int2expr)
     base_expr.setParseAction(my_var_parser)
 
     argc = ExprId('argc', 32)
diff --git a/miasm2/arch/aarch64/arch.py b/miasm2/arch/aarch64/arch.py
index 9f265e75..460c134e 100644
--- a/miasm2/arch/aarch64/arch.py
+++ b/miasm2/arch/aarch64/arch.py
@@ -95,8 +95,8 @@ def ast_id2expr64(t):
 def ast_int2expr64(a):
     return m2_expr.ExprInt64(a)
 
-my_var_parser32 = parse_ast(ast_id2expr32, ast_int2expr32, default_size=32)
-my_var_parser64 = parse_ast(ast_id2expr64, ast_int2expr64, default_size=64)
+my_var_parser32 = ParseAst(ast_id2expr32, ast_int2expr32, default_size=32)
+my_var_parser64 = ParseAst(ast_id2expr64, ast_int2expr64, default_size=64)
 
 base_expr32.setParseAction(my_var_parser32)
 base_expr64.setParseAction(my_var_parser64)
@@ -229,7 +229,7 @@ simds_info = {8: simd08_info,
               128: simd128_info}
 
 
-my_var_parser = parse_ast(ast_id2expr, ast_int2expr)
+my_var_parser = ParseAst(ast_id2expr, ast_int2expr)
 base_expr.setParseAction(my_var_parser)
 
 
diff --git a/miasm2/arch/arm/arch.py b/miasm2/arch/arm/arch.py
index 9a19d03b..d9bf42ba 100644
--- a/miasm2/arch/arm/arch.py
+++ b/miasm2/arch/arm/arch.py
@@ -188,7 +188,7 @@ def ast_int2expr(a):
     return ExprInt32(a)
 
 
-my_var_parser = parse_ast(ast_id2expr, ast_int2expr)
+my_var_parser = ParseAst(ast_id2expr, ast_int2expr)
 base_expr.setParseAction(my_var_parser)
 
 
diff --git a/miasm2/arch/mips32/arch.py b/miasm2/arch/mips32/arch.py
index 68665153..79176205 100644
--- a/miasm2/arch/mips32/arch.py
+++ b/miasm2/arch/mips32/arch.py
@@ -60,7 +60,7 @@ def ast_int2expr(a):
     return ExprInt32(a)
 
 
-my_var_parser = cpu.parse_ast(ast_id2expr, ast_int2expr)
+my_var_parser = cpu.ParseAst(ast_id2expr, ast_int2expr)
 base_expr.setParseAction(my_var_parser)
 
 class additional_info:
diff --git a/miasm2/arch/msp430/arch.py b/miasm2/arch/msp430/arch.py
index 8d4ae956..d7463f3d 100644
--- a/miasm2/arch/msp430/arch.py
+++ b/miasm2/arch/msp430/arch.py
@@ -81,7 +81,7 @@ def ast_int2expr(a):
 
 variable, operand, base_expr = gen_base_expr()
 
-my_var_parser = parse_ast(ast_id2expr, ast_int2expr)
+my_var_parser = ParseAst(ast_id2expr, ast_int2expr)
 base_expr.setParseAction(my_var_parser)
 
 
diff --git a/miasm2/arch/sh4/arch.py b/miasm2/arch/sh4/arch.py
index c4e462b9..ae96fef1 100644
--- a/miasm2/arch/sh4/arch.py
+++ b/miasm2/arch/sh4/arch.py
@@ -42,7 +42,7 @@ def ast_int2expr(a):
     return ExprInt32(a)
 
 
-my_var_parser = parse_ast(ast_id2expr, ast_int2expr)
+my_var_parser = ParseAst(ast_id2expr, ast_int2expr)
 base_expr.setParseAction(my_var_parser)
 
 int_or_expr = base_expr
diff --git a/miasm2/arch/x86/arch.py b/miasm2/arch/x86/arch.py
index 5b31ba55..8ae6cd31 100644
--- a/miasm2/arch/x86/arch.py
+++ b/miasm2/arch/x86/arch.py
@@ -230,7 +230,7 @@ def ast_int2expr(a):
     return ExprInt64(a)
 
 
-my_var_parser = parse_ast(ast_id2expr, ast_int2expr)
+my_var_parser = ParseAst(ast_id2expr, ast_int2expr)
 base_expr.setParseAction(my_var_parser)
 
 int_or_expr = base_expr
diff --git a/miasm2/core/cpu.py b/miasm2/core/cpu.py
index ffca318b..1beeeff0 100644
--- a/miasm2/core/cpu.py
+++ b/miasm2/core/cpu.py
@@ -200,7 +200,7 @@ def ast_int2expr(a):
 
 
 
-class parse_ast(object):
+class ParseAst(object):
 
     def __init__(self, id2expr, int2expr, default_size=32):
         self.id2expr = id2expr
@@ -364,7 +364,7 @@ def gen_base_expr():
 
 variable, operand, base_expr = gen_base_expr()
 
-my_var_parser = parse_ast(ast_id2expr, ast_int2expr)
+my_var_parser = ParseAst(ast_id2expr, ast_int2expr)
 base_expr.setParseAction(my_var_parser)
 
 default_prio = 0x1337
diff --git a/miasm2/core/parse_asm.py b/miasm2/core/parse_asm.py
index 238306b3..11fa4040 100644
--- a/miasm2/core/parse_asm.py
+++ b/miasm2/core/parse_asm.py
@@ -3,7 +3,7 @@ import re
 
 import miasm2.expression.expression as m2_expr
 import miasm2.core.asmbloc as asmbloc
-from miasm2.core.cpu import gen_base_expr, parse_ast
+from miasm2.core.cpu import gen_base_expr, ParseAst
 from miasm2.core.cpu import instruction
 
 declarator = {'byte': 8,
@@ -169,9 +169,9 @@ def parse_txt(mnemo, attrib, txt, symbol_pool=None):
 
                 # parser
                 base_expr = gen_base_expr()[2]
-                my_var_parser = parse_ast(lambda x: m2_expr.ExprId(x, size),
-                                          lambda x:
-                                              m2_expr.ExprInt(x, size))
+                my_var_parser = ParseAst(lambda x: m2_expr.ExprId(x, size),
+                                         lambda x:
+                                         m2_expr.ExprInt(x, size))
                 base_expr.setParseAction(my_var_parser)
 
                 for element in data_raw:
diff --git a/test/arch/aarch64/unit/asm_test.py b/test/arch/aarch64/unit/asm_test.py
index cfb2a81c..54ab476d 100644
--- a/test/arch/aarch64/unit/asm_test.py
+++ b/test/arch/aarch64/unit/asm_test.py
@@ -1,7 +1,7 @@
 import sys
 import os
 
-from miasm2.core.cpu import parse_ast
+from miasm2.core.cpu import ParseAst
 from miasm2.arch.aarch64.arch import mn_aarch64, base_expr, variable
 from miasm2.core import parse_asm
 from miasm2.expression.expression import *
diff --git a/test/arch/mips32/unit/asm_test.py b/test/arch/mips32/unit/asm_test.py
index 35d87d85..4425bb65 100644
--- a/test/arch/mips32/unit/asm_test.py
+++ b/test/arch/mips32/unit/asm_test.py
@@ -1,7 +1,7 @@
 import sys
 import os
 
-from miasm2.core.cpu import parse_ast
+from miasm2.core.cpu import ParseAst
 from miasm2.arch.mips32.arch import mn_mips32, base_expr, variable
 from miasm2.core import parse_asm
 from miasm2.expression.expression import *
diff --git a/test/arch/x86/arch.py b/test/arch/x86/arch.py
index b0ea7cb4..83039368 100644
--- a/test/arch/x86/arch.py
+++ b/test/arch/x86/arch.py
@@ -1,7 +1,7 @@
 import os
 import time
 import miasm2.expression.expression as m2_expr
-from miasm2.arch.x86.arch import mn_x86, deref_mem_ad, parse_ast, ast_int2expr, \
+from miasm2.arch.x86.arch import mn_x86, deref_mem_ad, ParseAst, ast_int2expr, \
     base_expr, rmarg, print_size
 from miasm2.arch.x86.sem import ir_x86_16, ir_x86_32, ir_x86_64
 from miasm2.core.bin_stream import bin_stream_str
@@ -34,7 +34,7 @@ def my_ast_id2expr(t):
     r = reg_and_id.get(t, m2_expr.ExprId(t, size=32))
     return r
 
-my_var_parser = parse_ast(my_ast_id2expr, ast_int2expr)
+my_var_parser = ParseAst(my_ast_id2expr, ast_int2expr)
 base_expr.setParseAction(my_var_parser)
 
 for s in ['EAX',
diff --git a/test/arch/x86/unit/asm_test.py b/test/arch/x86/unit/asm_test.py
index bf97dbe4..524791ce 100644
--- a/test/arch/x86/unit/asm_test.py
+++ b/test/arch/x86/unit/asm_test.py
@@ -1,7 +1,7 @@
 import sys
 import os
 
-from miasm2.core.cpu import parse_ast
+from miasm2.core.cpu import ParseAst
 from miasm2.arch.x86.arch import mn_x86, base_expr, variable
 from miasm2.core import parse_asm
 from miasm2.expression.expression import *