adafruit-mirror/Adafruit_CircuitPython_PIOASM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve error handling of origin & mov_status directives

Browse source
This commit is contained in:
Jeff Epler 2024-09-05 13:18:49 -05:00
parent 4deafa6c65
commit 5659a2672a
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adafruit_pioasm.py
View file

@ -101,7 +101,7 @@ class Program: # pylint: disable=too-few-public-methods
pio_version = int_in_range(words[1], 0, 2, ".pio_version") pio_version = int_in_range(words[1], 0, 2, ".pio_version")
elif line.startswith(".origin"): elif line.startswith(".origin"):
require_before_instruction() require_before_instruction()
offset = int(line.split()[1], 0) offset = int_in_range(words[1], 0, 32, ".origin")
elif line.startswith(".wrap_target"): elif line.startswith(".wrap_target"):
wrap_target = len(instructions) wrap_target = len(instructions)
elif line.startswith(".wrap"): elif line.startswith(".wrap"):
@ -126,7 +126,7 @@ class Program: # pylint: disable=too-few-public-methods
if words[1] in ("txfifo", "rxfifo"): if words[1] in ("txfifo", "rxfifo"):
if words[2] != "<": if words[2] != "<":
raise RuntimeError(f"Invalid {line}") raise RuntimeError(f"Invalid {line}")
mov_status_count = int(words[3]) mov_status_count = int_in_range(words[3], 0, 16, words[1])
elif words[1] == "irq": elif words[1] == "irq":
required_version = 1 required_version = 1
idx = 2 idx = 2
@ -139,9 +139,6 @@ class Program: # pylint: disable=too-few-public-methods
if words[idx] != "set": if words[idx] != "set":
raise RuntimeError(f"Invalid {line})") raise RuntimeError(f"Invalid {line})")
mov_status_count = int(words[idx + 1]) mov_status_count = int(words[idx + 1])
if not 0 <= mov_status_count < 16:
raise RuntimeError(f"Invalid mov_status count {mov_status_count}")
require_version(required_version, line) require_version(required_version, line)
elif words[0] == ".in": elif words[0] == ".in":
require_before_instruction() require_before_instruction()