#include "sim.h"
#include "htif.h"
#include <sys/mman.h>
+#include <termios.h>
#include <map>
#include <iostream>
#include <climits>
+#include <cinttypes>
#include <assert.h>
#include <stdlib.h>
#include <unistd.h>
#include <string>
#include <vector>
-static std::string readline()
+static std::string readline(int fd)
{
+ struct termios tios;
+ bool noncanonical = tcgetattr(fd, &tios) == 0 && (tios.c_lflag & ICANON) == 0;
+
std::string s;
- while (1)
+ for (char ch; read(fd, &ch, 1) == 1; )
{
- char ch;
- assert(read(1, &ch, 1) == 1);
-
if (ch == '\x7f')
{
if (s.empty())
continue;
s.erase(s.end()-1);
+
+ if (noncanonical && write(fd, "\b \b", 3) != 3)
+ ; // shut up gcc
}
+ else if (noncanonical && write(fd, &ch, 1) != 1)
+ ; // shut up gcc
- assert(write(1, &ch, 1) == 1);
if (ch == '\n')
- return s;
+ break;
if (ch != '\x7f')
s += ch;
}
+ return s;
}
void sim_t::interactive()
{
- std::cout << ": " << std::flush;
- std::string s = readline();
-
- std::stringstream ss(s);
- std::string cmd, tmp;
- std::vector<std::string> args;
- if (!(ss >> cmd))
+ while (true)
{
- interactive_run_noisy(std::string("r"), std::vector<std::string>(1,"1"));
- return;
- }
- while (ss >> tmp)
- args.push_back(tmp);
-
- typedef void (sim_t::*interactive_func)(const std::string&, const std::vector<std::string>&);
- std::map<std::string,interactive_func> funcs;
-
- funcs["r"] = &sim_t::interactive_run_noisy;
- funcs["rs"] = &sim_t::interactive_run_silent;
- funcs["rp"] = &sim_t::interactive_run_proc_noisy;
- funcs["rps"] = &sim_t::interactive_run_proc_silent;
- funcs["reg"] = &sim_t::interactive_reg;
- funcs["fregs"] = &sim_t::interactive_fregs;
- funcs["fregd"] = &sim_t::interactive_fregd;
- funcs["mem"] = &sim_t::interactive_mem;
- funcs["str"] = &sim_t::interactive_str;
- funcs["until"] = &sim_t::interactive_until;
- funcs["while"] = &sim_t::interactive_until;
- funcs["q"] = &sim_t::interactive_quit;
-
- try
- {
- if(funcs.count(cmd))
- (this->*funcs[cmd])(cmd, args);
+ std::cerr << ": " << std::flush;
+ std::string s = readline(2);
+
+ std::stringstream ss(s);
+ std::string cmd, tmp;
+ std::vector<std::string> args;
+
+ if (!(ss >> cmd))
+ {
+ step(1, true);
+ continue;
+ }
+
+ while (ss >> tmp)
+ args.push_back(tmp);
+
+ typedef void (sim_t::*interactive_func)(const std::string&, const std::vector<std::string>&);
+ std::map<std::string,interactive_func> funcs;
+
+ funcs["r"] = &sim_t::interactive_run_noisy;
+ funcs["rs"] = &sim_t::interactive_run_silent;
+ funcs["reg"] = &sim_t::interactive_reg;
+ funcs["fregs"] = &sim_t::interactive_fregs;
+ funcs["fregd"] = &sim_t::interactive_fregd;
+ funcs["mem"] = &sim_t::interactive_mem;
+ funcs["str"] = &sim_t::interactive_str;
+ funcs["until"] = &sim_t::interactive_until;
+ funcs["while"] = &sim_t::interactive_until;
+ funcs["q"] = &sim_t::interactive_quit;
+
+ try
+ {
+ if(funcs.count(cmd))
+ (this->*funcs[cmd])(cmd, args);
+ }
+ catch(trap_t t) {}
}
- catch(trap_t t) {}
+ ctrlc_pressed = false;
}
void sim_t::interactive_run_noisy(const std::string& cmd, const std::vector<std::string>& args)
void sim_t::interactive_run(const std::string& cmd, const std::vector<std::string>& args, bool noisy)
{
size_t steps = args.size() ? atoll(args[0].c_str()) : -1;
- step(steps, noisy);
-}
-
-void sim_t::interactive_run_proc_noisy(const std::string& cmd, const std::vector<std::string>& args)
-{
- interactive_run_proc(cmd,args,true);
-}
-
-void sim_t::interactive_run_proc_silent(const std::string& cmd, const std::vector<std::string>& args)
-{
- interactive_run_proc(cmd,args,false);
-}
-
-void sim_t::interactive_run_proc(const std::string& cmd, const std::vector<std::string>& a, bool noisy)
-{
- if(a.size() == 0)
- return;
-
- int p = atoi(a[0].c_str());
- if(p >= (int)num_cores())
- return;
-
- size_t steps = a.size() > 1 ? atoll(a[1].c_str()) : -1;
- procs[p]->step(steps, noisy);
+ ctrlc_pressed = false;
+ for (size_t i = 0; i < steps && !ctrlc_pressed; i++)
+ step(1, noisy);
}
void sim_t::interactive_quit(const std::string& cmd, const std::vector<std::string>& args)
void sim_t::interactive_reg(const std::string& cmd, const std::vector<std::string>& args)
{
- printf("0x%016llx\n",(unsigned long long)get_reg(args));
+ fprintf(stderr, "0x%016" PRIx64 "\n", get_reg(args));
}
union fpr
{
fpr f;
f.r = get_freg(args);
- printf("%g\n",f.s);
+ fprintf(stderr, "%g\n",f.s);
}
void sim_t::interactive_fregd(const std::string& cmd, const std::vector<std::string>& args)
{
fpr f;
f.r = get_freg(args);
- printf("%g\n",f.d);
+ fprintf(stderr, "%g\n",f.d);
}
reg_t sim_t::get_mem(const std::vector<std::string>& args)
int p = atoi(args[0].c_str());
if(p >= (int)num_cores())
throw trap_illegal_instruction;
- mmu->set_sr(procs[p]->sr);
mmu->set_ptbr(procs[p]->mmu.get_ptbr());
addr_str = args[1];
}
void sim_t::interactive_mem(const std::string& cmd, const std::vector<std::string>& args)
{
- printf("0x%016llx\n",(unsigned long long)get_mem(args));
+ fprintf(stderr, "0x%016" PRIx64 "\n", get_mem(args));
}
void sim_t::interactive_str(const std::string& cmd, const std::vector<std::string>& args)
void sim_t::interactive_until(const std::string& cmd, const std::vector<std::string>& args)
{
+ bool cmd_until = cmd == "until";
+
if(args.size() < 3)
return;
- std::string scmd = args[0];
reg_t val = strtol(args[args.size()-1].c_str(),NULL,16);
if(val == LONG_MAX)
val = strtoul(args[args.size()-1].c_str(),NULL,16);
std::vector<std::string> args2;
args2 = std::vector<std::string>(args.begin()+1,args.end()-1);
+ auto func = args[0] == "reg" ? &sim_t::get_reg :
+ args[0] == "pc" ? &sim_t::get_pc :
+ args[0] == "mem" ? &sim_t::get_mem :
+ NULL;
+
+ if (func == NULL)
+ return;
+
+ ctrlc_pressed = false;
+
while (1)
{
- reg_t current;
- if(scmd == "reg")
- current = get_reg(args2);
- else if(scmd == "pc")
- current = get_pc(args2);
- else if(scmd == "mem")
- current = get_mem(args2);
- else
- return;
-
- if(cmd == "until" && current == val)
+ reg_t current = (this->*func)(args2);
+
+ if (cmd_until == (current == val))
break;
- if(cmd == "while" && current != val)
+ if (ctrlc_pressed)
break;
step(1, false);
projects / riscv-isa-sim.git / blobdiff