riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

Pass target machine exit code back to host OS

Browse Source
This commit is contained in:
Andrew Waterman 2013-10-29 13:24:09 -07:00
parent 437f7ed4af
commit c55eee7244
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
csrc/emulator.cc
View File

@ -20,13 +20,12 @@ void handle_sigterm(int sig)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
unsigned random_seed = (unsigned)time(NULL) ^ (unsigned)getpid(); unsigned random_seed = (unsigned)time(NULL) ^ (unsigned)getpid();
uint64_t max_cycles = 0; uint64_t max_cycles = -1;
uint64_t trace_count = 0; uint64_t trace_count = 0;
int start = 0; int ret = 0;
const char* vcd = NULL; const char* vcd = NULL;
const char* loadmem = NULL; const char* loadmem = NULL;
FILE *vcdfile = NULL; FILE *vcdfile = NULL;
const char* failure = NULL;
disassembler disasm; disassembler disasm;
bool dramsim2 = false; bool dramsim2 = false;
bool log = false; bool log = false;
@ -89,7 +88,7 @@ int main(int argc, char** argv)
tile.clock_hi(LIT<1>(1)); tile.clock_hi(LIT<1>(1));
} }
while (!htif->done()) while (!htif->done() && trace_count < max_cycles)
{ {
tile.Top__io_mem_req_cmd_ready = LIT<1>(mm->req_cmd_ready()); tile.Top__io_mem_req_cmd_ready = LIT<1>(mm->req_cmd_ready());
tile.Top__io_mem_req_data_ready = LIT<1>(mm->req_data_ready()); tile.Top__io_mem_req_data_ready = LIT<1>(mm->req_data_ready());
@ -133,24 +132,23 @@ int main(int argc, char** argv)
tile.clock_hi(LIT<1>(0)); tile.clock_hi(LIT<1>(0));
trace_count++; trace_count++;
if (max_cycles != 0 && trace_count == max_cycles)
{
failure = "timeout";
break;
}
} }
if (vcd) if (vcd)
fclose(vcdfile); fclose(vcdfile);
delete htif; if (htif->exit_code())
if (failure)
{ {
fprintf(stderr, "*** FAILED *** (%s) after %lld cycles\n", failure, (long long)trace_count); fprintf(stderr, "*** FAILED *** (code = %d) after %lld cycles\n", htif->exit_code(), (long long)trace_count);
return -1; ret = htif->exit_code();
}
else if (trace_count == max_cycles)
{
fprintf(stderr, "*** FAILED *** (timeout) after %lld cycles\n", (long long)trace_count);
ret = 2;
} }
return 0; delete htif;
return ret;
} }

3
csrc/vcs_main.cc
View File

@ -106,10 +106,11 @@ void htif_init
htif = new htif_emulator_t(args); htif = new htif_emulator_t(args);
} }
void htif_fini() void htif_fini(vc_handle failure)
{ {
delete htif; delete htif;
htif = NULL; htif = NULL;
exit(vc_getScalar(failure));
} }
void htif_tick void htif_tick