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

merge fixes

Browse Source
This commit is contained in:
Blaise Tine
2020-06-23 14:40:29 -07:00
parent d1103733f5
commit c9c34cb71a
9 changed files with 0 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
simX/simX.cpp
View File

@@ -59,14 +59,9 @@ HarpToolMode findMode(int argc, char** argv) {
int emu_main(int argc, char **argv) {
string archString("rv32i");
string imgFileName("a.dsfsdout.bin");
<<<<<<< HEAD
bool showHelp, showStats, basicMachine, batch;
bool cpu_mode(false);
=======
bool showHelp(false), showStats(false), basicMachine(true);
int max_warps(NUM_WARPS);
int max_threads(NUM_THREADS);
>>>>>>> fpga_synthesis
/* Read the command line arguments. */
CommandLineArgFlag fh("-h", "--help", "", showHelp);
@@ -74,13 +69,8 @@ int emu_main(int argc, char **argv) {
CommandLineArgSetter<string>fa("-a", "--arch", "", archString);
CommandLineArgFlag fs("-s", "--stats", "", showStats);
CommandLineArgFlag fb("-b", "--basic", "", basicMachine);
<<<<<<< HEAD
CommandLineArgFlag fi("-i", "--batch", "", batch);
CommandLineArgFlag fx("-x", "--cpu", "", cpu_mode);
=======
CommandLineArgSetter<int> fw("-w", "--warps", "", max_warps);
CommandLineArgSetter<int> ft("-t", "--threads", "", max_threads);
>>>>>>> fpga_synthesis
CommandLineArg::readArgs(argc, argv);
@@ -90,11 +80,7 @@ int emu_main(int argc, char **argv) {
}
/* Instantiate a Core, RAM, and console output. */
<<<<<<< HEAD
ArchDef arch(archString, cpu_mode);
=======
ArchDef arch(archString, max_warps, max_threads);
>>>>>>> fpga_synthesis
Decoder *dec;