-#ifdef RISCV_ENABLE_COMMITLOG
- #undef WRITE_REG
- #define WRITE_REG(reg, value) ({ \
- reg_t wdata = (value); /* value is a func with side-effects */ \
- STATE.log_reg_write = (commit_log_reg_t){(reg) << 1, wdata}; \
- STATE.XPR.write(reg, wdata); \
- })
+#ifndef RISCV_ENABLE_COMMITLOG
+# define WRITE_REG(reg, value) STATE.XPR.write(reg, value)
+# define WRITE_FREG(reg, value) DO_WRITE_FREG(reg, value)
+#else
+# define WRITE_REG(reg, value) ({ \
+ reg_t wdata = (value); /* value may have side effects */ \
+ STATE.log_reg_write = (commit_log_reg_t){(reg) << 1, wdata}; \
+ STATE.XPR.write(reg, wdata); \
+ })
+# define WRITE_FREG(reg, value) ({ \
+ freg_t wdata = (value); /* value may have side effects */ \
+ STATE.log_reg_write = (commit_log_reg_t){((reg) << 1) | 1, wdata}; \
+ DO_WRITE_FREG(reg, wdata); \
+ })