Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add insn cmd to interactive debug mode #1709

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Add insn cmd to interactive debug mode #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 55 additions & 19 deletions riscv/interactive.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ void sim_t::interactive()
funcs["fregs"] = &sim_t::interactive_fregs;
funcs["fregd"] = &sim_t::interactive_fregd;
funcs["pc"] = &sim_t::interactive_pc;
funcs["insn"] = &sim_t::interactive_insn;
funcs["priv"] = &sim_t::interactive_priv;
funcs["mem"] = &sim_t::interactive_mem;
funcs["str"] = &sim_t::interactive_str;
Expand Down Expand Up @@ -367,6 +368,7 @@ void sim_t::interactive_help(const std::string& cmd, const std::vector<std::stri
"fregd <core> <reg> # Display double precision <reg> in <core>\n"
"vreg <core> [reg] # Display vector [reg] (all if omitted) in <core>\n"
"pc <core> # Show current PC in <core>\n"
"insn <core> # Show current instruction corresponding to PC in <core>\n"
"priv <core> # Show current privilege level in <core>\n"
"mem [core] <hex addr> # Show contents of virtual memory <hex addr> in [core] (physical memory <hex addr> if omitted)\n"
"str [core] <hex addr> # Show NUL-terminated C string at virtual address <hex addr> in [core] (physical address <hex addr> if omitted)\n"
Expand All @@ -377,6 +379,8 @@ void sim_t::interactive_help(const std::string& cmd, const std::vector<std::stri
"untiln reg <core> <reg> <val> # Run noisy and stop when <reg> in <core> hits <val>\n"
"until pc <core> <val> # Stop when PC in <core> hits <val>\n"
"untiln pc <core> <val> # Run noisy and stop when PC in <core> hits <val>\n"
"until insn <core> <val> # Stop when instruction corresponding to PC in <core> hits <val>\n"
"untiln insn <core> <val> # Run noisy and stop when instruction corresponding to PC in <core> hits <val>\n"
"until mem [core] <addr> <val> # Stop when virtual memory <addr> in [core] (physical address <addr> if omitted) becomes <val>\n"
"untiln mem [core] <addr> <val> # Run noisy and stop when virtual memory <addr> in [core] (physical address <addr> if omitted) becomes <val>\n"
"while reg <core> <reg> <val> # Run while <reg> in <core> is <val>\n"
Expand Down Expand Up @@ -448,6 +452,54 @@ void sim_t::interactive_pc(const std::string& cmd, const std::vector<std::string
<< zext(get_pc(args), max_xlen) << std::endl;
}

static reg_t load(mmu_t* mmu, reg_t addr) {
reg_t val;

switch (addr % 8)
{
case 0:
val = mmu->load<uint64_t>(addr);
break;
case 4:
val = mmu->load<uint32_t>(addr);
break;
case 2:
case 6:
val = mmu->load<uint16_t>(addr);
break;
default:
val = mmu->load<uint8_t>(addr);
break;
}
return val;
}

reg_t sim_t::get_insn(const std::vector<std::string>& args)
{
if (args.size() != 1)
throw trap_interactive();

processor_t *p = get_core(args[0]);
reg_t addr = p->get_state()->pc;
mmu_t* mmu = p->get_mmu();
return load(mmu, addr);
}

void sim_t::interactive_insn(const std::string& cmd, const std::vector<std::string>& args)
{
if (args.size() != 1)
throw trap_interactive();

processor_t *p = get_core(args[0]);
int max_xlen = p->get_isa().get_max_xlen();

insn_t insn(get_insn(args));

std::ostream out(sout_.rdbuf());
out << std::hex << std::setfill('0') << "0x" << std::setw(max_xlen/4)
<< zext(insn.bits(), max_xlen) << " " << p->get_disassembler()->disassemble(insn) << std::endl;
}

void sim_t::interactive_priv(const std::string& cmd, const std::vector<std::string>& args)
{
if (args.size() != 1)
Expand Down Expand Up @@ -647,27 +699,11 @@ reg_t sim_t::get_mem(const std::vector<std::string>& args)
addr_str = args[1];
}

reg_t addr = strtol(addr_str.c_str(),NULL,16), val;
reg_t addr = strtol(addr_str.c_str(),NULL,16);
if (addr == LONG_MAX)
addr = strtoul(addr_str.c_str(),NULL,16);

switch (addr % 8)
{
case 0:
val = mmu->load<uint64_t>(addr);
break;
case 4:
val = mmu->load<uint32_t>(addr);
break;
case 2:
case 6:
val = mmu->load<uint16_t>(addr);
break;
default:
val = mmu->load<uint8_t>(addr);
break;
}
return val;
return load(mmu, addr);
}

void sim_t::interactive_mem(const std::string& cmd, const std::vector<std::string>& args)
Expand Down Expand Up @@ -743,6 +779,7 @@ void sim_t::interactive_until(const std::string& cmd, const std::vector<std::str
auto func = args[0] == "reg" ? &sim_t::get_reg :
args[0] == "pc" ? &sim_t::get_pc :
args[0] == "mem" ? &sim_t::get_mem :
args[0] == "insn" ? &sim_t::get_insn :
NULL;

if (func == NULL)
Expand Down Expand Up @@ -800,4 +837,3 @@ void sim_t::interactive_mtimecmp(const std::string& cmd, const std::vector<std::
out << std::hex << std::setfill('0') << "0x" << std::setw(16)
<< clint->get_mtimecmp(p->get_id()) << std::endl;
}

2 changes: 2 additions & 0 deletions riscv/sim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ class sim_t : public htif_t, public simif_t
void interactive_fregs(const std::string& cmd, const std::vector<std::string>& args);
void interactive_fregd(const std::string& cmd, const std::vector<std::string>& args);
void interactive_pc(const std::string& cmd, const std::vector<std::string>& args);
void interactive_insn(const std::string& cmd, const std::vector<std::string>& args);
void interactive_priv(const std::string& cmd, const std::vector<std::string>& args);
void interactive_mem(const std::string& cmd, const std::vector<std::string>& args);
void interactive_str(const std::string& cmd, const std::vector<std::string>& args);
Expand All @@ -136,6 +137,7 @@ class sim_t : public htif_t, public simif_t
freg_t get_freg(const std::vector<std::string>& args, int size);
reg_t get_mem(const std::vector<std::string>& args);
reg_t get_pc(const std::vector<std::string>& args);
reg_t get_insn(const std::vector<std::string>& args);

friend class processor_t;
friend class mmu_t;
Expand Down
Loading