From 0b719a4b576a3ea1520193ab5a28442a939a5e4b Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Mon, 10 Jul 2023 20:39:02 +0200 Subject: [PATCH] fixes literal type --- gen_input/templates/CORENAME.h.gtl | 2 +- src/iss/arch/tgc_c.h | 2 +- src/vm/interp/vm_tgc_c.cpp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gen_input/templates/CORENAME.h.gtl b/gen_input/templates/CORENAME.h.gtl index 45a3ed7..2debd97 100644 --- a/gen_input/templates/CORENAME.h.gtl +++ b/gen_input/templates/CORENAME.h.gtl @@ -55,7 +55,7 @@ def byteSize(int size){ return 128; } def getCString(def val){ - return val.toString() + return val.toString()+'ULL' } %> #ifndef _${coreDef.name.toUpperCase()}_H_ diff --git a/src/iss/arch/tgc_c.h b/src/iss/arch/tgc_c.h index 611ef79..2f33ca5 100644 --- a/src/iss/arch/tgc_c.h +++ b/src/iss/arch/tgc_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", "NEXT_PC", "PRIV", "DPC"}}; - enum constants {MISA_VAL=1073746180, MARCHID_VAL=2147483651, XLEN=32, INSTR_ALIGNMENT=2, RFS=32, fence=0, fencei=1, fencevmal=2, fencevmau=3, CSR_SIZE=4096, MUL_LEN=64}; + enum constants {MISA_VAL=1073746180ULL, MARCHID_VAL=2147483651ULL, XLEN=32ULL, INSTR_ALIGNMENT=2ULL, RFS=32ULL, fence=0ULL, fencei=1ULL, fencevmal=2ULL, fencevmau=3ULL, CSR_SIZE=4096ULL, MUL_LEN=64ULL}; constexpr static unsigned FP_REGS_SIZE = 0; diff --git a/src/vm/interp/vm_tgc_c.cpp b/src/vm/interp/vm_tgc_c.cpp index d1e6596..3b409df 100644 --- a/src/vm/interp/vm_tgc_c.cpp +++ b/src/vm/interp/vm_tgc_c.cpp @@ -2635,7 +2635,7 @@ typename vm_base::virt_addr_t vm_impl::execute_inst(finish_cond_e co return pc; } -} +} // namespace tgc_c template <> std::unique_ptr create(arch::tgc_c *core, unsigned short port, bool dump) { @@ -2667,4 +2667,3 @@ volatile std::array dummy = { }; } } -