Hand-merge static_inst.hh. These execute functions are within an external file in the new CPU case.

cpu/static_inst.hh:
    Hand-merge.  These execute functions are within an external file in the new CPU case.

--HG--
extra : convert_revision : a34112f471fa31bdd5bb53552ddd704b9571c110

1 files changed, 12 insertions, 3 deletions

diff --git a/util/pbs/jobfile.py b/util/pbs/jobfile.py
index 570faa61b..83eb81358 100644
--- a/util/pbs/jobfile.py
+++ b/util/pbs/jobfile.py
@@ -26,7 +26,9 @@
 #
 # Authors: Nathan Binkert
 
-from os.path import expanduser
+from os.path import expanduser, isfile, join as joinpath
+import sys
+
 def crossproduct(options):
     number = len(options)
     indexes = [ 0 ] * number
@@ -49,9 +51,16 @@ def crossproduct(options):
         done = next()
 
 class JobFile(object):
-    def __init__(self, file):
+    def __init__(self, jfile):
         self.data = {}
-        execfile(expanduser(file), self.data)
+        jfile = expanduser(jfile)
+        if not isfile(jfile):
+            for p in sys.path:
+                if isfile(joinpath(p, jfile)):
+                    jfile = joinpath(p, jfile)
+                    break
+
+        execfile(jfile, self.data)
         self.options = self.data['options']
         self.environment = self.data['environment']
         self.jobinfo = {}