diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-12 22:36:22 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-12 22:36:22 -0500 |
| commit | 14cb2264c80eb961eab1f80738e0144b6179d1a3 (patch) | |
| tree | 1b8683e8a28d755abd31fa980c0c5505e92e580b /src/sim/main.cc | |
| parent | fd35f02efe5707539d2268fc844131e737f56983 (diff) | |
| parent | d2d44317528ffadf81fbb95c92291d8d2d4a2190 (diff) | |
| download | gem5-14cb2264c80eb961eab1f80738e0144b6179d1a3.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
--HG--
extra : convert_revision : eed3b6a650635d43fe75c2158c8417647af640d9
Diffstat (limited to 'src/sim/main.cc')
| -rw-r--r-- | src/sim/main.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sim/main.cc b/src/sim/main.cc index 5b44102a8..6037283a4 100644 --- a/src/sim/main.cc +++ b/src/sim/main.cc @@ -117,7 +117,9 @@ abortHandler(int sigtype) #endif } -extern "C" { void init_cc_main(); } +extern "C" { +void init_main(); +} int main(int argc, char **argv) @@ -155,8 +157,8 @@ main(int argc, char **argv) Py_Initialize(); PySys_SetArgv(argc, argv); - // initialize SWIG 'cc_main' module - init_cc_main(); + // initialize SWIG 'm5.internal.main' module + init_main(); PyRun_SimpleString("import m5.main"); PyRun_SimpleString("m5.main.main()"); |