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

riscv-compliance: whitespace fixes

This commit is contained in:
Megan Wachs 2018-02-13 13:06:44 -08:00
parent 2e525e391f
commit 313885cb3b
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1975,7 +1975,7 @@ static int riscv013_halt_current_hart(struct target *target)
/* Issue the halt command, and then wait for the current hart to halt. */ /* Issue the halt command, and then wait for the current hart to halt. */
uint32_t dmcontrol = dmi_read(target, DMI_DMCONTROL); uint32_t dmcontrol = dmi_read(target, DMI_DMCONTROL);
dmcontrol |= DMI_DMCONTROL_HALTREQ; dmcontrol = set_field(dmcontrol, DMI_DMCONTROL_HALTREQ, 1);
dmi_write(target, DMI_DMCONTROL, dmcontrol); dmi_write(target, DMI_DMCONTROL, dmcontrol);
for (size_t i = 0; i < 256; ++i) for (size_t i = 0; i < 256; ++i)
if (riscv_is_halted(target)) if (riscv_is_halted(target))
@ -1991,7 +1991,7 @@ static int riscv013_halt_current_hart(struct target *target)
return ERROR_FAIL; return ERROR_FAIL;
} }
dmcontrol &= ~DMI_DMCONTROL_HALTREQ; dmcontrol = set_field(dmcontrol, DMI_DMCONTROL_HALTREQ, 0);
dmi_write(target, DMI_DMCONTROL, dmcontrol); dmi_write(target, DMI_DMCONTROL, dmcontrol);
return ERROR_OK; return ERROR_OK;
@ -2255,8 +2255,6 @@ int riscv013_test_compliance(struct target *target) {
COMPLIANCE_TEST(((testvar == 0) || (get_field(dmcontrol, DMI_DMCONTROL_HASEL)) == 0), "DMCONTROL.hasel can be 0 or RW."); COMPLIANCE_TEST(((testvar == 0) || (get_field(dmcontrol, DMI_DMCONTROL_HASEL)) == 0), "DMCONTROL.hasel can be 0 or RW.");
//TODO: test that hamask registers exist if hasel does. //TODO: test that hamask registers exist if hasel does.
// TODO: ndmreset
// haltreq // haltreq
riscv_halt_all_harts(target); riscv_halt_all_harts(target);
// Writing haltreq should not cause any problems for a halted hart, but we // Writing haltreq should not cause any problems for a halted hart, but we