Merge with the main repo.

--HG--
rename : src/mem/vport.hh => src/mem/fs_translating_port_proxy.hh
rename : src/mem/translating_port.cc => src/mem/se_translating_port_proxy.cc
rename : src/mem/translating_port.hh => src/mem/se_translating_port_proxy.hh

1 files changed, 18 insertions, 11 deletions

diff --git a/configs/example/se.py b/configs/example/se.py
index 56737d6d5..572364482 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -1,3 +1,15 @@
+# Copyright (c) 2012 ARM Limited
+# All rights reserved.
+#
+# The license below extends only to copyright in the software and shall
+# not be construed as granting a license to any other intellectual
+# property including but not limited to intellectual property relating
+# to a hardware implementation of the functionality of the software
+# licensed hereunder.  You may use the software subject to the license
+# terms below provided that you ensure that this notice is replicated
+# unmodified and in its entirety in all distributions of the software,
+# modified or unmodified, in source code or in binary form.
+#
 # Copyright (c) 2006-2008 The Regents of The University of Michigan
 # All rights reserved.
 #
@@ -152,20 +164,13 @@ if options.cpu_type == "detailed" or options.cpu_type == "inorder":
             process += [smt_process, ]
             smt_idx += 1
     numThreads = len(workloads)
-    
+
 if options.ruby:
-    if options.cpu_type == "detailed":
-        print >> sys.stderr, "Ruby only works with TimingSimpleCPU!!"
+    if not (options.cpu_type == "detailed" or options.cpu_type == "timing"):
+        print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!"
         sys.exit(1)
-    elif not options.cpu_type == "timing":
-        print >> sys.stderr, "****WARN:  using Timing CPU since it's needed by Ruby"
-
-    class CPUClass(TimingSimpleCPU): pass
-    test_mem_mode = 'timing'
-    FutureClass = None
-else:
-    (CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
 
+(CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
 CPUClass.clock = '2GHz'
 CPUClass.numThreads = numThreads;
 
@@ -179,7 +184,9 @@ if options.ruby:
     options.use_map = True
     Ruby.create_system(options, system)
     assert(options.num_cpus == len(system.ruby._cpu_ruby_ports))
+    system.system_port = system.ruby._sys_port_proxy.port
 else:
+    system.system_port = system.membus.port
     system.physmem.port = system.membus.port
     CacheConfig.config_cache(options, system)