interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1170 from fk-sc/fk-sc/priv-mod 

target/riscv: decrease modify_privilege function nesting level
This commit is contained in:
Evgeniy Naydanov 2024-11-26 17:26:49 +03:00 committed by GitHub
parent 658766858d 8b7013028c
commit eb1ecd7d10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/target/riscv/riscv-013.c
View File

@ -3092,36 +3092,48 @@ static int read_sbcs_nonbusy(struct target *target, uint32_t *sbcs)
} }
} }
/* TODO: return mem_access_result_t */
static int modify_privilege(struct target *target, uint64_t *mstatus, uint64_t *mstatus_old) static int modify_privilege(struct target *target, uint64_t *mstatus, uint64_t *mstatus_old)
{ {
if (riscv_virt2phys_mode_is_hw(target) assert(mstatus);
&& has_sufficient_progbuf(target, 5)) { assert(mstatus_old);
/* Read DCSR */ if (!riscv_virt2phys_mode_is_hw(target))
uint64_t dcsr; return ERROR_OK;
if (register_read_direct(target, &dcsr, GDB_REGNO_DCSR) != ERROR_OK)
return ERROR_FAIL;
/* Read and save MSTATUS */ /* TODO: handle error in this case
if (register_read_direct(target, mstatus, GDB_REGNO_MSTATUS) != ERROR_OK) * modify_privilege function used only for program buffer memory access.
return ERROR_FAIL; * Privilege modification requires progbuf size to be at least 5 */
*mstatus_old = *mstatus; if (!has_sufficient_progbuf(target, 5)) {
LOG_TARGET_WARNING(target, "Can't modify privilege to provide "
/* If we come from m-mode with mprv set, we want to keep mpp */ "hardware translation: program buffer too small.");
if (get_field(dcsr, CSR_DCSR_PRV) < 3) { return ERROR_OK;
/* MPP = PRIV */
*mstatus = set_field(*mstatus, MSTATUS_MPP, get_field(dcsr, CSR_DCSR_PRV));
/* MPRV = 1 */
*mstatus = set_field(*mstatus, MSTATUS_MPRV, 1);
/* Write MSTATUS */
if (*mstatus != *mstatus_old)
if (register_write_direct(target, GDB_REGNO_MSTATUS, *mstatus) != ERROR_OK)
return ERROR_FAIL;
}
} }
return ERROR_OK; /* Read DCSR */
riscv_reg_t dcsr;
if (register_read_direct(target, &dcsr, GDB_REGNO_DCSR) != ERROR_OK)
return ERROR_FAIL;
/* Read and save MSTATUS */
if (register_read_direct(target, mstatus, GDB_REGNO_MSTATUS) != ERROR_OK)
return ERROR_FAIL;
*mstatus_old = *mstatus;
/* If we come from m-mode with mprv set, we want to keep mpp */
if (get_field(dcsr, CSR_DCSR_PRV) == PRV_M)
return ERROR_OK;
/* mstatus.mpp <- dcsr.prv */
*mstatus = set_field(*mstatus, MSTATUS_MPP, get_field(dcsr, CSR_DCSR_PRV));
/* mstatus.mprv <- 1 */
*mstatus = set_field(*mstatus, MSTATUS_MPRV, 1);
/* Write MSTATUS */
if (*mstatus == *mstatus_old)
return ERROR_OK;
return register_write_direct(target, GDB_REGNO_MSTATUS, *mstatus);
} }
static int read_memory_bus_v0(struct target *target, target_addr_t address, static int read_memory_bus_v0(struct target *target, target_addr_t address,