zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #189 from riscv/examine_err 

Add some error checking to examine().
compliance_dev
Tim Newsome 2018-01-19 17:06:34 -08:00 committed by GitHub
parent 446044db89 3839cbf0ad
commit 5ea8bb90df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1212,8 +1212,12 @@ static int examine(struct target *target)
break; break;
r->hart_count = i + 1; r->hart_count = i + 1;
if (!riscv_is_halted(target)) if (!riscv_is_halted(target)) {
riscv013_halt_current_hart(target); if (riscv013_halt_current_hart(target) != ERROR_OK) {
LOG_ERROR("Fatal: Hart %d failed to halt during examine()", i);
return ERROR_FAIL;
}
}
/* Without knowing anything else we can at least mess with the /* Without knowing anything else we can at least mess with the
* program buffer. */ * program buffer. */
@ -1225,7 +1229,10 @@ static int examine(struct target *target)
else else
r->xlen[i] = 32; r->xlen[i] = 32;
register_read_direct(target, &r->misa, GDB_REGNO_MISA); if (register_read_direct(target, &r->misa, GDB_REGNO_MISA)) {
LOG_ERROR("Fatal: Failed to read MISA from hart %d.", i);
return ERROR_FAIL;
}
/* Now init registers based on what we discovered. */ /* Now init registers based on what we discovered. */
if (riscv_init_registers(target) != ERROR_OK) if (riscv_init_registers(target) != ERROR_OK)