summaryrefslogtreecommitdiff
path: root/risc-v/hgen/parser.hgen
diff options
context:
space:
mode:
authorRobert Norton2017-08-11 15:47:08 +0100
committerRobert Norton2017-08-11 15:47:08 +0100
commitf8a186733a4a8afd90ef733ca32df92eb6bcecd9 (patch)
treeba5aae186938850e7aa457bf5f3cf61298097f57 /risc-v/hgen/parser.hgen
parentad0d53e799c0a3dcb2548a42554d5dcae7de5a01 (diff)
further riscv rmem integration.
Diffstat (limited to 'risc-v/hgen/parser.hgen')
-rw-r--r--risc-v/hgen/parser.hgen8
1 files changed, 4 insertions, 4 deletions
diff --git a/risc-v/hgen/parser.hgen b/risc-v/hgen/parser.hgen
index ba4dcac7..abd87c7f 100644
--- a/risc-v/hgen/parser.hgen
+++ b/risc-v/hgen/parser.hgen
@@ -1,5 +1,5 @@
| UTYPE reg COMMA NUM
- { `RISCVUTYPE($4, $2, $1.o) }
+ { `RISCVUTYPE($4, $2, $1.op) }
| JAL reg COMMA NUM
{ `RISCVJAL($4, $2) }
| JALR reg COMMA reg COMMA NUM
@@ -7,15 +7,15 @@
| BTYPE reg COMMA reg COMMA NUM
{ `RISCVBType($6, $4, $2, $1.op) }
| ITYPE reg COMMA reg COMMA NUM
- { `RISCVIType(o$6, $4, $2, $1.op) }
+ { `RISCVIType($6, $4, $2, $1.op) }
| SHIFTIOP reg COMMA reg COMMA NUM
{ `RISCVShiftIop($6, $4, $2, $1.op) }
| RTYPE reg COMMA reg COMMA reg
- { `RISCVRType ($6, $3, $2, $1.op) }
+ { `RISCVRType ($6, $4, $2, $1.op) }
| LOAD reg COMMA NUM LPAR reg RPAR
{ `RISCVLoad($4, $6, $2, $1.unsigned, $1.width) }
| STORE reg COMMA NUM LPAR reg RPAR
- { `RISCVStore($4, $6, $2, $1.width) } (* reg order? *)
+ { `RISCVStore($4, $6, $2, $1.width) }
| ADDIW reg COMMA reg COMMA NUM
{ `RISCVADDIW ($6, $4, $2) }
| SHIFTW reg COMMA reg COMMA NUM