X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=riscv%2Fdebug_module.cc;h=d828b72ff1a7da53df762143a53871c7f1d23695;hb=4f8b6a69484bd901f213d9a73ea29d26c8022dfd;hp=8d93e9e423385316cb2891233490989cf216461d;hpb=f88504000a7c7a16685dc59bdbb9be314a35d0b2;p=riscv-isa-sim.git diff --git a/riscv/debug_module.cc b/riscv/debug_module.cc index 8d93e9e..d828b72 100644 --- a/riscv/debug_module.cc +++ b/riscv/debug_module.cc @@ -6,6 +6,7 @@ #include "mmu.h" #include "debug_rom/debug_rom.h" +#include "debug_rom/debug_rom_defines.h" #if 1 # define D(x) x @@ -13,78 +14,32 @@ # define D(x) #endif -///////////////////////// debug_module_data_t - -debug_module_data_t::debug_module_data_t() -{ - memset(data, 0, sizeof(data)); -} - -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; - } - - fprintf(stderr, "ERROR: invalid load from debug_module_data_t: %zd bytes at 0x%016" - PRIx64 "\n", len, addr); - - return false; -} +///////////////////////// debug_module_t -bool debug_module_data_t::store(reg_t addr, size_t len, const uint8_t* bytes) +debug_module_t::debug_module_t(sim_t *sim) : sim(sim) { - D(fprintf(stderr, "debug_module_data_t store 0x%lx bytes at 0x%lx\n", len, - addr)); - - if (addr + len < sizeof(data)) { - memcpy(data + addr, bytes, len); - return true; - } + dmcontrol = {0}; - fprintf(stderr, "ERROR: invalid store to debug_module_data_t: %zd bytes at 0x%016" - PRIx64 "\n", len, addr); - return false; -} + dmstatus = {0}; + dmstatus.authenticated = 1; + dmstatus.versionlo = 2; -uint32_t debug_module_data_t::read32(reg_t addr) const -{ - assert(addr + 4 <= sizeof(data)); - return data[addr] | - (data[addr + 1] << 8) | - (data[addr + 2] << 16) | - (data[addr + 3] << 24); -} + abstractcs = {0}; + abstractcs.progsize = progsize; -void debug_module_data_t::write32(reg_t addr, uint32_t value) -{ - fprintf(stderr, "debug_module_data_t::write32(0x%lx, 0x%x)\n", addr, value); - assert(addr + 4 <= sizeof(data)); - data[addr] = value & 0xff; - data[addr + 1] = (value >> 8) & 0xff; - data[addr + 2] = (value >> 16) & 0xff; - data[addr + 3] = (value >> 24) & 0xff; -} + abstractauto = {0}; -///////////////////////// debug_module_t + 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(dmdata, 0, sizeof(dmdata)); -debug_module_t::debug_module_t(sim_t *sim) : sim(sim), - next_action(jal(ZERO, 0)), - action_executed(false) -{ - dmcontrol = {0}; - dmcontrol.version = 1; + write32(debug_rom_whereto, 0, + jal(ZERO, debug_abstract_start - DEBUG_ROM_WHERETO)); - for (unsigned i = 0; i < DEBUG_ROM_ENTRY_SIZE / 4; i++) { - write32(debug_rom_entry, i, jal(ZERO, 0)); - halted[i] = false; - } + memset(debug_abstract, 0, sizeof(debug_abstract)); - memset(program_buffer, 0, sizeof(program_buffer)); } void debug_module_t::reset() @@ -96,71 +51,54 @@ 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.datacount = sizeof(dmdata) / 4; + abstractcs.progsize = progsize; + + abstractauto = {0}; } void debug_module_t::add_device(bus_t *bus) { bus->add_device(DEBUG_START, this); - bus->add_device(DEBUG_EXCHANGE, &dmdata); } bool debug_module_t::load(reg_t addr, size_t len, uint8_t* bytes) { - D(fprintf(stderr, "debug_module_t 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) { - - 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); + (addr + len) <= (DEBUG_ROM_ENTRY + debug_rom_raw_len)) { + memcpy(bytes, debug_rom_raw + addr - DEBUG_ROM_ENTRY, len); return true; } - 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_WHERETO && (addr + len) <= (DEBUG_ROM_WHERETO + 4)) { + memcpy(bytes, debug_rom_whereto + addr - DEBUG_ROM_WHERETO, len); + return true; } - 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; - } + if (addr >= DEBUG_ROM_FLAGS && ((addr + len) <= DEBUG_ROM_FLAGS + 1024)) { + memcpy(bytes, debug_rom_flags + addr - DEBUG_ROM_FLAGS, len); + return true; + } - memcpy(bytes, debug_rom_code + addr - DEBUG_ROM_CODE, 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_RAM_START && addr < DEBUG_RAM_END) { - memcpy(bytes, program_buffer + addr - DEBUG_RAM_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_ROM_EXCEPTION && - addr < DEBUG_ROM_EXCEPTION + DEBUG_ROM_EXCEPTION_SIZE) { - memcpy(bytes, debug_rom_exception + addr - DEBUG_ROM_EXCEPTION, len); - if (abstractcs.cmderr == abstractcs.CMDERR_NONE) { - abstractcs.cmderr = abstractcs.CMDERR_EXCEPTION; - } + if (addr >= debug_progbuf_start && ((addr + len) <= (debug_progbuf_start + sizeof(program_buffer)))) { + memcpy(bytes, program_buffer + addr - debug_progbuf_start, len); return true; } @@ -172,10 +110,58 @@ bool debug_module_t::load(reg_t addr, size_t len, uint8_t* bytes) bool debug_module_t::store(reg_t addr, size_t len, const uint8_t* bytes) { + + uint8_t id_bytes[4]; + uint32_t id = 0; + if (len == 4) { + memcpy(id_bytes, bytes, 4); + id = read32(id_bytes, 0); + } + addr = DEBUG_START + addr; - if (addr >= DEBUG_RAM_START && addr < DEBUG_RAM_END) { - memcpy(program_buffer + addr - DEBUG_RAM_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 + len) <= (debug_progbuf_start + sizeof(program_buffer)))) { + fprintf(stderr, "Successful write to program buffer %d bytes at %x\n", (int) len, (int) addr); + memcpy(program_buffer + addr - debug_progbuf_start, bytes, len); + + return true; + } + + if (addr == DEBUG_ROM_HALTED) { + assert (len == 4); + halted[id] = true; + if (dmcontrol.hartsel == id) { + if (0 == (debug_rom_flags[id] & (1 << DEBUG_ROM_FLAG_GO))){ + if (dmcontrol.hartsel == id) { + abstractcs.busy = false; + } + } + } + return true; + } + + if (addr == DEBUG_ROM_GOING) { + debug_rom_flags[dmcontrol.hartsel] &= ~(1 << DEBUG_ROM_FLAG_GO); + return true; + } + + if (addr == DEBUG_ROM_RESUMING) { + assert (len == 4); + halted[id] = false; + resumeack[id] = true; + debug_rom_flags[id] &= ~(1 << DEBUG_ROM_FLAG_RESUME); + return true; + } + + if (addr == DEBUG_ROM_EXCEPTION) { + if (abstractcs.cmderr == CMDERR_NONE) { + abstractcs.cmderr = CMDERR_EXCEPTION; + } return true; } @@ -219,71 +205,116 @@ bool debug_module_t::dmi_read(unsigned address, uint32_t *value) D(fprintf(stderr, "dmi_read(0x%x) -> ", address)); if (address >= DMI_DATA0 && address < DMI_DATA0 + abstractcs.datacount) { unsigned i = address - DMI_DATA0; - result = dmdata.read32(4 * i); - - bool autoexec = false; - switch (i) { - case 0: autoexec = abstractcs.autoexec0; break; - case 1: autoexec = abstractcs.autoexec1; break; - case 2: autoexec = abstractcs.autoexec2; break; - case 3: autoexec = abstractcs.autoexec3; break; - case 4: autoexec = abstractcs.autoexec4; break; - case 5: autoexec = abstractcs.autoexec5; break; - case 6: autoexec = abstractcs.autoexec6; break; - case 7: autoexec = abstractcs.autoexec7; break; + 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 (autoexec) { + + if (abstractcs.busy && abstractcs.cmderr == CMDERR_NONE) { + abstractcs.cmderr = CMDERR_BUSY; + } + + if (!abstractcs.busy && ((abstractauto.autoexecdata >> i) & 1)) { perform_abstract_command(); } - } else if (address >= DMI_IBUF0 && address < DMI_IBUF0 + progsize) { - result = read32(program_buffer, address - DMI_IBUF0); + } else if (address >= DMI_PROGBUF0 && address < DMI_PROGBUF0 + progsize) { + unsigned i = address - DMI_PROGBUF0; + result = read32(program_buffer, i); + 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 { 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; + dmstatus.allresumeack = 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; + if (proc) { + if (resumeack[dmcontrol.hartsel]) { + dmstatus.allresumeack = true; + } else { + dmstatus.allresumeack = false; + } + } else { + dmstatus.allresumeack = false; + } + + 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_ALLRESUMEACK, dmstatus.allresumeack); + 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_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); } - 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; break; + case DMI_HARTINFO: + 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); + break; default: - D(fprintf(stderr, "error\n")); + result = 0; + D(fprintf(stderr, "Unexpected. Returning Error.")); return false; } } @@ -294,10 +325,10 @@ bool debug_module_t::dmi_read(unsigned address, uint32_t *value) bool debug_module_t::perform_abstract_command() { - if (abstractcs.cmderr != abstractcs.CMDERR_NONE) + if (abstractcs.cmderr != CMDERR_NONE) return true; if (abstractcs.busy) { - abstractcs.cmderr = abstractcs.CMDERR_BUSY; + abstractcs.cmderr = CMDERR_BUSY; return true; } @@ -307,64 +338,63 @@ bool debug_module_t::perform_abstract_command() bool write = get_field(command, AC_ACCESS_REGISTER_WRITE); unsigned regno = get_field(command, AC_ACCESS_REGISTER_REGNO); - if (regno < 0x1000 || regno >= 0x1020) { - abstractcs.cmderr = abstractcs.CMDERR_NOTSUP; + if (!halted[dmcontrol.hartsel]) { + abstractcs.cmderr = CMDERR_HALTRESUME; return true; } - unsigned regnum = regno - 0x1000; + if (get_field(command, AC_ACCESS_REGISTER_TRANSFER)) { - if (!halted[dmcontrol.hartsel]) { - abstractcs.cmderr = abstractcs.CMDERR_HALTRESUME; - return true; - } + if (regno < 0x1000 || regno >= 0x1020) { + abstractcs.cmderr = CMDERR_NOTSUP; + return true; + } - switch (size) { + unsigned regnum = regno - 0x1000; + + switch (size) { case 2: if (write) - write32(debug_rom_code, 0, lw(regnum, ZERO, DEBUG_EXCHANGE)); + write32(debug_abstract, 0, lw(regnum, ZERO, debug_data_start)); else - write32(debug_rom_code, 0, sw(regnum, ZERO, DEBUG_EXCHANGE)); + write32(debug_abstract, 0, sw(regnum, ZERO, debug_data_start)); break; case 3: if (write) - write32(debug_rom_code, 0, ld(regnum, ZERO, DEBUG_EXCHANGE)); - else - write32(debug_rom_code, 0, sd(regnum, ZERO, DEBUG_EXCHANGE)); - break; - /* - case 4: - if (write) - write32(debug_rom_code, 0, lq(regnum, ZERO, DEBUG_EXCHANGE)); + write32(debug_abstract, 0, ld(regnum, ZERO, debug_data_start)); else - write32(debug_rom_code, 0, sq(regnum, ZERO, DEBUG_EXCHANGE)); + 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)); + else + write32(debug_rom_code, 0, sq(regnum, ZERO, debug_data_start)); + break; */ default: - abstractcs.cmderr = abstractcs.CMDERR_NOTSUP; + abstractcs.cmderr = CMDERR_NOTSUP; return true; - } - 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()); + //NOP + write32(debug_abstract, 0, addi(ZERO, ZERO, 0)); } - 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)); + if (get_field(command, AC_ACCESS_REGISTER_POSTEXEC)) { + // 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_entry, dmcontrol.hartsel, - jal(ZERO, DEBUG_ROM_CODE - (DEBUG_ROM_ENTRY + 4 * dmcontrol.hartsel))); + write32(debug_abstract, 1, ebreak()); } - write32(debug_rom_exception, dmcontrol.hartsel, - jal(ZERO, (DEBUG_ROM_ENTRY + 4 * dmcontrol.hartsel) - DEBUG_ROM_EXCEPTION)); + debug_rom_flags[dmcontrol.hartsel] |= 1 << DEBUG_ROM_FLAG_GO; + abstractcs.busy = true; } else { - abstractcs.cmderr = abstractcs.CMDERR_NOTSUP; + abstractcs.cmderr = CMDERR_NOTSUP; } return true; } @@ -374,27 +404,29 @@ bool debug_module_t::dmi_write(unsigned address, uint32_t value) 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; - dmdata.write32(4 * i, value); - - bool autoexec = false; - switch (i) { - case 0: autoexec = abstractcs.autoexec0; break; - case 1: autoexec = abstractcs.autoexec1; break; - case 2: autoexec = abstractcs.autoexec2; break; - case 3: autoexec = abstractcs.autoexec3; break; - case 4: autoexec = abstractcs.autoexec4; break; - case 5: autoexec = abstractcs.autoexec5; break; - case 6: autoexec = abstractcs.autoexec6; break; - case 7: autoexec = abstractcs.autoexec7; break; + if (!abstractcs.busy) + write32(dmdata, address - DMI_DATA0, value); + + if (abstractcs.busy && abstractcs.cmderr == CMDERR_NONE) { + abstractcs.cmderr = CMDERR_BUSY; } - if (autoexec) { + + if (!abstractcs.busy && ((abstractauto.autoexecdata >> i) & 1)) { perform_abstract_command(); } return true; - } else if (address >= DMI_IBUF0 && address < DMI_IBUF0 + progsize) { - write32(program_buffer, address - DMI_IBUF0, value); + } else if (address >= DMI_PROGBUF0 && address < DMI_PROGBUF0 + progsize) { + 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: @@ -403,7 +435,7 @@ bool debug_module_t::dmi_write(unsigned address, uint32_t value) if (dmcontrol.dmactive) { dmcontrol.haltreq = get_field(value, DMI_DMCONTROL_HALTREQ); dmcontrol.resumereq = get_field(value, DMI_DMCONTROL_RESUMEREQ); - dmcontrol.reset = get_field(value, DMI_DMCONTROL_RESET); + dmcontrol.ndmreset = get_field(value, DMI_DMCONTROL_NDMRESET); dmcontrol.hartsel = get_field(value, DMI_DMCONTROL_HARTSEL); } else { reset(); @@ -412,11 +444,12 @@ bool debug_module_t::dmi_write(unsigned address, uint32_t value) 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; + debug_rom_flags[dmcontrol.hartsel] |= (1 << DEBUG_ROM_FLAG_RESUME); + resumeack[dmcontrol.hartsel] = false; } + if (dmcontrol.ndmreset) { + proc->reset(); + } } } return true; @@ -426,17 +459,14 @@ bool debug_module_t::dmi_write(unsigned address, uint32_t 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; - } + abstractcs.cmderr = (cmderr_t) (((uint32_t) (abstractcs.cmderr)) & (~(uint32_t)(get_field(value, DMI_ABSTRACTCS_CMDERR)))); + return true; + + case DMI_ABSTRACTAUTO: + abstractauto.autoexecprogbuf = get_field(value, + DMI_ABSTRACTAUTO_AUTOEXECPROGBUF); + abstractauto.autoexecdata = get_field(value, + DMI_ABSTRACTAUTO_AUTOEXECDATA); return true; } }