changeset b61dc895269a in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=b61dc895269a
description:
configs: small fix to ruby portion of fs.py and se.py
In fs.py the io port controller was being attached to the iobus multiple
times. This should be done only once. In se.py, the the option use_map
was being set which no longer exists.
diffstat:
configs/example/fs.py | 8 ++++----
configs/example/se.py | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diffs (36 lines):
diff -r 288eb5ee4b00 -r b61dc895269a configs/example/fs.py
--- a/configs/example/fs.py Tue Nov 18 02:38:23 2014 -0800
+++ b/configs/example/fs.py Tue Nov 18 19:17:29 2014 -0600
@@ -142,6 +142,10 @@
test_sys.ruby.clk_domain = SrcClockDomain(clock = options.ruby_clock,
voltage_domain =
test_sys.voltage_domain)
+ # Connect the ruby io port to the PIO bus,
+ # assuming that there is just one such port.
+ test_sys.iobus.master = test_sys.ruby._io_port.slave
+
for (i, cpu) in enumerate(test_sys.cpu):
#
# Tie the cpu ports to the correct ruby system ports
@@ -161,10 +165,6 @@
cpu.interrupts.int_master = test_sys.ruby._cpu_ports[i].slave
cpu.interrupts.int_slave = test_sys.ruby._cpu_ports[i].master
- # Connect the ruby io port to the PIO bus,
- # assuming that there is just one such port.
- test_sys.iobus.master = test_sys.ruby._io_port.slave
-
else:
if options.caches or options.l2cache:
# By default the IOCache runs at the system clock
diff -r 288eb5ee4b00 -r b61dc895269a configs/example/se.py
--- a/configs/example/se.py Tue Nov 18 02:38:23 2014 -0800
+++ b/configs/example/se.py Tue Nov 18 19:17:29 2014 -0600
@@ -225,7 +225,6 @@
print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!"
sys.exit(1)
- options.use_map = True
Ruby.create_system(options, False, system)
assert(options.num_cpus == len(system.ruby._cpu_ports))
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
