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

Check directives that must come before an instruction

Browse source
This commit is contained in:
Jeff Epler 2024-09-05 13:12:19 -05:00
parent 9874ce3f51
commit ff1f57dfb1
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adafruit_pioasm.py
View file

@ -65,6 +65,10 @@ class Program: # pylint: disable=too-few-public-methods
mov_status_count = None mov_status_count = None
mov_status_param = None mov_status_param = None
def require_before_instruction():
if len(instructions) != 0:
raise RuntimeError(f"{words[0]} must be before first instruction")
def require_version(required_version, instruction): def require_version(required_version, instruction):
if pio_version < required_version: if pio_version < required_version:
raise RuntimeError( raise RuntimeError(
@ -89,8 +93,10 @@ class Program: # pylint: disable=too-few-public-methods
raise RuntimeError("Multiple programs not supported") raise RuntimeError("Multiple programs not supported")
program_name = line.split()[1] program_name = line.split()[1]
elif line.startswith(".pio_version"): elif line.startswith(".pio_version"):
require_before_instruction()
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()
offset = int(line.split()[1], 0) offset = int(line.split()[1], 0)
elif line.startswith(".wrap_target"): elif line.startswith(".wrap_target"):
wrap_target = len(instructions) wrap_target = len(instructions)
@ -102,12 +108,14 @@ class Program: # pylint: disable=too-few-public-methods
sideset_count = int(line.split()[1], 0) sideset_count = int(line.split()[1], 0)
sideset_enable = "opt" in line sideset_enable = "opt" in line
elif line.startswith(".fifo"): elif line.startswith(".fifo"):
require_before_instruction()
fifo_type = line.split()[1] fifo_type = line.split()[1]
required_version = FIFO_TYPES.get(fifo_type) required_version = FIFO_TYPES.get(fifo_type)
if required_version is None: if required_version is None:
raise RuntimeError(f"Invalid fifo type {fifo_type}") raise RuntimeError(f"Invalid fifo type {fifo_type}")
require_version(required_version, line) require_version(required_version, line)
elif line.startswith(".mov_status"): elif line.startswith(".mov_status"):
require_before_instruction()
required_version = 0 required_version = 0
mov_status_param = 0 mov_status_param = 0
mov_status_type = words[1] mov_status_type = words[1]

3
tests/test_pseudo.py
View file

@ -6,8 +6,9 @@
Tests pseudo-ops Tests pseudo-ops
""" """
from pytest_helpers import assert_pio_kwargs from pytest_helpers import assert_pio_kwargs, assert_assembly_fails
def test_offset() -> None: def test_offset() -> None:
assert_pio_kwargs(".origin 7", offset=7, sideset_enable=False) assert_pio_kwargs(".origin 7", offset=7, sideset_enable=False)
assert_assembly_fails("nop\n.origin 7")