ndsv5: Fixed CSR_MRVARCH_CFG3 condition (RV64)

Change-Id: Ie2b666e6be1014f98480e74dd421e405f092789b Signed-off-by: Hellosun Wu <[email protected]>
andestech · Jul 12, 2024 · c8d08e7 · c8d08e7
1 parent d67c566
commit c8d08e7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/target/ndsv5_cmd.c b/src/target/ndsv5_cmd.c
@@ -2724,8 +2724,10 @@ static int ndsv5_init_option_reg(struct target *target)
 		}
 
 		/* mrvarch_cfg.MRVARCH_EXT3[63] == 1 */
-		if ((reg_mrvarch_value & 0x8000000000000000) == 0)
+		if ((riscv_xlen(target) == 64) && ((reg_mrvarch_value & 0x8000000000000000) == 0)) {
 			target->reg_cache->reg_list[GDB_REGNO_CSR0 + CSR_MRVARCH_CFG3].exist = false;
+			NDS_INFO("disable CSR_MRVARCH_CFG3 register");
+		}
 	}
 
 
@@ -2740,8 +2742,10 @@ static int ndsv5_init_option_reg(struct target *target)
 			uint64_t reg_mrvarch2_value = buf_get_u64(p_cur_reg->value, 0, p_cur_reg->size);
 
 			/* RV32, mrvarch_cfg2.MRVARCH_EXT3[31] == 1 */
-			if ((reg_mrvarch2_value & 0x80000000) == 0)
+			if ((reg_mrvarch2_value & 0x80000000) == 0) {
 				target->reg_cache->reg_list[GDB_REGNO_CSR0 + CSR_MRVARCH_CFG3].exist = false;
+				NDS_INFO("disable CSR_MRVARCH_CFG3 register");
+			}
 		}
 
 		if (!target->reg_cache->reg_list[GDB_REGNO_CSR0 + CSR_MCACHE_CTL].exist) {