wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add HTIF args back to emulator.cc

Browse Source
This commit is contained in:
Zitao Fang
2020-09-25 20:36:07 -07:00
parent 23847a6dca
commit 5243ee2a35
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
generators/utilities/src/main/resources/csrc/emulator.cc
View File

@@ -163,6 +163,7 @@ int main(int argc, char** argv)
#if VM_TRACE #if VM_TRACE
case 'v': { case 'v': {
vcdfile_name = optarg; vcdfile_name = optarg;
// printf("%s\n", vcdfile_name);
vcdfile = strcmp(optarg, "-") == 0 ? stdout : fopen(optarg, "w"); vcdfile = strcmp(optarg, "-") == 0 ? stdout : fopen(optarg, "w");
if (!vcdfile) { if (!vcdfile) {
std::cerr << "Unable to open " << optarg << " for VCD write\n"; std::cerr << "Unable to open " << optarg << " for VCD write\n";
@@ -258,6 +259,11 @@ done_processing:
return 1; return 1;
} }
int htif_argc = 1 + argc - optind;
htif_argv = (char **) malloc((htif_argc) * sizeof (char *));
htif_argv[0] = argv[0];
for (int i = 1; optind < argc;) htif_argv[i++] = argv[optind++];
if (verbose) if (verbose)
fprintf(stderr, "using random seed %u\n", random_seed); fprintf(stderr, "using random seed %u\n", random_seed);
@@ -265,7 +271,7 @@ done_processing:
srand48(random_seed); srand48(random_seed);
Verilated::randReset(2); Verilated::randReset(2);
Verilated::commandArgs(argc, argv); Verilated::commandArgs(htif_argc, htif_argv);
TEST_HARNESS *tile = new TEST_HARNESS; TEST_HARNESS *tile = new TEST_HARNESS;
#if VM_TRACE #if VM_TRACE
@@ -374,5 +380,6 @@ done_processing:
if (tsi) delete tsi; if (tsi) delete tsi;
if (jtag) delete jtag; if (jtag) delete jtag;
if (tile) delete tile; if (tile) delete tile;
if (htif_argv) free(htif_argv);
return ret; return ret;
} }

2
sims/verilator/Makefile
View File

@@ -28,7 +28,7 @@ sim_prefix = simulator
sim = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG) sim = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)
sim_debug = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)-debug sim_debug = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)-debug
WAVEFORM_FLAG=-v $(sim_out_name).vcd WAVEFORM_FLAG=-v$(sim_out_name).vcd
# If verilator seed unspecified, verilator uses srand as random seed # If verilator seed unspecified, verilator uses srand as random seed
ifdef RANDOM_SEED ifdef RANDOM_SEED