diff options
| author | Tim Newsome <tim@sifive.com> | 2017-06-14 13:59:08 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2017-06-15 12:24:37 -0700 |
| commit | 50a223ef9a673c1f2539ed8e350c476d147dcd67 (patch) | |
| tree | 66aa2a1329ff5b92bb80eed711d31bcd20ee216c | |
| parent | 1a693086210fb8609c1dbc79e4ba5559dea93e21 (diff) | |
| download | riscv-openocd-50a223ef9a673c1f2539ed8e350c476d147dcd67.zip riscv-openocd-50a223ef9a673c1f2539ed8e350c476d147dcd67.tar.gz riscv-openocd-50a223ef9a673c1f2539ed8e350c476d147dcd67.tar.bz2 | |
Fix print statements to work with 64-bit addresses
| -rw-r--r-- | src/target/riscv/riscv-013.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index 38bc6a0..b08872d 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -1212,7 +1212,8 @@ static int read_memory(struct target *target, target_addr_t address, { RISCV013_INFO(info); - LOG_DEBUG("reading %d words of %d bytes from 0x%08lx", count, size, (long)address); + LOG_DEBUG("reading %d words of %d bytes from 0x%" TARGET_PRIxADDR, count, + size, address); select_dmi(target); riscv_set_current_hartid(target, 0); @@ -1274,7 +1275,7 @@ static int read_memory(struct target *target, target_addr_t address, } uint32_t value = riscv_program_read_ram(&program, r_data); - LOG_DEBUG("M[0x%08lx] reads 0x%08lx", (long)address, (long)value); + LOG_DEBUG("M[0x%" TARGET_PRIxADDR "] reads 0x%08lx", address, (long)value); switch (size) { case 1: buffer[0] = value; @@ -1308,9 +1309,11 @@ static int read_memory(struct target *target, target_addr_t address, riscv_addr_t cur_addr = 0xbadbeef; riscv_addr_t fin_addr = address + (count * size); riscv_addr_t prev_addr = ((riscv_addr_t) address) - size; - LOG_DEBUG("writing until final address 0x%016lx", fin_addr); + LOG_DEBUG("writing until final address 0x%" PRIx64, fin_addr); while (count > 1 && (cur_addr = riscv_read_debug_buffer_x(target, d_addr)) < fin_addr) { - LOG_DEBUG("transferring burst starting at address 0x%016lx (previous burst was 0x%016lx)", cur_addr, prev_addr); + LOG_DEBUG("transferring burst starting at address 0x%" TARGET_PRIxADDR + " (previous burst was 0x%" TARGET_PRIxADDR ")", cur_addr, + prev_addr); assert(prev_addr < cur_addr); prev_addr = cur_addr; riscv_addr_t start = (cur_addr - address) / size; |