From 67e38a4a6aa443314be1234867a2bd408a017768 Mon Sep 17 00:00:00 2001 From: Tim Fischer Date: Thu, 25 Jul 2024 09:40:33 +0200 Subject: [PATCH] Remove C encoding instructions again --- hw/snitch/src/riscv_instr.sv | 35 ----------------------------------- util/generate-opcodes.sh | 2 +- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/hw/snitch/src/riscv_instr.sv b/hw/snitch/src/riscv_instr.sv index ca18aa32b8..565aef730a 100644 --- a/hw/snitch/src/riscv_instr.sv +++ b/hw/snitch/src/riscv_instr.sv @@ -5,41 +5,6 @@ // verilog_lint: waive-start parameter-name-style /* Automatically generated by parse_opcodes */ package riscv_instr; - localparam logic [31:0] C_NOP = 32'b????????????????0000000000000001; - localparam logic [31:0] C_ADDI16SP = 32'b????????????????011?00010?????01; - localparam logic [31:0] C_JR = 32'b????????????????1000?????0000010; - localparam logic [31:0] C_JALR = 32'b????????????????1001?????0000010; - localparam logic [31:0] C_EBREAK = 32'b????????????????1001000000000010; - localparam logic [31:0] C_ADDI4SPN = 32'b????????????????000???????????00; - localparam logic [31:0] C_FLD = 32'b????????????????001???????????00; - localparam logic [31:0] C_LW = 32'b????????????????010???????????00; - localparam logic [31:0] C_FLW = 32'b????????????????011???????????00; - localparam logic [31:0] C_FSD = 32'b????????????????101???????????00; - localparam logic [31:0] C_SW = 32'b????????????????110???????????00; - localparam logic [31:0] C_FSW = 32'b????????????????111???????????00; - localparam logic [31:0] C_ADDI = 32'b????????????????000???????????01; - localparam logic [31:0] C_JAL = 32'b????????????????001???????????01; - localparam logic [31:0] C_LI = 32'b????????????????010???????????01; - localparam logic [31:0] C_LUI = 32'b????????????????011???????????01; - localparam logic [31:0] C_SRLI = 32'b????????????????100?00????????01; - localparam logic [31:0] C_SRAI = 32'b????????????????100?01????????01; - localparam logic [31:0] C_ANDI = 32'b????????????????100?10????????01; - localparam logic [31:0] C_SUB = 32'b????????????????100011???00???01; - localparam logic [31:0] C_XOR = 32'b????????????????100011???01???01; - localparam logic [31:0] C_OR = 32'b????????????????100011???10???01; - localparam logic [31:0] C_AND = 32'b????????????????100011???11???01; - localparam logic [31:0] C_J = 32'b????????????????101???????????01; - localparam logic [31:0] C_BEQZ = 32'b????????????????110???????????01; - localparam logic [31:0] C_BNEZ = 32'b????????????????111???????????01; - localparam logic [31:0] C_SLLI = 32'b????????????????000???????????10; - localparam logic [31:0] C_FLDSP = 32'b????????????????001???????????10; - localparam logic [31:0] C_LWSP = 32'b????????????????010???????????10; - localparam logic [31:0] C_FLWSP = 32'b????????????????011???????????10; - localparam logic [31:0] C_MV = 32'b????????????????1000??????????10; - localparam logic [31:0] C_ADD = 32'b????????????????1001??????????10; - localparam logic [31:0] C_FSDSP = 32'b????????????????101???????????10; - localparam logic [31:0] C_SWSP = 32'b????????????????110???????????10; - localparam logic [31:0] C_FSWSP = 32'b????????????????111???????????10; localparam logic [31:0] SLLI_RV32 = 32'b0000000??????????001?????0010011; localparam logic [31:0] SRLI_RV32 = 32'b0000000??????????101?????0010011; localparam logic [31:0] SRAI_RV32 = 32'b0100000??????????101?????0010011; diff --git a/util/generate-opcodes.sh b/util/generate-opcodes.sh index f65377dc0e..dff8962e6d 100755 --- a/util/generate-opcodes.sh +++ b/util/generate-opcodes.sh @@ -8,7 +8,7 @@ set -e ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd) RISCV_OPCODES=$ROOT/sw/deps/riscv-opcodes -OPCODES=(opcodes-rvc opcodes-pseudo opcodes-rv32i opcodes-rv64i opcodes-rv32m opcodes-rv64m opcodes-rv32a opcodes-rv64a opcodes-rv32h opcodes-rv64h opcodes-rv32f opcodes-rv64f opcodes-rv32d opcodes-rv64d opcodes-rv32q opcodes-rv64q opcodes-system opcodes-custom opcodes-rv32b_CUSTOM opcodes-dma_CUSTOM opcodes-frep_CUSTOM opcodes-ssr_CUSTOM opcodes-flt-occamy_CUSTOM opcodes-rvv-pseudo opcodes-shuffling) +OPCODES=(opcodes-pseudo opcodes-rv32i opcodes-rv64i opcodes-rv32m opcodes-rv64m opcodes-rv32a opcodes-rv64a opcodes-rv32h opcodes-rv64h opcodes-rv32f opcodes-rv64f opcodes-rv32d opcodes-rv64d opcodes-rv32q opcodes-rv64q opcodes-system opcodes-custom opcodes-rv32b_CUSTOM opcodes-dma_CUSTOM opcodes-frep_CUSTOM opcodes-ssr_CUSTOM opcodes-flt-occamy_CUSTOM opcodes-rvv-pseudo opcodes-shuffling) ####### # RTL #