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

Fix off-by-one error in assert. 

Also only do work for debug RAM that actually exists on the target
(exposing the off-by-one error on 32-bit targets).

Change-Id: I37e0005b6a70e949286f1d6494716f3abea03c12
__archive__
Tim Newsome 2016-09-29 10:40:50 -07:00
parent 4dbc9962d3
commit e273e23f41
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/target/riscv/riscv.c
View File

@ -613,13 +613,13 @@ static void scans_add_write_store(scans_t *scans, uint16_t address,
static void scans_add_read32(scans_t *scans, uint16_t address, bool set_interrupt) static void scans_add_read32(scans_t *scans, uint16_t address, bool set_interrupt)
{ {
assert(scans->next_scan < scans->scan_count);
const unsigned int i = scans->next_scan; const unsigned int i = scans->next_scan;
int data_offset = scans->scan_size * i; int data_offset = scans->scan_size * i;
add_dbus_scan(scans->target, &scans->field[i], scans->out + data_offset, add_dbus_scan(scans->target, &scans->field[i], scans->out + data_offset,
scans->in + data_offset, DBUS_OP_READ, address, scans->in + data_offset, DBUS_OP_READ, address,
(set_interrupt ? DMCONTROL_INTERRUPT : 0) | DMCONTROL_HALTNOT); (set_interrupt ? DMCONTROL_INTERRUPT : 0) | DMCONTROL_HALTNOT);
scans->next_scan++; scans->next_scan++;
assert(scans->next_scan < scans->scan_count);
} }
static void scans_add_read(scans_t *scans, slot_t slot, bool set_interrupt) static void scans_add_read(scans_t *scans, slot_t slot, bool set_interrupt)
@ -792,7 +792,7 @@ static void dump_debug_ram(struct target *target)
static void cache_invalidate(struct target *target) static void cache_invalidate(struct target *target)
{ {
riscv_info_t *info = (riscv_info_t *) target->arch_info; riscv_info_t *info = (riscv_info_t *) target->arch_info;
for (unsigned int i = 0; i < DRAM_CACHE_SIZE; i++) { for (unsigned int i = 0; i < info->dramsize; i++) {
info->dram_cache[i].valid = false; info->dram_cache[i].valid = false;
info->dram_cache[i].dirty = false; info->dram_cache[i].dirty = false;
} }
@ -803,7 +803,7 @@ static void cache_invalidate(struct target *target)
static void cache_clean(struct target *target) static void cache_clean(struct target *target)
{ {
riscv_info_t *info = (riscv_info_t *) target->arch_info; riscv_info_t *info = (riscv_info_t *) target->arch_info;
for (unsigned int i = 0; i < DRAM_CACHE_SIZE; i++) { for (unsigned int i = 0; i < info->dramsize; i++) {
if (i >= 4) { if (i >= 4) {
info->dram_cache[i].valid = false; info->dram_cache[i].valid = false;
} }
@ -816,7 +816,7 @@ static int cache_check(struct target *target)
riscv_info_t *info = (riscv_info_t *) target->arch_info; riscv_info_t *info = (riscv_info_t *) target->arch_info;
int error = 0; int error = 0;
for (unsigned int i = 0; i < DRAM_CACHE_SIZE; i++) { for (unsigned int i = 0; i < info->dramsize; i++) {
if (info->dram_cache[i].valid && !info->dram_cache[i].dirty) { if (info->dram_cache[i].valid && !info->dram_cache[i].dirty) {
if (dram_check32(target, i, info->dram_cache[i].data) != ERROR_OK) { if (dram_check32(target, i, info->dram_cache[i].data) != ERROR_OK) {
error++; error++;
@ -839,22 +839,22 @@ static int cache_write(struct target *target, unsigned int address, bool run)
{ {
LOG_DEBUG("enter"); LOG_DEBUG("enter");
riscv_info_t *info = (riscv_info_t *) target->arch_info; riscv_info_t *info = (riscv_info_t *) target->arch_info;
scans_t *scans = scans_new(target, DRAM_CACHE_SIZE + 2); scans_t *scans = scans_new(target, info->dramsize + 2);
unsigned int last = DRAM_CACHE_SIZE; unsigned int last = info->dramsize;
for (unsigned int i = 0; i < DRAM_CACHE_SIZE; i++) { for (unsigned int i = 0; i < info->dramsize; i++) {
if (info->dram_cache[i].dirty) { if (info->dram_cache[i].dirty) {
assert(i < info->dramsize); assert(i < info->dramsize);
last = i; last = i;
} }
} }
if (last == DRAM_CACHE_SIZE) { if (last == info->dramsize) {
// Nothing needs to be written to RAM. // Nothing needs to be written to RAM.
dbus_write(target, DMCONTROL, DMCONTROL_HALTNOT | DMCONTROL_INTERRUPT); dbus_write(target, DMCONTROL, DMCONTROL_HALTNOT | DMCONTROL_INTERRUPT);
} else { } else {
for (unsigned int i = 0; i < DRAM_CACHE_SIZE; i++) { for (unsigned int i = 0; i < info->dramsize; i++) {
if (info->dram_cache[i].dirty) { if (info->dram_cache[i].dirty) {
bool set_interrupt = (i == last && run); bool set_interrupt = (i == last && run);
scans_add_write32(scans, i, info->dram_cache[i].data, scans_add_write32(scans, i, info->dram_cache[i].data,