#include "debug_rom/debug_rom.h"
#include "debug_rom/debug_rom_defines.h"
-#if 1
+#if 0
# define D(x) x
#else
# define D(x)
///////////////////////// debug_module_t
-debug_module_t::debug_module_t(sim_t *sim) : sim(sim)
+debug_module_t::debug_module_t(sim_t *sim, unsigned progbufsize) :
+ progbufsize(progbufsize),
+ program_buffer_bytes(4 + 4*progbufsize),
+ debug_progbuf_start(debug_data_start - program_buffer_bytes),
+ debug_abstract_start(debug_progbuf_start - debug_abstract_size*4),
+ sim(sim)
{
dmcontrol = {0};
dmstatus = {0};
+ dmstatus.impebreak = true;
dmstatus.authenticated = 1;
- dmstatus.versionlo = 2;
+ dmstatus.version = 2;
abstractcs = {0};
- abstractcs.progsize = progsize;
+ abstractcs.progbufsize = progbufsize;
abstractauto = {0};
+ program_buffer = new uint8_t[program_buffer_bytes];
+
memset(halted, 0, sizeof(halted));
memset(debug_rom_flags, 0, sizeof(debug_rom_flags));
memset(resumeack, 0, sizeof(resumeack));
- memset(program_buffer, 0, sizeof(program_buffer));
+ memset(program_buffer, 0, program_buffer_bytes);
+ program_buffer[4*progbufsize] = ebreak();
+ program_buffer[4*progbufsize+1] = ebreak() >> 8;
+ program_buffer[4*progbufsize+2] = ebreak() >> 16;
+ program_buffer[4*progbufsize+3] = ebreak() >> 24;
memset(dmdata, 0, sizeof(dmdata));
write32(debug_rom_whereto, 0,
- jal(ZERO, DEBUG_ABSTRACT_START - DEBUG_ROM_WHERETO));
+ jal(ZERO, debug_abstract_start - DEBUG_ROM_WHERETO));
+
+ memset(debug_abstract, 0, sizeof(debug_abstract));
+}
- memset(debug_rom_abstract, 0, sizeof(debug_rom_abstract));
-
+debug_module_t::~debug_module_t()
+{
+ delete[] program_buffer;
}
void debug_module_t::reset()
dmcontrol = {0};
dmstatus = {0};
+ dmstatus.impebreak = true;
dmstatus.authenticated = 1;
- dmstatus.versionlo = 2;
+ dmstatus.version = 2;
abstractcs = {0};
abstractcs.datacount = sizeof(dmdata) / 4;
- abstractcs.progsize = progsize;
+ abstractcs.progbufsize = progbufsize;
abstractauto = {0};
}
addr = DEBUG_START + addr;
if (addr >= DEBUG_ROM_ENTRY &&
- addr < DEBUG_ROM_ENTRY + debug_rom_raw_len) {
+ (addr + len) <= (DEBUG_ROM_ENTRY + debug_rom_raw_len)) {
memcpy(bytes, debug_rom_raw + addr - DEBUG_ROM_ENTRY, len);
return true;
}
- if (addr >= DEBUG_ROM_WHERETO && addr < DEBUG_ROM_WHERETO + 4) {
+ if (addr >= DEBUG_ROM_WHERETO && (addr + len) <= (DEBUG_ROM_WHERETO + 4)) {
memcpy(bytes, debug_rom_whereto + addr - DEBUG_ROM_WHERETO, len);
return true;
}
- if (addr >= DEBUG_ROM_FLAGS && addr < DEBUG_ROM_FLAGS + 1024) {
+ if (addr >= DEBUG_ROM_FLAGS && ((addr + len) <= DEBUG_ROM_FLAGS + 1024)) {
memcpy(bytes, debug_rom_flags + addr - DEBUG_ROM_FLAGS, len);
return true;
}
- if (addr >= DEBUG_ABSTRACT_START && addr < DEBUG_ABSTRACT_END) {
- memcpy(bytes, debug_rom_abstract + addr - DEBUG_ABSTRACT_START, len);
+ if (addr >= debug_abstract_start && ((addr + len) <= (debug_abstract_start + sizeof(debug_abstract)))) {
+ memcpy(bytes, debug_abstract + addr - debug_abstract_start, len);
return true;
}
- if (addr >= DEBUG_DATA_START && addr < DEBUG_DATA_END) {
- memcpy(bytes, dmdata + addr - DEBUG_DATA_START, len);
+ if (addr >= debug_data_start && (addr + len) <= (debug_data_start + sizeof(dmdata))) {
+ memcpy(bytes, dmdata + addr - debug_data_start, len);
return true;
}
-
- if (addr >= DEBUG_PROGBUF_START && addr < DEBUG_PROGBUF_END) {
- memcpy(bytes, program_buffer + addr - DEBUG_PROGBUF_START, len);
+
+ if (addr >= debug_progbuf_start && ((addr + len) <= (debug_progbuf_start + program_buffer_bytes))) {
+ memcpy(bytes, program_buffer + addr - debug_progbuf_start, len);
return true;
}
bool debug_module_t::store(reg_t addr, size_t len, const uint8_t* bytes)
{
+ D(
+ switch (len) {
+ case 4:
+ fprintf(stderr, "store(addr=0x%lx, len=%d, bytes=0x%08x); "
+ "hartsel=0x%x\n", addr, (unsigned) len, *(uint32_t *) bytes,
+ dmcontrol.hartsel);
+ break;
+ default:
+ fprintf(stderr, "store(addr=0x%lx, len=%d, bytes=...); "
+ "hartsel=0x%x\n", addr, (unsigned) len, dmcontrol.hartsel);
+ break;
+ }
+ );
uint8_t id_bytes[4];
uint32_t id = 0;
}
addr = DEBUG_START + addr;
-
- if (addr >= DEBUG_DATA_START && addr < DEBUG_DATA_END) {
- memcpy(dmdata + addr - DEBUG_DATA_START, bytes, len);
+
+ if (addr >= debug_data_start && (addr + len) <= (debug_data_start + sizeof(dmdata))) {
+ memcpy(dmdata + addr - debug_data_start, bytes, len);
return true;
}
-
- if (addr >= DEBUG_PROGBUF_START && addr < DEBUG_PROGBUF_END) {
- memcpy(program_buffer + addr - DEBUG_PROGBUF_START, bytes, len);
+
+ if (addr >= debug_progbuf_start && ((addr + len) <= (debug_progbuf_start + program_buffer_bytes))) {
+ memcpy(program_buffer + addr - debug_progbuf_start, bytes, len);
+
return true;
}
if (address >= DMI_DATA0 && address < DMI_DATA0 + abstractcs.datacount) {
unsigned i = address - DMI_DATA0;
result = read32(dmdata, i);
+ if (abstractcs.busy) {
+ result = -1;
+ fprintf(stderr, "\ndmi_read(0x%02x (data[%d]) -> -1 because abstractcs.busy==true\n", address, i);
+ }
if (abstractcs.busy && abstractcs.cmderr == CMDERR_NONE) {
abstractcs.cmderr = CMDERR_BUSY;
}
- if ((abstractauto.autoexecdata >> i) & 1){
+ if (!abstractcs.busy && ((abstractauto.autoexecdata >> i) & 1)) {
perform_abstract_command();
}
- } else if (address >= DMI_PROGBUF0 && address < DMI_PROGBUF0 + progsize) {
- unsigned i = address = DMI_PROGBUF0;
+ } else if (address >= DMI_PROGBUF0 && address < DMI_PROGBUF0 + progbufsize) {
+ unsigned i = address - DMI_PROGBUF0;
result = read32(program_buffer, i);
- if ((abstractauto.autoexecprogbuf >> i) & 1) {
+ if (abstractcs.busy) {
+ result = -1;
+ fprintf(stderr, "\ndmi_read(0x%02x (progbuf[%d]) -> -1 because abstractcs.busy==true\n", address, i);
+ }
+ if (!abstractcs.busy && ((abstractauto.autoexecprogbuf >> i) & 1)) {
perform_abstract_command();
}
} else {
dmstatus.allresumeack = false;
}
-
+
+ result = set_field(result, DMI_DMSTATUS_IMPEBREAK,
+ dmstatus.impebreak);
result = set_field(result, DMI_DMSTATUS_ALLNONEXISTENT, dmstatus.allnonexistant);
result = set_field(result, DMI_DMSTATUS_ALLUNAVAIL, dmstatus.allunavail);
result = set_field(result, DMI_DMSTATUS_ALLRUNNING, dmstatus.allrunning);
result = set_field(result, DMI_DMSTATUS_ANYRESUMEACK, dmstatus.anyresumeack);
result = set_field(result, DMI_DMSTATUS_AUTHENTICATED, dmstatus.authenticated);
result = set_field(result, DMI_DMSTATUS_AUTHBUSY, dmstatus.authbusy);
- result = set_field(result, DMI_DMSTATUS_VERSIONHI, dmstatus.versionhi);
- result = set_field(result, DMI_DMSTATUS_VERSIONLO, dmstatus.versionlo);
+ result = set_field(result, DMI_DMSTATUS_VERSION, dmstatus.version);
}
break;
case DMI_ABSTRACTCS:
result = set_field(result, DMI_ABSTRACTCS_CMDERR, abstractcs.cmderr);
result = set_field(result, DMI_ABSTRACTCS_BUSY, abstractcs.busy);
result = set_field(result, DMI_ABSTRACTCS_DATACOUNT, abstractcs.datacount);
- result = set_field(result, DMI_ABSTRACTCS_PROGSIZE, abstractcs.progsize);
+ result = set_field(result, DMI_ABSTRACTCS_PROGBUFSIZE,
+ abstractcs.progbufsize);
break;
case DMI_ABSTRACTAUTO:
result = set_field(result, DMI_ABSTRACTAUTO_AUTOEXECPROGBUF, abstractauto.autoexecprogbuf);
result = set_field(result, DMI_HARTINFO_NSCRATCH, 1);
result = set_field(result, DMI_HARTINFO_DATAACCESS, 1);
result = set_field(result, DMI_HARTINFO_DATASIZE, abstractcs.datacount);
- result = set_field(result, DMI_HARTINFO_DATAADDR, DEBUG_DATA_START);
+ result = set_field(result, DMI_HARTINFO_DATAADDR, debug_data_start);
break;
default:
result = 0;
switch (size) {
case 2:
if (write)
- write32(debug_rom_abstract, 0, lw(regnum, ZERO, DEBUG_DATA_START));
+ write32(debug_abstract, 0, lw(regnum, ZERO, debug_data_start));
else
- write32(debug_rom_abstract, 0, sw(regnum, ZERO, DEBUG_DATA_START));
+ write32(debug_abstract, 0, sw(regnum, ZERO, debug_data_start));
break;
case 3:
if (write)
- write32(debug_rom_abstract, 0, ld(regnum, ZERO, DEBUG_DATA_START));
+ write32(debug_abstract, 0, ld(regnum, ZERO, debug_data_start));
else
- write32(debug_rom_abstract, 0, sd(regnum, ZERO, DEBUG_DATA_START));
+ write32(debug_abstract, 0, sd(regnum, ZERO, debug_data_start));
break;
/*
case 4:
if (write)
- write32(debug_rom_code, 0, lq(regnum, ZERO, DEBUG_DATA_START));
+ write32(debug_rom_code, 0, lq(regnum, ZERO, debug_data_start));
else
- write32(debug_rom_code, 0, sq(regnum, ZERO, DEBUG_DATA_START));
+ write32(debug_rom_code, 0, sq(regnum, ZERO, debug_data_start));
break;
*/
default:
return true;
}
} else {
- // Should be a NOP. Store DEBUG_DATA to x0.
- write32(debug_rom_abstract, 0, sw(ZERO, ZERO, DEBUG_DATA_START));
+ //NOP
+ write32(debug_abstract, 0, addi(ZERO, ZERO, 0));
}
-
+
if (get_field(command, AC_ACCESS_REGISTER_POSTEXEC)) {
- write32(debug_rom_abstract, 1, jal(ZERO, DEBUG_PROGBUF_START - DEBUG_ABSTRACT_START));
+ // Since the next instruction is what we will use, just use nother NOP
+ // to get there.
+ write32(debug_abstract, 1, addi(ZERO, ZERO, 0));
} else {
- write32(debug_rom_abstract, 1, ebreak());
+ write32(debug_abstract, 1, ebreak());
}
debug_rom_flags[dmcontrol.hartsel] |= 1 << DEBUG_ROM_FLAG_GO;
-
+
abstractcs.busy = true;
} else {
abstractcs.cmderr = CMDERR_NOTSUP;
D(fprintf(stderr, "dmi_write(0x%x, 0x%x)\n", address, value));
if (address >= DMI_DATA0 && address < DMI_DATA0 + abstractcs.datacount) {
unsigned i = address - DMI_DATA0;
- write32(dmdata, address - DMI_DATA0, value);
+ if (!abstractcs.busy)
+ write32(dmdata, address - DMI_DATA0, value);
if (abstractcs.busy && abstractcs.cmderr == CMDERR_NONE) {
abstractcs.cmderr = CMDERR_BUSY;
}
- if ((abstractauto.autoexecdata >> i) & 1)
+ if (!abstractcs.busy && ((abstractauto.autoexecdata >> i) & 1)) {
perform_abstract_command();
+ }
return true;
- } else if (address >= DMI_PROGBUF0 && address < DMI_PROGBUF0 + progsize) {
- write32(program_buffer, address - DMI_PROGBUF0, value);
+ } else if (address >= DMI_PROGBUF0 && address < DMI_PROGBUF0 + progbufsize) {
+ unsigned i = address - DMI_PROGBUF0;
+
+ if (!abstractcs.busy)
+ write32(program_buffer, i, value);
+
+ if (!abstractcs.busy && ((abstractauto.autoexecprogbuf >> i) & 1)) {
+ perform_abstract_command();
+ }
return true;
+
} else {
switch (address) {
case DMI_DMCONTROL:
if (dmcontrol.dmactive) {
dmcontrol.haltreq = get_field(value, DMI_DMCONTROL_HALTREQ);
dmcontrol.resumereq = get_field(value, DMI_DMCONTROL_RESUMEREQ);
+ dmcontrol.hartreset = get_field(value, DMI_DMCONTROL_HARTRESET);
dmcontrol.ndmreset = get_field(value, DMI_DMCONTROL_NDMRESET);
dmcontrol.hartsel = get_field(value, DMI_DMCONTROL_HARTSEL);
} else {
debug_rom_flags[dmcontrol.hartsel] |= (1 << DEBUG_ROM_FLAG_RESUME);
resumeack[dmcontrol.hartsel] = false;
}
+ if (dmcontrol.hartreset) {
+ proc->reset();
+ }
+ }
+ if (dmcontrol.ndmreset) {
+ for (size_t i = 0; i < sim->nprocs(); i++) {
+ proc = sim->get_core(i);
+ proc->reset();
+ }
}
}
return true;
return true;
case DMI_ABSTRACTAUTO:
- abstractauto.autoexecprogbuf = get_field(value, DMI_ABSTRACTAUTO_AUTOEXECPROGBUF);
- abstractauto.autoexecdata = get_field(value, DMI_ABSTRACTAUTO_AUTOEXECDATA);
- break;
+ abstractauto.autoexecprogbuf = get_field(value,
+ DMI_ABSTRACTAUTO_AUTOEXECPROGBUF);
+ abstractauto.autoexecdata = get_field(value,
+ DMI_ABSTRACTAUTO_AUTOEXECDATA);
+ return true;
}
}
return false;
projects / riscv-isa-sim.git / blobdiff