diff options
| -rw-r--r-- | miasm2/core/asmblock.py | 2 | ||||
| -rw-r--r-- | miasm2/ir/translators/C.py | 5 | ||||
| -rw-r--r-- | miasm2/jitter/llvmconvert.py | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/miasm2/core/asmblock.py b/miasm2/core/asmblock.py index c8af4056..2f16543f 100644 --- a/miasm2/core/asmblock.py +++ b/miasm2/core/asmblock.py @@ -153,7 +153,7 @@ class AsmBlock(object): lbls.append("Unknown? ") else: lbls.append(dst.to_string(loc_db) + " ") - lbls = '\t'.join(lbls) + lbls = '\t'.join(sorted(lbls)) out.append(lbls) return '\n'.join(out) diff --git a/miasm2/ir/translators/C.py b/miasm2/ir/translators/C.py index 066c0f32..11ccf137 100644 --- a/miasm2/ir/translators/C.py +++ b/miasm2/ir/translators/C.py @@ -57,7 +57,10 @@ class TranslatorC(Translator): def from_ExprInt(self, expr): if expr.size <= self.NATIVE_INT_MAX_SIZE: assert expr.size <= 64 - return "0x%x" % expr.arg.arg + out = "0x%x" % int(expr) + if expr.size == 64: + out += "ULL" + return out value, int_size = int_size_to_bn(int(expr), expr.size) return 'bignum_from_string("%s", %d)' % (value, int_size) diff --git a/miasm2/jitter/llvmconvert.py b/miasm2/jitter/llvmconvert.py index 7c95688d..49c696e9 100644 --- a/miasm2/jitter/llvmconvert.py +++ b/miasm2/jitter/llvmconvert.py @@ -1242,8 +1242,9 @@ class LLVMFunction(): def gen_pre_code(self, instr_attrib): if instr_attrib.log_mn: + loc_db = self.llvm_context.ir_arch.loc_db self.printf("%.8X %s\n" % (instr_attrib.instr.offset, - instr_attrib.instr)) + instr_attrib.instr.to_string(loc_db))) def gen_post_code(self, attributes): if attributes.log_regs: |