diff options
| -rw-r--r-- | configs/splash2/run.py | 8 | ||||
| -rw-r--r-- | sim/main.cc | 32 |
2 files changed, 4 insertions, 36 deletions
diff --git a/configs/splash2/run.py b/configs/splash2/run.py index 2ecdf3fc1..ebbe14939 100644 --- a/configs/splash2/run.py +++ b/configs/splash2/run.py @@ -34,14 +34,14 @@ if 'SYSTEM' not in env: if env['SYSTEM'] == 'Simple': from SimpleConfig import * - BaseCPU.workload = parent.workload + BaseCPU.workload = Parent.workload SimpleStandAlone.cpu = [ CPU() for i in xrange(int(env['NP'])) ] - root = SimpleStandAlone + root = SimpleStandAlone() elif env['SYSTEM'] == 'Detailed': from DetailedConfig import * - BaseCPU.workload = parent.workload + BaseCPU.workload = Parent.workload DetailedStandAlone.cpu = [ DetailedCPU() for i in xrange(int(env['NP'])) ] - root = DetailedStandAlone + root = DetailedStandAlone() else: panic("The SYSTEM environment variable was set to something improper.\n Use Simple or Detailed\n") diff --git a/sim/main.cc b/sim/main.cc index ed8bf9e63..b28cac15b 100644 --- a/sim/main.cc +++ b/sim/main.cc @@ -132,34 +132,6 @@ showBriefHelp(ostream &out) ccprintf(out, "%s -X\n -X extract embedded files\n\n", prog); ccprintf(out, "%s -h\n -h print short help\n\n", prog); - ccprintf(out, "%s -H\n -H print long help\n\n", prog); -} - -/// Show verbose help message. Includes parameter listing from -/// showBriefHelp(), plus an exhaustive list of ini-file parameters -/// and SimObjects (with their parameters). -void -showLongHelp(ostream &out) -{ - showBriefHelp(out); - - out << endl - << endl - << "-----------------" << endl - << "Global Parameters" << endl - << "-----------------" << endl - << endl; - - ParamContext::describeAllContexts(out); - - out << endl - << endl - << "-----------------" << endl - << "Simulator Objects" << endl - << "-----------------" << endl - << endl; - - SimObjectClass::describeAllClasses(out); } /// Print welcome message. @@ -292,10 +264,6 @@ main(int argc, char **argv) showBriefHelp(cerr); exit(1); - case 'H': - showLongHelp(cerr); - exit(1); - case 'E': option = getOptionString(i, argc, argv); if (!split_first(option, var, val, '=')) |