From 8d234cae74f1a46d190a7febc248754e943a5fbb Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Thu, 30 Dec 2021 22:04:06 +0000 Subject: [PATCH] add ASCII dump of BRAM read/write data and add one-cycle delay on read the BRAM outputs its data one cycle late from the read-enable (bram_re) --- verilator/microwatt-verilator.cpp | 32 ++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/verilator/microwatt-verilator.cpp b/verilator/microwatt-verilator.cpp index 89d4ce4..4eaed11 100644 --- a/verilator/microwatt-verilator.cpp +++ b/verilator/microwatt-verilator.cpp @@ -47,6 +47,18 @@ void tick(Vmicrowatt *top) void uart_tx(unsigned char tx); unsigned char uart_rx(void); +// pretty-print dumped data in ASCII (to help identify strings) +static void ascii_dump(unsigned char *data, int len, FILE *dump) +{ + for (int i = 0; i < len; i++) { + if (isalnum(data[i])) + putc(data[i], dump); + else + putc('.', dump); + } + putc('\n', dump); +} + int main(int argc, char **argv) { Verilated::commandArgs(argc, argv); @@ -62,6 +74,12 @@ int main(int argc, char **argv) tfp->open("microwatt-verilator.vcd"); #endif + // dump file for memory read/write traces [uart takes over stdin/stdout] + FILE *dump = fopen("bram.dump", "w"); + + // read data is one clock cycle delayed + bool next_read = false; + // Reset top->ext_rst = 0; for (unsigned long i = 0; i < 5; i++) @@ -73,16 +91,24 @@ int main(int argc, char **argv) uart_tx(top->uart0_txd); top->uart0_rxd = uart_rx(); + if (top->bram_we) { - printf("bram wr addr %x dout %x sel %x\n", + fprintf(dump, "bram wr addr %08x dout %16lx sel %x ", top->bram_addr, top->bram_di, top->bram_sel); + ascii_dump((unsigned char*)&top->bram_di, 8, dump); + fflush(dump); } - if (top->bram_re) { - printf("bram rd addr %x din %x sel %x\n", + if (next_read) { // read on one clock delay + fprintf(dump, "bram rd addr %08x din %16lx sel %x ", top->bram_addr, top->bram_do, top->bram_sel); + ascii_dump((unsigned char*)&top->bram_do, 8, dump); + fflush(dump); } + next_read = top->bram_re; } + fclose(dump); + #if VM_TRACE tfp->close(); delete tfp; -- 2.30.2