csr bug fix

tinebp · tinebp · commit a9d9de6c2033 · 2025-10-10T19:06:36.000-07:00
diff --git a/sim/simx/execute.cpp b/sim/simx/execute.cpp
@@ -1276,7 +1276,7 @@ instr_trace_t* Emulator::execute(const Instr &instr, uint32_t wid) {
             continue;
           Word csr_value = this->get_csr(csr_addr, wid, t);
           auto src_data = csrArgs.is_imm ? csrArgs.imm : rs1_data[t].i;
-          this->set_csr(csr_addr, src_data, t, wid);
+          this->set_csr(csr_addr, src_data, wid, t);
           rd_data[t].i = csr_value;
         }
       } break;
@@ -1287,7 +1287,7 @@ instr_trace_t* Emulator::execute(const Instr &instr, uint32_t wid) {
           Word csr_value = this->get_csr(csr_addr, wid, t);
           auto src_data = csrArgs.is_imm ? csrArgs.imm : rs1_data[t].i;
           if (src_data != 0) {
-            this->set_csr(csr_addr, csr_value | src_data, t, wid);
+            this->set_csr(csr_addr, csr_value | src_data, wid, t);
           }
           rd_data[t].i = csr_value;
         }
@@ -1299,7 +1299,7 @@ instr_trace_t* Emulator::execute(const Instr &instr, uint32_t wid) {
           Word csr_value = this->get_csr(csr_addr, wid, t);
           auto src_data = csrArgs.is_imm ? csrArgs.imm : rs1_data[t].i;
           if (src_data != 0) {
-            this->set_csr(csr_addr, csr_value & ~src_data, t, wid);
+            this->set_csr(csr_addr, csr_value & ~src_data, wid, t);
           }
           rd_data[t].i = csr_value;
         }

Original file line number	Diff line number	Diff line change
`@@ -1276,7 +1276,7 @@ instr_trace_t* Emulator::execute(const Instr &instr, uint32_t wid) {`
`1276`	`1276`	`continue;`
`1277`	`1277`	`Word csr_value = this->get_csr(csr_addr, wid, t);`
`1278`	`1278`	`auto src_data = csrArgs.is_imm ? csrArgs.imm : rs1_data[t].i;`
`1279`		`- this->set_csr(csr_addr, src_data, t, wid);`
	`1279`	`+ this->set_csr(csr_addr, src_data, wid, t);`
`1280`	`1280`	`rd_data[t].i = csr_value;`
`1281`	`1281`	`}`
`1282`	`1282`	`} break;`
`@@ -1287,7 +1287,7 @@ instr_trace_t* Emulator::execute(const Instr &instr, uint32_t wid) {`
`1287`	`1287`	`Word csr_value = this->get_csr(csr_addr, wid, t);`
`1288`	`1288`	`auto src_data = csrArgs.is_imm ? csrArgs.imm : rs1_data[t].i;`
`1289`	`1289`	`if (src_data != 0) {`
`1290`		`- this->set_csr(csr_addr, csr_value \| src_data, t, wid);`
	`1290`	`+ this->set_csr(csr_addr, csr_value \| src_data, wid, t);`
`1291`	`1291`	`}`
`1292`	`1292`	`rd_data[t].i = csr_value;`
`1293`	`1293`	`}`
`@@ -1299,7 +1299,7 @@ instr_trace_t* Emulator::execute(const Instr &instr, uint32_t wid) {`
`1299`	`1299`	`Word csr_value = this->get_csr(csr_addr, wid, t);`
`1300`	`1300`	`auto src_data = csrArgs.is_imm ? csrArgs.imm : rs1_data[t].i;`
`1301`	`1301`	`if (src_data != 0) {`
`1302`		`- this->set_csr(csr_addr, csr_value & ~src_data, t, wid);`
	`1302`	`+ this->set_csr(csr_addr, csr_value & ~src_data, wid, t);`
`1303`	`1303`	`}`
`1304`	`1304`	`rd_data[t].i = csr_value;`
`1305`	`1305`	`}`