#include "decode.h"
#include "disasm.h"
#include "sim.h"
-#include "htif.h"
+#include "mmu.h"
#include <sys/mman.h>
#include <termios.h>
#include <map>
#include <string>
#include <vector>
#include <algorithm>
+#include <math.h>
+
+DECLARE_TRAP(-1, interactive)
+
+processor_t *sim_t::get_core(const std::string& i)
+{
+ char *ptr;
+ unsigned long p = strtoul(i.c_str(), &ptr, 10);
+ if (*ptr || p >= procs.size())
+ throw trap_interactive();
+ return get_core(p);
+}
static std::string readline(int fd)
{
funcs["r"] = funcs["run"];
funcs["rs"] = &sim_t::interactive_run_silent;
funcs["reg"] = &sim_t::interactive_reg;
+ funcs["freg"] = &sim_t::interactive_freg;
funcs["fregs"] = &sim_t::interactive_fregs;
funcs["fregd"] = &sim_t::interactive_fregd;
+ funcs["pc"] = &sim_t::interactive_pc;
funcs["mem"] = &sim_t::interactive_mem;
funcs["str"] = &sim_t::interactive_str;
funcs["until"] = &sim_t::interactive_until;
funcs["help"] = &sim_t::interactive_help;
funcs["h"] = funcs["help"];
- while (!htif->done())
+ while (!done())
{
std::cerr << ": " << std::flush;
std::string s = readline(2);
{
if(funcs.count(cmd))
(this->*funcs[cmd])(cmd, args);
+ else
+ fprintf(stderr, "Unknown command %s\n", cmd.c_str());
}
catch(trap_t t) {}
}
{
std::cerr <<
"Interactive commands:\n"
- "reg <core> <reg> # Display <reg> in <core>\n"
+ "reg <core> [reg] # Display [reg] (all if omitted) in <core>\n"
"fregs <core> <reg> # Display single precision <reg> in <core>\n"
"fregd <core> <reg> # Display double precision <reg> in <core>\n"
+ "pc <core> # Show current PC in <core>\n"
"mem <hex addr> # Show contents of physical memory\n"
"str <hex addr> # Show NUL-terminated C string\n"
"until reg <core> <reg> <val> # Stop when <reg> in <core> hits <val>\n"
size_t steps = args.size() ? atoll(args[0].c_str()) : -1;
ctrlc_pressed = false;
set_procs_debug(noisy);
- for (size_t i = 0; i < steps && !ctrlc_pressed && !htif->done(); i++)
+ for (size_t i = 0; i < steps && !ctrlc_pressed && !done(); i++)
step(1);
}
reg_t sim_t::get_pc(const std::vector<std::string>& args)
{
if(args.size() != 1)
- throw trap_illegal_instruction();
+ throw trap_interactive();
- int p = atoi(args[0].c_str());
- if(p >= (int)num_cores())
- throw trap_illegal_instruction();
+ processor_t *p = get_core(args[0]);
+ return p->state.pc;
+}
- return procs[p]->state.pc;
+void sim_t::interactive_pc(const std::string& cmd, const std::vector<std::string>& args)
+{
+ fprintf(stderr, "0x%016" PRIx64 "\n", get_pc(args));
}
reg_t sim_t::get_reg(const std::vector<std::string>& args)
{
if(args.size() != 2)
- throw trap_illegal_instruction();
+ throw trap_interactive();
- char* ptr;
- unsigned long p = strtoul(args[0].c_str(), &ptr, 10);
- if (*ptr || p >= num_cores())
- throw trap_illegal_instruction();
+ processor_t *p = get_core(args[0]);
unsigned long r = std::find(xpr_name, xpr_name + NXPR, args[1]) - xpr_name;
if (r == NXPR) {
+ char *ptr;
r = strtoul(args[1].c_str(), &ptr, 10);
if (*ptr) {
- #define DECLARE_CSR(name, number) if (args[1] == #name) return procs[p]->get_csr(number);
- if (0) ;
- #include "encoding.h"
- else r = NXPR;
+ #define DECLARE_CSR(name, number) if (args[1] == #name) return p->get_csr(number);
+ #include "encoding.h" // generates if's for all csrs
+ r = NXPR; // else case (csr name not found)
#undef DECLARE_CSR
}
}
if (r >= NXPR)
- throw trap_illegal_instruction();
+ throw trap_interactive();
- return procs[p]->state.XPR[r];
+ return p->state.XPR[r];
}
-reg_t sim_t::get_freg(const std::vector<std::string>& args)
+freg_t sim_t::get_freg(const std::vector<std::string>& args)
{
if(args.size() != 2)
- throw trap_illegal_instruction();
+ throw trap_interactive();
- int p = atoi(args[0].c_str());
+ processor_t *p = get_core(args[0]);
int r = std::find(fpr_name, fpr_name + NFPR, args[1]) - fpr_name;
if (r == NFPR)
r = atoi(args[1].c_str());
- if(p >= (int)num_cores() || r >= NFPR)
- throw trap_illegal_instruction();
+ if (r >= NFPR)
+ throw trap_interactive();
- return procs[p]->state.FPR[r];
+ return p->state.FPR[r];
}
void sim_t::interactive_reg(const std::string& cmd, const std::vector<std::string>& args)
{
- fprintf(stderr, "0x%016" PRIx64 "\n", get_reg(args));
+ if (args.size() == 1) {
+ // Show all the regs!
+ processor_t *p = get_core(args[0]);
+
+ for (int r = 0; r < NXPR; ++r) {
+ fprintf(stderr, "%-4s: 0x%016" PRIx64 " ", xpr_name[r], p->state.XPR[r]);
+ if ((r + 1) % 4 == 0)
+ fprintf(stderr, "\n");
+ }
+ } else
+ fprintf(stderr, "0x%016" PRIx64 "\n", get_reg(args));
}
union fpr
{
- reg_t r;
+ freg_t r;
float s;
double d;
};
+void sim_t::interactive_freg(const std::string& cmd, const std::vector<std::string>& args)
+{
+ freg_t r = get_freg(args);
+ fprintf(stderr, "0x%016" PRIx64 "%016" PRIx64 "\n", r.v[1], r.v[0]);
+}
+
void sim_t::interactive_fregs(const std::string& cmd, const std::vector<std::string>& args)
{
fpr f;
f.r = get_freg(args);
- fprintf(stderr, "%g\n",f.s);
+ fprintf(stderr, "%g\n", isBoxedF32(f.r) ? (double)f.s : NAN);
}
void sim_t::interactive_fregd(const std::string& cmd, const std::vector<std::string>& args)
{
fpr f;
f.r = get_freg(args);
- fprintf(stderr, "%g\n",f.d);
+ fprintf(stderr, "%g\n", isBoxedF64(f.r) ? f.d : NAN);
}
reg_t sim_t::get_mem(const std::vector<std::string>& args)
{
if(args.size() != 1 && args.size() != 2)
- throw trap_illegal_instruction();
+ throw trap_interactive();
std::string addr_str = args[0];
mmu_t* mmu = debug_mmu;
if(args.size() == 2)
{
- int p = atoi(args[0].c_str());
- if(p >= (int)num_cores())
- throw trap_illegal_instruction();
- mmu = procs[p]->get_mmu();
+ processor_t *p = get_core(args[0]);
+ mmu = p->get_mmu();
addr_str = args[1];
}
void sim_t::interactive_str(const std::string& cmd, const std::vector<std::string>& args)
{
if(args.size() != 1)
- throw trap_illegal_instruction();
+ throw trap_interactive();
reg_t addr = strtol(args[0].c_str(),NULL,16);
projects / riscv-isa-sim.git / blobdiff