bool debug_module_data_t::load(reg_t addr, size_t len, uint8_t* bytes)
{
- D(fprintf(stderr, "debug_module_data_t load 0x%lx bytes at 0x%lx\n", len,
- addr));
-
if (addr + len < sizeof(data)) {
memcpy(bytes, data + addr, len);
return true;
///////////////////////// debug_module_t
-debug_module_t::debug_module_t(sim_t *sim) : sim(sim)
+debug_module_t::debug_module_t(sim_t *sim) : sim(sim),
+ next_action(jal(ZERO, 0)),
+ action_executed(false)
{
dmcontrol = {0};
- dmcontrol.version = 1;
+
+ dmstatus = {0};
+ dmstatus.authenticated = 1;
+ dmstatus.versionlo = 2;
+
+ abstractcs = {0};
+ abstractcs.progsize = progsize;
+
+ abstractauto = {0};
for (unsigned i = 0; i < DEBUG_ROM_ENTRY_SIZE / 4; i++) {
write32(debug_rom_entry, i, jal(ZERO, 0));
halted[i] = false;
}
- for (unsigned i = 0; i < progsize; i++) {
- ibuf[i] = 0;
- }
-
+ memset(program_buffer, 0, sizeof(program_buffer));
}
void debug_module_t::reset()
}
dmcontrol = {0};
- dmcontrol.authenticated = 1;
- dmcontrol.version = 1;
- dmcontrol.authtype = dmcontrol.AUTHTYPE_NOAUTH;
+
+ dmstatus = {0};
+ dmstatus.authenticated = 1;
+ dmstatus.versionlo = 2;
abstractcs = {0};
abstractcs.datacount = sizeof(dmdata.data) / 4;
+ abstractcs.progsize = progsize;
+
+ abstractauto = {0};
}
void debug_module_t::add_device(bus_t *bus) {
bool debug_module_t::load(reg_t addr, size_t len, uint8_t* bytes)
{
- D(fprintf(stderr, "load 0x%lx bytes at 0x%lx\n",
- len, addr));
addr = DEBUG_START + addr;
if (addr >= DEBUG_ROM_ENTRY &&
addr < DEBUG_ROM_ENTRY + DEBUG_ROM_ENTRY_SIZE) {
- halted[(addr - DEBUG_ROM_ENTRY) / 4] = true;
- memcpy(bytes, debug_rom_entry + addr - DEBUG_ROM_ENTRY, len);
if (read32(debug_rom_entry, dmcontrol.hartsel) == jal(ZERO, 0)) {
// We're here in an infinite loop. That means that whatever abstract
// command has complete.
abstractcs.busy = false;
}
+
+ action_executed = true;
+
+ halted[(addr - DEBUG_ROM_ENTRY) / 4] = true;
+ memcpy(bytes, debug_rom_entry + addr - DEBUG_ROM_ENTRY, len);
return true;
}
- // Restore the jump-to-self loop.
- write32(debug_rom_entry, dmcontrol.hartsel, jal(ZERO, 0));
+ if (action_executed) {
+ // Restore the jump-to-self loop.
+ write32(debug_rom_entry, dmcontrol.hartsel, next_action);
+ next_action = jal(ZERO, 0);
+ action_executed = false;
+ }
if (addr >= DEBUG_ROM_CODE &&
addr < DEBUG_ROM_CODE + DEBUG_ROM_CODE_SIZE) {
+
+ if (read32(debug_rom_code, 0) == dret()) {
+ abstractcs.busy = false;
+ halted[dmcontrol.hartsel] = false;
+ }
+
memcpy(bytes, debug_rom_code + addr - DEBUG_ROM_CODE, len);
return true;
}
+ if (addr >= DEBUG_RAM_START && addr < DEBUG_RAM_END) {
+ memcpy(bytes, program_buffer + addr - DEBUG_RAM_START, len);
+ return true;
+ }
+
if (addr >= DEBUG_ROM_EXCEPTION &&
addr < DEBUG_ROM_EXCEPTION + DEBUG_ROM_EXCEPTION_SIZE) {
memcpy(bytes, debug_rom_exception + addr - DEBUG_ROM_EXCEPTION, len);
{
addr = DEBUG_START + addr;
+ if (addr >= DEBUG_RAM_START && addr < DEBUG_RAM_END) {
+ memcpy(program_buffer + addr - DEBUG_RAM_START, bytes, len);
+ return true;
+ }
+
fprintf(stderr, "ERROR: invalid store to debug module: %zd bytes at 0x%016"
PRIx64 "\n", len, addr);
return false;
uint32_t result = 0;
D(fprintf(stderr, "dmi_read(0x%x) -> ", address));
if (address >= DMI_DATA0 && address < DMI_DATA0 + abstractcs.datacount) {
- result = dmdata.read32(4 * (address - DMI_DATA0));
- } else if (address >= DMI_IBUF0 && address < DMI_IBUF0 + progsize) {
- result = ibuf[address - DMI_IBUF0];
+ unsigned i = address - DMI_DATA0;
+ result = dmdata.read32(4 * i);
+
+ if (abstractcs.busy && abstractcs.cmderr == abstractcs.CMDERR_NONE) {
+ abstractcs.cmderr = abstractcs.CMDERR_BUSY;
+ }
+
+ if ((abstractauto.autoexecdata >> i) & 1)
+ perform_abstract_command();
+ } else if (address >= DMI_PROGBUF0 && address < DMI_PROGBUF0 + progsize) {
+ result = read32(program_buffer, address - DMI_PROGBUF0);
} else {
switch (address) {
case DMI_DMCONTROL:
{
processor_t *proc = current_proc();
+ if (proc)
+ dmcontrol.haltreq = proc->halt_request;
+
+ result = set_field(result, DMI_DMCONTROL_HALTREQ, dmcontrol.haltreq);
+ result = set_field(result, DMI_DMCONTROL_RESUMEREQ, dmcontrol.resumereq);
+ result = set_field(result, DMI_DMCONTROL_HARTSEL, dmcontrol.hartsel);
+ result = set_field(result, DMI_DMCONTROL_HARTRESET, dmcontrol.hartreset);
+ result = set_field(result, DMI_DMCONTROL_NDMRESET, dmcontrol.ndmreset);
+ result = set_field(result, DMI_DMCONTROL_DMACTIVE, dmcontrol.dmactive);
+ }
+ break;
+ case DMI_DMSTATUS:
+ {
+ processor_t *proc = current_proc();
+
+ dmstatus.allnonexistant = false;
+ dmstatus.allunavail = false;
+ dmstatus.allrunning = false;
+ dmstatus.allhalted = false;
if (proc) {
if (halted[dmcontrol.hartsel]) {
- dmcontrol.hartstatus = dmcontrol.HARTSTATUS_HALTED;
+ dmstatus.allhalted = true;
} else {
- dmcontrol.hartstatus = dmcontrol.HARTSTATUS_RUNNING;
+ dmstatus.allrunning = true;
}
- dmcontrol.haltreq = proc->halt_request;
} else {
- dmcontrol.hartstatus = dmcontrol.HARTSTATUS_NOTEXIST;
+ dmstatus.allnonexistant = true;
}
- result = set_field(result, DMI_DMCONTROL_HALTREQ, dmcontrol.haltreq);
- result = set_field(result, DMI_DMCONTROL_RESET, dmcontrol.reset);
- result = set_field(result, DMI_DMCONTROL_DMACTIVE, dmcontrol.dmactive);
- result = set_field(result, DMI_DMCONTROL_HARTSTATUS, dmcontrol.hartstatus);
- result = set_field(result, DMI_DMCONTROL_HARTSEL, dmcontrol.hartsel);
- result = set_field(result, DMI_DMCONTROL_AUTHENTICATED, dmcontrol.authenticated);
- result = set_field(result, DMI_DMCONTROL_AUTHBUSY, dmcontrol.authbusy);
- result = set_field(result, DMI_DMCONTROL_AUTHTYPE, dmcontrol.authtype);
- result = set_field(result, DMI_DMCONTROL_VERSION, dmcontrol.version);
+ dmstatus.anynonexistant = dmstatus.allnonexistant;
+ dmstatus.anyunavail = dmstatus.allunavail;
+ dmstatus.anyrunning = dmstatus.allrunning;
+ dmstatus.anyhalted = dmstatus.allhalted;
+
+ 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_ALLHALTED, dmstatus.allhalted);
+ result = set_field(result, DMI_DMSTATUS_ANYNONEXISTENT, dmstatus.anynonexistant);
+ result = set_field(result, DMI_DMSTATUS_ANYUNAVAIL, dmstatus.anyunavail);
+ result = set_field(result, DMI_DMSTATUS_ANYRUNNING, dmstatus.anyrunning);
+ result = set_field(result, DMI_DMSTATUS_ANYHALTED, dmstatus.anyhalted);
+ 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);
}
- break;
+ break;
case DMI_ABSTRACTCS:
- result = set_field(result, DMI_ABSTRACTCS_AUTOEXEC7, abstractcs.autoexec7);
- result = set_field(result, DMI_ABSTRACTCS_AUTOEXEC6, abstractcs.autoexec6);
- result = set_field(result, DMI_ABSTRACTCS_AUTOEXEC5, abstractcs.autoexec5);
- result = set_field(result, DMI_ABSTRACTCS_AUTOEXEC4, abstractcs.autoexec4);
- result = set_field(result, DMI_ABSTRACTCS_AUTOEXEC3, abstractcs.autoexec3);
- result = set_field(result, DMI_ABSTRACTCS_AUTOEXEC2, abstractcs.autoexec2);
- result = set_field(result, DMI_ABSTRACTCS_AUTOEXEC1, abstractcs.autoexec1);
- result = set_field(result, DMI_ABSTRACTCS_AUTOEXEC0, abstractcs.autoexec0);
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);
break;
- case DMI_ACCESSCS:
- result = progsize << DMI_ACCESSCS_PROGSIZE_OFFSET;
+ case DMI_ABSTRACTAUTO:
+ result = set_field(result, DMI_ABSTRACTAUTO_AUTOEXECPROGBUF, abstractauto.autoexecprogbuf);
+ result = set_field(result, DMI_ABSTRACTAUTO_AUTOEXECDATA, abstractauto.autoexecdata);
break;
case DMI_COMMAND:
result = 0;
return true;
}
-bool debug_module_t::perform_abstract_command(uint32_t command)
+bool debug_module_t::perform_abstract_command()
{
if (abstractcs.cmderr != abstractcs.CMDERR_NONE)
return true;
abstractcs.cmderr = abstractcs.CMDERR_NOTSUP;
return true;
}
- write32(debug_rom_code, 1, ebreak());
+ if (get_field(command, AC_ACCESS_REGISTER_POSTEXEC)) {
+ write32(debug_rom_code, 1, jal(ZERO, DEBUG_RAM_START - DEBUG_ROM_CODE - 4));
+ } else {
+ write32(debug_rom_code, 1, ebreak());
+ }
+
+ if (get_field(command, AC_ACCESS_REGISTER_PREEXEC)) {
+ write32(debug_rom_entry, dmcontrol.hartsel,
+ jal(ZERO, DEBUG_RAM_START - (DEBUG_ROM_ENTRY + 4 * dmcontrol.hartsel)));
+ next_action =
+ jal(ZERO, DEBUG_ROM_CODE - (DEBUG_ROM_ENTRY + 4 * dmcontrol.hartsel));
+ } else {
+ write32(debug_rom_entry, dmcontrol.hartsel,
+ jal(ZERO, DEBUG_ROM_CODE - (DEBUG_ROM_ENTRY + 4 * dmcontrol.hartsel)));
+ }
- write32(debug_rom_entry, dmcontrol.hartsel,
- jal(ZERO, DEBUG_ROM_CODE - (DEBUG_ROM_ENTRY + 4 * dmcontrol.hartsel)));
write32(debug_rom_exception, dmcontrol.hartsel,
jal(ZERO, (DEBUG_ROM_ENTRY + 4 * dmcontrol.hartsel) - DEBUG_ROM_EXCEPTION));
abstractcs.busy = true;
{
D(fprintf(stderr, "dmi_write(0x%x, 0x%x)\n", address, value));
if (address >= DMI_DATA0 && address < DMI_DATA0 + abstractcs.datacount) {
- dmdata.write32(4 * (address - DMI_DATA0), value);
+ unsigned i = address - DMI_DATA0;
+ dmdata.write32(4 * i, value);
+
+ if (abstractcs.busy && abstractcs.cmderr == abstractcs.CMDERR_NONE) {
+ abstractcs.cmderr = abstractcs.CMDERR_BUSY;
+ }
+
+ if ((abstractauto.autoexecdata >> i) & 1)
+ perform_abstract_command();
return true;
- } else if (address >= DMI_IBUF0 && address < DMI_IBUF0 + progsize) {
- ibuf[address - DMI_IBUF0] = value;
+
+ } else if (address >= DMI_PROGBUF0 && address < DMI_PROGBUF0 + progsize) {
+ write32(program_buffer, address - DMI_PROGBUF0, value);
return true;
} else {
switch (address) {
dmcontrol.dmactive = get_field(value, DMI_DMCONTROL_DMACTIVE);
if (dmcontrol.dmactive) {
dmcontrol.haltreq = get_field(value, DMI_DMCONTROL_HALTREQ);
- dmcontrol.reset = get_field(value, DMI_DMCONTROL_RESET);
+ dmcontrol.resumereq = get_field(value, DMI_DMCONTROL_RESUMEREQ);
+ dmcontrol.ndmreset = get_field(value, DMI_DMCONTROL_NDMRESET);
dmcontrol.hartsel = get_field(value, DMI_DMCONTROL_HARTSEL);
} else {
reset();
processor_t *proc = current_proc();
if (proc) {
proc->halt_request = dmcontrol.haltreq;
+ if (dmcontrol.resumereq) {
+ write32(debug_rom_code, 0, dret());
+ write32(debug_rom_entry, dmcontrol.hartsel,
+ jal(ZERO, DEBUG_ROM_CODE - (DEBUG_ROM_ENTRY + 4 * dmcontrol.hartsel)));
+ abstractcs.busy = true;
+ }
}
}
return true;
case DMI_COMMAND:
- return perform_abstract_command(value);
+ command = value;
+ return perform_abstract_command();
case DMI_ABSTRACTCS:
- abstractcs.autoexec7 = get_field(value, DMI_ABSTRACTCS_AUTOEXEC7);
- abstractcs.autoexec6 = get_field(value, DMI_ABSTRACTCS_AUTOEXEC6);
- abstractcs.autoexec5 = get_field(value, DMI_ABSTRACTCS_AUTOEXEC5);
- abstractcs.autoexec4 = get_field(value, DMI_ABSTRACTCS_AUTOEXEC4);
- abstractcs.autoexec3 = get_field(value, DMI_ABSTRACTCS_AUTOEXEC3);
- abstractcs.autoexec2 = get_field(value, DMI_ABSTRACTCS_AUTOEXEC2);
- abstractcs.autoexec1 = get_field(value, DMI_ABSTRACTCS_AUTOEXEC1);
- abstractcs.autoexec0 = get_field(value, DMI_ABSTRACTCS_AUTOEXEC0);
if (get_field(value, DMI_ABSTRACTCS_CMDERR) == abstractcs.CMDERR_NONE) {
abstractcs.cmderr = abstractcs.CMDERR_NONE;
}
+ return true;
+
+ case DMI_ABSTRACTAUTO:
+ abstractauto.autoexecprogbuf = get_field(value, DMI_ABSTRACTAUTO_AUTOEXECPROGBUF);
+ abstractauto.autoexecdata = get_field(value, DMI_ABSTRACTAUTO_AUTOEXECDATA);
break;
}
}