summaryrefslogtreecommitdiff
path: root/configs/example
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2011-02-06 22:14:18 -0800
committerBrad Beckmann <Brad.Beckmann@amd.com>2011-02-06 22:14:18 -0800
commit17b4ef52bb9b31f7d57a499eac1d1656bb5df679 (patch)
treeed406690adb62e29d544e5c8f822573358a76534 /configs/example
parent1b54344aeb1cdac82cd9d85c4e1e37ed23821853 (diff)
downloadgem5-17b4ef52bb9b31f7d57a499eac1d1656bb5df679.tar.xz
ruby: x86 fs config support
Diffstat (limited to 'configs/example')
-rw-r--r--configs/example/ruby_fs.py26
1 files changed, 19 insertions, 7 deletions
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index 4dd1364c7..721315c9f 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Advanced Micro Devices, Inc.
+# Copyright (c) 2009-2011 Advanced Micro Devices, Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -109,12 +109,19 @@ FutureClass = None
CPUClass.clock = options.clock
-system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0])
-
-system.ruby = Ruby.create_system(options,
- system,
- system.piobus,
- system._dma_devices)
+if buildEnv['TARGET_ISA'] == "alpha":
+ system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0])
+ system.ruby = Ruby.create_system(options,
+ system,
+ system.piobus,
+ system.dma_devices)
+elif buildEnv['TARGET_ISA'] == "x86":
+ system = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0], True)
+ system.ruby = Ruby.create_system(options,
+ system,
+ system.piobus)
+else:
+ fatal("incapable of building non-alpha or non-x86 full system!")
system.cpu = [CPUClass(cpu_id=i) for i in xrange(options.num_cpus)]
@@ -124,6 +131,11 @@ for (i, cpu) in enumerate(system.cpu):
#
cpu.icache_port = system.ruby.cpu_ruby_ports[i].port
cpu.dcache_port = system.ruby.cpu_ruby_ports[i].port
+ if buildEnv['TARGET_ISA'] == "x86":
+ cpu.itb.walker.port = system.ruby.cpu_ruby_ports[i].port
+ cpu.dtb.walker.port = system.ruby.cpu_ruby_ports[i].port
+ cpu.interrupts.pio = system.piobus.port
+ cpu.interrupts.int_port = system.piobus.port
root = Root(system = system)