abawo/pico-sdk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pioasm python output (#479)

Browse Source 
While working on the [online pioasm](https://wokwi.com/tools/pioasm), I found several PIO instructions that result in invalid python code. Here is a small program that demonstrate the issue:

```
.program python_issue

    push block
    wait 0 irq 1 rel
    irq clear 1 rel
```

And the resulting Python program:

```python
# -------------------------------------------------- #
# This file is autogenerated by pioasm; do not edit! #
# -------------------------------------------------- #

import rp2
from machine import Pin
# ----------- #
# python_test #
# ----------- #

@rp2.asm_pio()
def python_test():
    wrap_target()
    push(, block)                         # 0
    wait(0, irq, 1 rel)                   # 1
    irq(clear 1 rel)                      # 2
    wrap()
```

After this fix, the above program compiles to a valid python syntax:

```python
# -------------------------------------------------- #
# This file is autogenerated by pioasm; do not edit! #
# -------------------------------------------------- #

import rp2
from machine import Pin
# ----------- #
# python_test #
# ----------- #

@rp2.asm_pio()
def python_test():
    wrap_target()
    push(block)                           # 0
    wait(0, irq, rel(1))                  # 1
    irq(clear, rel(1))                    # 2
    wrap()
```
This commit is contained in:
Uri Shaked 2021-06-08 06:02:04 +03:00 committed by GitHub
parent 1f1c6162cd
commit 4328b2c75f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/pioasm/python_output.cpp
View File

@ -195,9 +195,12 @@ struct python_output : public output_format {
if (arg2 & 0x8u) { if (arg2 & 0x8u) {
invalid = true; invalid = true;
} else { } else {
guts = "irq, " + std::to_string(arg2 & 7u); guts = "irq, ";
auto irq = std::to_string(arg2 & 7u);
if (arg2 & 0x10u) { if (arg2 & 0x10u) {
guts += " rel"; guts += "rel(" + irq + ")";
} else {
guts += irq;
} }
} }
break; break;
@ -233,12 +236,11 @@ struct python_output : public output_format {
std::string guts = ""; std::string guts = "";
if (arg1 & 4u) { if (arg1 & 4u) {
op("pull"); op("pull");
if (arg1 & 2u) guts = "ifempty"; if (arg1 & 2u) guts = "ifempty, ";
} else { } else {
op("push"); op("push");
if (arg1 & 2u) guts = "iffull"; if (arg1 & 2u) guts = "iffull, ";
} }
guts += ", ";
guts += ((arg1 & 0x1u) ? "block" : "noblock"); guts += ((arg1 & 0x1u) ? "block" : "noblock");
op_guts(guts); op_guts(guts);
} }
@ -279,15 +281,17 @@ struct python_output : public output_format {
op("irq"); op("irq");
std::string guts; std::string guts;
if (arg1 & 0x2u) { if (arg1 & 0x2u) {
guts += "clear "; guts += "clear, ";
} else if (arg1 & 0x1u) { } else if (arg1 & 0x1u) {
guts += "wait "; guts += "wait, ";
} else { } else {
guts += "nowait "; guts += "nowait, ";
} }
guts += std::to_string(arg2 & 7u); auto irq = std::to_string(arg2 & 7u);
if (arg2 & 0x10u) { if (arg2 & 0x10u) {
guts += " rel"; guts += "rel(" + irq + ")";
} else {
guts += irq;
} }
op_guts(guts); op_guts(guts);
} }