Fix debug reset.

[riscv-isa-sim.git] / riscv / decode.h

diff --git a/riscv/decode.h b/riscv/decode.h
index 551f4515af226259f69617f29ce119ca3909be07..9dcd809eb70261e448f0deac980f1f74472b81c6 100644 (file)
--- a/riscv/decode.h
+++ b/riscv/decode.h
@@ -144,7 +144,7 @@ private:
   })
 # define WRITE_FREG(reg, value) ({ \
     freg_t wdata = freg(value); /* value may have side effects */ \
-    STATE.log_reg_write = (commit_log_reg_t){((reg) << 1) | 1, wdata}; \
+    STATE.log_reg_write = (commit_log_reg_t){((reg) << 1) | 1, wdata.v}; \
     DO_WRITE_FREG(reg, wdata); \
   })
 #endif
@@ -248,22 +248,6 @@ inline freg_t freg(freg_t f) { return f; }
 
 // Seems that 0x0 doesn't work.
 #define DEBUG_START             0x100
-
-#define DEBUG_ROM_ENTRY         0x400
-#define DEBUG_ROM_ENTRY_SIZE    (1024 * 4)
-#define DEBUG_ROM_CODE          (DEBUG_ROM_ENTRY + DEBUG_ROM_ENTRY_SIZE)
-#define DEBUG_ROM_CODE_SIZE     256
-#define DEBUG_ROM_EXCEPTION     (DEBUG_ROM_CODE + DEBUG_ROM_CODE_SIZE)
-#define DEBUG_ROM_EXCEPTION_SIZE        4
-
-#define DEBUG_DATA_START          0x380
-#define DEBUG_DATA_SIZE           0x20
-#define DEBUG_DATA_END            DEBUG_DATA_START + DEBUG_DATA_SIZE
-
-#define DEBUG_PROGBUF_SIZE        32
-#define DEBUG_PROGBUF_START       DEBUG_DATA_START - DEBUG_PROGBUF_SIZE
-#define DEBUG_PROGBUF_END         DEBUG_PROGBUF_START + DEBUG_PROGBUF_SIZE
-
-#define DEBUG_END                 0x2000 - 1
+#define DEBUG_END                 (0x1000 - 1)
 
 #endif