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

debug: add a 'wfi' to compliance test.

This commit is contained in:
mwachs5 2017-06-27 22:29:35 -07:00 committed by Megan Wachs
parent 9e76ec1779
commit 222850df55
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/target/riscv/opcodes.h
View File

@ -210,6 +210,9 @@ static uint32_t ebreak(void) { return MATCH_EBREAK; }
static uint32_t ebreak_c(void) __attribute__ ((unused)); static uint32_t ebreak_c(void) __attribute__ ((unused));
static uint32_t ebreak_c(void) { return MATCH_C_EBREAK; } static uint32_t ebreak_c(void) { return MATCH_C_EBREAK; }
static uint32_t wfi(void) __attribute__ ((unused));
static uint32_t wfi(void) { return MATCH_WFI; }
static uint32_t fence_i(void) __attribute__ ((unused)); static uint32_t fence_i(void) __attribute__ ((unused));
static uint32_t fence_i(void) static uint32_t fence_i(void)
{ {

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

@ -2330,6 +2330,8 @@ int riscv013_test_compliance(struct target *target) {
riscv_program_init(&program, target); riscv_program_init(&program, target);
riscv_addr_t addr = riscv_program_alloc_x(&program); riscv_addr_t addr = riscv_program_alloc_x(&program);
riscv_program_lx(&program, GDB_REGNO_S0, addr); riscv_program_lx(&program, GDB_REGNO_S0, addr);
// Also testing that WFI() is a NOP during debug mode.
riscv_program_insert(&program, wfi());
riscv_program_addi(&program, GDB_REGNO_S0, GDB_REGNO_S0, 1); riscv_program_addi(&program, GDB_REGNO_S0, GDB_REGNO_S0, 1);
riscv_program_sx(&program, GDB_REGNO_S0, addr); riscv_program_sx(&program, GDB_REGNO_S0, addr);
riscv_program_write_ram(&program, addr + 4, 0); riscv_program_write_ram(&program, addr + 4, 0);
@ -2367,6 +2369,8 @@ int riscv013_test_compliance(struct target *target) {
"ABSTRACTAUTO should cause COMMAND to run the expected number of times."); "ABSTRACTAUTO should cause COMMAND to run the expected number of times.");
} }
// DCSR Tests
LOG_INFO("PASSED %d of %d TESTS\n", passed_tests, total_tests); LOG_INFO("PASSED %d of %d TESTS\n", passed_tests, total_tests);
if (total_tests == passed_tests) { if (total_tests == passed_tests) {