rename _zext_xlen

diff --git a/riscv/decode.h b/riscv/decode.h
index f7a8f10d39d1005503dc3d049984d70229521a18..22573275fd5d59d85af4a2617d560c890e00b834 100644 (file)
--- a/riscv/decode.h
+++ b/riscv/decode.h
@@ -198,12 +198,16 @@ private:
 
 #define sext32(x) ((sreg_t)(int32_t)(x))
 #define zext32(x) ((reg_t)(uint32_t)(x))
+
+#define _sext_xlen(x) (((sreg_t)(x) << (64-xlen)) >> (64-xlen))
 #define sext_xlen(x) (((sreg_t)(x) << (64-xlen)) >> (64-xlen))
+
+#define _zext_xlen(x) (((reg_t)(x) << (64-xlen)) >> (64-xlen))
 #define zext_xlen(x) (((reg_t)(x) << (64-xlen)) >> (64-xlen))
 
 #define _set_pc(x) \
   do { p->check_pc_alignment(x); \
-       npc = sext_xlen(x); \
+       npc = _sext_xlen(x); \
      } while(0)
 
 #ifndef SPIKE_SIMPLEV

diff --git a/riscv/processor.cc b/riscv/processor.cc
index 0b6dcfad0f3c86ca0f8936cd6b45cad999084c0d..9aa17a8234f135eca2f72ebf60e8c2ed9db00864 100644 (file)
--- a/riscv/processor.cc
+++ b/riscv/processor.cc
@@ -335,7 +335,7 @@ int processor_t::paddr_bits()
 
 void processor_t::set_csr(int which, reg_t val)
 {
-  val = zext_xlen(val);
+  val = _zext_xlen(val);
   reg_t delegable_ints = MIP_SSIP | MIP_STIP | MIP_SEIP
                        | ((ext != NULL) << IRQ_COP);
   reg_t all_ints = delegable_ints | MIP_MSIP | MIP_MTIP;