diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-06-17 17:17:43 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-06-17 17:17:43 -0400 |
| commit | 8a1298822182c0ca01caddaa539bdb6a53927e57 (patch) | |
| tree | 5677d2b7bf3a3d18295041167f1544def27f957c /src/sim | |
| parent | b1fc43dd595e8f0420d9b61932c99f620df237a5 (diff) | |
| parent | d96d28e56d39eec0baa1377779119495cfbf4701 (diff) | |
| download | gem5-8a1298822182c0ca01caddaa539bdb6a53927e57.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : c8670f1a39d6826870ca0934587f4cc71c94b0ab
Diffstat (limited to 'src/sim')
| -rw-r--r-- | src/sim/main.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/sim/main.cc b/src/sim/main.cc index dd3b5f4e5..5a99e15b4 100644 --- a/src/sim/main.cc +++ b/src/sim/main.cc @@ -168,7 +168,7 @@ sayHello(ostream &out) } -extern "C" { void init_main(); } +extern "C" { void init_cc_main(); } int main(int argc, char **argv) @@ -260,8 +260,8 @@ main(int argc, char **argv) Py_Initialize(); PySys_SetArgv(argc, argv); - // initialize SWIG 'main' module - init_main(); + // initialize SWIG 'cc_main' module + init_cc_main(); if (argc > 0) { // extra arg(s): first is script file, remaining ones are args @@ -299,6 +299,14 @@ main(int argc, char **argv) Py_Finalize(); } + +void +setOutputDir(const string &dir) +{ + simout.setDirectory(dir); +} + + IniFile inifile; SimObject * |