summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-07-01 08:41:14 -0500
committerBryan Bishop <kanzure@gmail.com>2012-07-01 08:41:14 -0500
commitfdbb67cb1570b12aace62078d44b917c6e46aff1 (patch)
tree0e238abcb2bedfe131f4ee8e739437801daf13e5
parent0507c67bc8a65f52936ba6f9aa01f4a89cf94695 (diff)
fix romstr for compiling (thanks pasky)
original-commit-id: fcf43b13dabed748eba1737770eeb9f5d55820c5
-rw-r--r--romstr.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/romstr.py b/romstr.py
index a51760e..d89c67e 100644
--- a/romstr.py
+++ b/romstr.py
@@ -72,7 +72,7 @@ class RomStr(str):
# scan the asm source code for labels
if generate_labels:
- asm = open("../main.asm", "r").read().split("\n")
+ asm = open(os.path.dirname(__file__) + "/../main.asm", "r").read().split("\n")
for line in asm:
label = get_label_from_line(line)
@@ -446,7 +446,7 @@ class DisAsm:
addresses = set()
for (id, command) in self.asm_commands.items():
- if command.has_key("target_address"):
+ if command.has_key("target_address") and command["id"] in call_commands:
addresses.add(command["target_address"])
return addresses