From da7e29fbb7f6aed3b35a09af1d829dad0d2d684b Mon Sep 17 00:00:00 2001 From: eyck Date: Fri, 1 Jan 2021 09:19:48 +0000 Subject: [PATCH] update definitions of derived constants --- gen_input/CoreDSL-Instruction-Set-Description | 2 +- gen_input/TGFS.core_desc | 1 - incl/iss/arch/tgf_c.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gen_input/CoreDSL-Instruction-Set-Description b/gen_input/CoreDSL-Instruction-Set-Description index 3786181..ab8ac70 160000 --- a/gen_input/CoreDSL-Instruction-Set-Description +++ b/gen_input/CoreDSL-Instruction-Set-Description @@ -1 +1 @@ -Subproject commit 378618192944debf5a5dee759aa1a517aec0941b +Subproject commit ab8ac7045927ca1d12e0142c476cd2e146083169 diff --git a/gen_input/TGFS.core_desc b/gen_input/TGFS.core_desc index cc22ca1..f2d668b 100644 --- a/gen_input/TGFS.core_desc +++ b/gen_input/TGFS.core_desc @@ -18,7 +18,6 @@ Core TGF_C provides RV32I, RV32M, RV32IC { constants { unsigned XLEN=32; unsigned PCLEN=32; - unsigned MUL_LEN=64; // definitions for the architecture wrapper // XL ZYXWVUTSRQPONMLKJIHGFEDCBA unsigned MISA_VAL=0b01000000000000000001000100000100; diff --git a/incl/iss/arch/tgf_c.h b/incl/iss/arch/tgf_c.h index 2c2fee7..d1db620 100644 --- a/incl/iss/arch/tgf_c.h +++ b/incl/iss/arch/tgf_c.h @@ -53,7 +53,7 @@ template <> struct traits { static constexpr std::array reg_aliases{ {"ZERO", "RA", "SP", "GP", "TP", "T0", "T1", "T2", "S0", "S1", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9", "S10", "S11", "T3", "T4", "T5", "T6", "PC"}}; - enum constants {XLEN=32, PCLEN=32, MUL_LEN=64, MISA_VAL=0b1000000000000000001000100000100, PGSIZE=0x1000, PGMASK=0xfff, CSR_SIZE=4096, fence=0, fencei=1, fencevmal=2, fencevmau=3}; + enum constants {XLEN=32, PCLEN=32, MISA_VAL=0b1000000000000000001000100000100, PGSIZE=0x1000, PGMASK=0xfff, CSR_SIZE=4096, fence=0, fencei=1, fencevmal=2, fencevmau=3, MUL_LEN=64}; constexpr static unsigned FP_REGS_SIZE = 0;