summaryrefslogtreecommitdiff
path: root/src/python/m5
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2008-08-03 18:19:54 -0700
committerNathan Binkert <nate@binkert.org>2008-08-03 18:19:54 -0700
commitede89c2d541051c2ed647e2967712e10b3c0fab0 (patch)
tree03f79b80ab56a55416bb2017d0ee7bec87b56242 /src/python/m5
parent678abbc3646695f7d9693ce0757abaf7463d0354 (diff)
downloadgem5-ede89c2d541051c2ed647e2967712e10b3c0fab0.tar.xz
libm5: Create a libm5 static library for embedding m5.
This should allow m5 to be more easily embedded into other simulators. The m5 binary adds a simple main function which then calls into the m5 libarary to start the simulation. In order to make this work correctly, it was necessary embed python code directly into the library instead of the zipfile hack. This is because you can't just append the zipfile to the end of a library the way you can a binary. As a result, Python files that are part of the m5 simulator are now compile, marshalled, compressed, and then inserted into the library's data section with a certain symbol name. Additionally, a new Importer was needed to allow python to get at the embedded python code. Small additional changes include: - Get rid of the PYTHONHOME stuff since I don't think anyone ever used it, and it just confuses things. Easy enough to add back if I'm wrong. - Create a few new functions that are key to initializing and running the simulator: initSignals, initM5Python, m5Main. The original code for creating libm5 was inspired by a patch Michael Adler, though the code here was done by me.
Diffstat (limited to 'src/python/m5')
-rw-r--r--src/python/m5/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py
index f21bb362e..7b071bccd 100644
--- a/src/python/m5/__init__.py
+++ b/src/python/m5/__init__.py
@@ -91,7 +91,7 @@ else:
if running_m5:
from event import *
from simulate import *
- from main import options
+ from main import options, main
import stats
import SimObject