Use updated macros, which take arguments as expected.

This is more to test the debug changes than to improve OpenOCD in any
way.

Change-Id: If2c3424af89f93952049a519108762a0644405ec
Signed-off-by: Tim Newsome <tim@sifive.com>
This commit is contained in:
Tim Newsome 2022-04-30 09:55:12 -07:00
parent 31812cd13f
commit 788c364031
2 changed files with 501 additions and 523 deletions

File diff suppressed because it is too large Load Diff

View File

@ -710,7 +710,7 @@ static int add_trigger(struct target *target, struct trigger *trigger)
int result = riscv_get_register(target, &tdata1, GDB_REGNO_TDATA1);
if (result != ERROR_OK)
return result;
int type = get_field(tdata1, MCONTROL_TYPE(riscv_xlen(target)));
int type = get_field(tdata1, CSR_MCONTROL_TYPE(riscv_xlen(target)));
result = ERROR_OK;
switch (type) {
@ -3929,7 +3929,7 @@ int riscv_enumerate_triggers(struct target *target)
if (result != ERROR_OK)
return result;
int type = get_field(tdata1, MCONTROL_TYPE(riscv_xlen(target)));
int type = get_field(tdata1, CSR_MCONTROL_TYPE(riscv_xlen(target)));
if (type == 0)
break;
switch (type) {