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

Add wait jmppin & wait irq prev/next

Browse source
This commit is contained in:
Jeff Epler 2024-09-08 08:01:09 -05:00
parent 7acebc63b0
commit 86f02e8b83
2 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
adafruit_pioasm.py
View file

@ -278,16 +278,36 @@ class Program: # pylint: disable=too-few-public-methods
# instr delay p sr index # instr delay p sr index
assembled.append(0b001_00000_0_00_00000) assembled.append(0b001_00000_0_00_00000)
polarity = int(instruction[1], 0) polarity = int(instruction[1], 0)
source = instruction[2]
if not 0 <= polarity <= 1: if not 0 <= polarity <= 1:
raise RuntimeError("Invalid polarity") raise RuntimeError("Invalid polarity")
assembled[-1] |= polarity << 7 assembled[-1] |= polarity << 7
if instruction[2] == "jmppin":
require_version(1, "wait jmppin")
num = 0
print("wait jmppin", instruction)
if len(instruction) > 3:
if len(instruction) < 5 or instruction[3] != "+":
raise RuntimeError("invalid wait jmppin")
num = int_in_range(instruction[4], 0, 4, "wait jmppin offset")
assembled[-1] |= num
assembled[-1] |= 0b11 << 5 # JMPPIN wait source
else:
assembled[-1] |= WAIT_SOURCES.index(instruction[2]) << 5 assembled[-1] |= WAIT_SOURCES.index(instruction[2]) << 5
num = int(instruction[3], 0) num = int(instruction[3], 0)
if not 0 <= num <= 31: if not 0 <= num <= 31:
raise RuntimeError("Wait num out of range") raise RuntimeError("Wait num out of range")
assembled[-1] |= num assembled[-1] |= num
if instruction[-1] == "rel": # The flag index is decoded in the same way as the IRQ
assembled[-1] |= 0x10 # Set the high bit of the irq value # index field, decoding down from the two MSBs
if instruction[-1] == "next":
require_version(1, "wait irq next")
assembled[-1] |= 0b11000
elif instruction[-1] == "prev":
require_version(1, "wait irq prev")
assembled[-1] |= 0b01000
elif instruction[-1] == "rel":
assembled[-1] |= 0b10000
elif instruction[0] == "in": elif instruction[0] == "in":
# instr delay src count # instr delay src count
assembled.append(0b010_00000_000_00000) assembled.append(0b010_00000_000_00000)

13
tests/test_version.py
View file

@ -125,3 +125,16 @@ def test_mov_v1() -> None:
assert_assembly_fails("mov pindirs, null", errtype=ValueError) assert_assembly_fails("mov pindirs, null", errtype=ValueError)
assert_assembles_to(prefix + "mov pindirs, null", [0b101_00000_01100011]) assert_assembles_to(prefix + "mov pindirs, null", [0b101_00000_01100011])
def test_wait_v1() -> None:
assert_assembly_fails("wait 0 jmppin")
assert_assembly_fails("wait 0 irq 5 next")
prefix = ".pio_version 1\n"
assert_assembly_fails(prefix + "wait 0 jmppin +")
assert_assembly_fails(prefix + "wait 0 jmppin + 7")
assert_assembles_to(prefix + "wait 0 jmppin + 3", [0b001_00000_0_11_00011])
assert_assembles_to(prefix + "wait 1 jmppin", [0b001_00000_1_11_00000])
assert_assembles_to(prefix + "wait 0 irq 5 next", [0b001_00000_0_10_11_101])
assert_assembles_to(prefix + "wait 1 irq 4 prev", [0b001_00000_1_10_01_100])