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

target/riscv: sys bus v1 fix for sizes greater than 4 

read_memory_bus_v1 incorrectly copied data to output buffer

Signed-off-by: Parshintsev Anatoly <anatoly.parshintsev@syntacore.com>
This commit is contained in:
Parshintsev Anatoly 2024-08-03 13:56:52 +03:00
parent 5afed58fcd
commit ebb8c057a6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@
#include "target/target.h" #include "target/target.h"
#include "target/algorithm.h" #include "target/algorithm.h"
#include "target/target_type.h" #include "target/target_type.h"
#include <helper/align.h>
#include <helper/log.h> #include <helper/log.h>
#include "jtag/jtag.h" #include "jtag/jtag.h"
#include "target/register.h" #include "target/register.h"
@ -3349,6 +3350,9 @@ static int read_memory_bus_v1(struct target *target, target_addr_t address,
return ERROR_NOT_IMPLEMENTED; return ERROR_NOT_IMPLEMENTED;
} }
assert(size <= 16);
assert(IS_PWR_OF_2(size));
dm013_info_t *dm = get_dm(target); dm013_info_t *dm = get_dm(target);
if (!dm) if (!dm)
return ERROR_FAIL; return ERROR_FAIL;
@ -3384,7 +3388,6 @@ static int read_memory_bus_v1(struct target *target, target_addr_t address,
* be unnecessary. * be unnecessary.
*/ */
uint32_t sbvalue[4] = {0}; uint32_t sbvalue[4] = {0};
assert(size <= 16);
for (uint32_t i = (next_address - address) / size; i < count - 1; i++) { for (uint32_t i = (next_address - address) / size; i < count - 1; i++) {
const uint32_t size_in_words = DIV_ROUND_UP(size, 4); const uint32_t size_in_words = DIV_ROUND_UP(size, 4);
struct riscv_batch *batch = riscv_batch_alloc(target, size_in_words); struct riscv_batch *batch = riscv_batch_alloc(target, size_in_words);
@ -3405,10 +3408,10 @@ static int read_memory_bus_v1(struct target *target, target_addr_t address,
const size_t last_key = batch->read_keys_used - 1; const size_t last_key = batch->read_keys_used - 1;
for (size_t k = 0; k <= last_key; ++k) { for (size_t k = 0; k <= last_key; ++k) {
sbvalue[k] = riscv_batch_get_dmi_read_data(batch, sbvalue[k] = riscv_batch_get_dmi_read_data(batch, last_key - k);
last_key - k); buf_set_u32(buffer + i * size + k * 4, 0, MIN(32, 8 * size), sbvalue[k]);
buf_set_u32(buffer + i * size + k * 4, 0, 8 * size, sbvalue[k]);
} }
riscv_batch_free(batch); riscv_batch_free(batch);
const target_addr_t read_addr = address + i * increment; const target_addr_t read_addr = address + i * increment;
log_memory_access(read_addr, sbvalue, size, true); log_memory_access(read_addr, sbvalue, size, true);