diff options
Diffstat (limited to 'miasm2/core')
| -rw-r--r-- | miasm2/core/asmblock.py | 8 | ||||
| -rw-r--r-- | miasm2/core/objc.py | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/miasm2/core/asmblock.py b/miasm2/core/asmblock.py index 97113be1..8d6456e0 100644 --- a/miasm2/core/asmblock.py +++ b/miasm2/core/asmblock.py @@ -600,8 +600,12 @@ class AsmCFG(DiGraph): return self._pendings def label2block(self, loc_key): - """Return the block corresponding to loc_key @loc_key - @loc_key: LocKey instance""" + """ + DEPRECATED: Use "loc_key_to_block" instead of "label2block" + + Return the block corresponding to loc_key @loc_key + @loc_key: LocKey instance + """ warnings.warn('DEPRECATION WARNING: use "loc_key_to_block" instead of "label2block"') return self.loc_key_to_block(loc_key) diff --git a/miasm2/core/objc.py b/miasm2/core/objc.py index 9649514d..0e5e8cf4 100644 --- a/miasm2/core/objc.py +++ b/miasm2/core/objc.py @@ -1012,12 +1012,12 @@ class ExprToAccessC(ExprReducer): if not isinstance(node.expr, ExprMem): return None - if node.arg.info is None: + if node.ptr.info is None: return None - assert isinstance(node.arg.info, set) + assert isinstance(node.ptr.info, set) void_type = self.types_mngr.void_ptr found = set() - for subcgenobj in node.arg.info: + for subcgenobj in node.ptr.info: if isinstance(subcgenobj.ctype, ObjCArray): nobj = CGenArray(subcgenobj, 0, void_type.align, @@ -1285,7 +1285,7 @@ class ExprCToExpr(ExprReducer): out = (src.arg, ObjCPtr(src_type.objtype, void_type.align, void_type.size)) elif isinstance(src, ExprMem): - out = (src.arg, ObjCPtr(src_type, + out = (src.ptr, ObjCPtr(src_type, void_type.align, void_type.size)) elif isinstance(src_type, ObjCStruct): out = (src, ObjCPtr(src_type, |