summaryrefslogtreecommitdiff
path: root/rtl/core/decode/isa.sv
diff options
context:
space:
mode:
authorAlejandro Soto <alejandro@34project.org>2022-11-16 00:03:11 -0600
committerAlejandro Soto <alejandro@34project.org>2022-11-16 00:03:11 -0600
commit86903ec40acd3014861d856660a27f6a131d8ca3 (patch)
tree875e7b1d6da0962667e55607748c0abe11f543a5 /rtl/core/decode/isa.sv
parentd9dfa098323bc9ffdc9e976bd4106efc75b2954a (diff)
Fix decoding of LDST_MISC group
Diffstat (limited to 'rtl/core/decode/isa.sv')
-rw-r--r--rtl/core/decode/isa.sv8
1 files changed, 3 insertions, 5 deletions
diff --git a/rtl/core/decode/isa.sv b/rtl/core/decode/isa.sv
index 3e3a6d1..4f2578d 100644
--- a/rtl/core/decode/isa.sv
+++ b/rtl/core/decode/isa.sv
@@ -125,12 +125,10 @@
`define INSN_STM_CUR 28'b100_?_?_0_?_0_????_????????????????
`define INSN_STM_USR 28'b100_?_?_1_0_0_????_????????????????
-`define GROUP_LDST_SINGLE 28'b01_?_?_?_?_?_?_????_????_????????????
`define GROUP_LDST_SINGLE_IMM 28'b01_0_?_?_?_?_?_????_????_????????????
`define GROUP_LDST_SINGLE_REG 28'b01_1_?_?_?_?_?_????_????_?????_??_0_????
-`define GROUP_LDST_MISC 28'b000_?_?_?_?_?_????_????_????_1_?_?_1_????
-`define GROUP_LDST_MISC_IMM 28'b000_?_?_1_?_?_????_????_????_1_?_?_1_????
-`define GROUP_LDST_MISC_REG 28'b000_?_?_0_?_?_????_????_0000_1_?_?_1_????
+`define GROUP_LDST_SINGLE `GROUP_LDST_SINGLE_IMM, `GROUP_LDST_SINGLE_REG
+`define GROUP_LDST_MISC `INSN_LDRH, `INSN_LDRSB, `INSN_LDRSH, `INSN_STRH
`define GROUP_LDST_MULT 28'b100_?_?_?_?_?_????_????????????????
`define FIELD_LDST_LD [20]
@@ -144,7 +142,7 @@
`define FIELD_LDST_MISC_P [24]
`define FIELD_LDST_MISC_U [23]
-`define FIELD_LDST_MISC_REG [22]
+`define FIELD_LDST_MISC_IMM [22]
`define FIELD_LDST_MISC_W [21]
`define FIELD_LDST_MISC_RN [19:16]
`define FIELD_LDST_MISC_RD [15:12]