about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2015-06-16 15:52:26 +0200
committerserpilliere <serpilliere@users.noreply.github.com>2015-06-16 15:52:26 +0200
commit95f6c924cbe662dff92a2644f247889d3f2e1f8f (patch)
tree9f172add9b7de96b31bbad3403c2231499241545
parent5be37436006c6d4578862d879c5ab7bebe8447ff (diff)
parent2c80b067e015ce9df9c6798dc2e2ce6845bc8aae (diff)
downloadmiasm-95f6c924cbe662dff92a2644f247889d3f2e1f8f.tar.gz
miasm-95f6c924cbe662dff92a2644f247889d3f2e1f8f.zip
Merge pull request #179 from gelim/master
typofix and logic error
-rw-r--r--example/disasm/full.py2
-rw-r--r--miasm2/arch/msp430/arch.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/example/disasm/full.py b/example/disasm/full.py
index 9e953122..7f523a23 100644
--- a/example/disasm/full.py
+++ b/example/disasm/full.py
@@ -89,7 +89,7 @@ addrs = [int(a, 16) for a in args.address]
 if len(addrs) == 0 and default_addr is not None:
     addrs.append(default_addr)
 for ad in addrs:
-    todo = [(mdis, None, ad)]
+    todo += [(mdis, None, ad)]
 
 done = set()
 all_funcs = set()
diff --git a/miasm2/arch/msp430/arch.py b/miasm2/arch/msp430/arch.py
index 2cac7260..875915c3 100644
--- a/miasm2/arch/msp430/arch.py
+++ b/miasm2/arch/msp430/arch.py
@@ -11,7 +11,7 @@ import miasm2.arch.msp430.regs as regs_module
 from miasm2.arch.msp430.regs import *
 from miasm2.core.asmbloc import asm_label
 
-log = logging.getLogger("armdis")
+log = logging.getLogger("msp430dis")
 console_handler = logging.StreamHandler()
 console_handler.setFormatter(logging.Formatter("%(levelname)-5s: %(message)s"))
 log.addHandler(console_handler)