#include "decode.h"
#include "disasm.h"
#include "sim.h"
-#include "htif.h"
+#include "mmu.h"
#include <sys/mman.h>
#include <termios.h>
#include <map>
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"
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);
}
r = strtoul(args[1].c_str(), &ptr, 10);
if (*ptr) {
#define DECLARE_CSR(name, number) if (args[1] == #name) return p->get_csr(number);
- if (0) ;
- #include "encoding.h"
- else r = NXPR;
+ #include "encoding.h" // generates if's for all csrs
+ r = NXPR; // else case (csr name not found)
#undef DECLARE_CSR
}
}
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