sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

config: fixed minor bug connecting dma devices to ruby

Browse source
This commit is contained in:
Brad Beckmann 2011-02-08 15:52:44 -08:00
parent 488280e48b
commit 6ebd7c390b
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configs/common/FSConfig.py
View file

@ -334,6 +334,9 @@ def makeX86System(mem_mode, numCPUs = 1, mdesc = None, self = None, Ruby = False
# Create and connect the busses required by each memory system # Create and connect the busses required by each memory system
if Ruby: if Ruby:
connectX86RubySystem(self) connectX86RubySystem(self)
# add the ide to the list of dma devices that later need to attach to
# dma controllers
self._dma_devices = [self.pc.south_bridge.ide]
else: else:
connectX86ClassicSystem(self) connectX86ClassicSystem(self)

12
configs/example/ruby_fs.py
View file

@ -111,19 +111,17 @@ CPUClass.clock = options.clock
if buildEnv['TARGET_ISA'] == "alpha": if buildEnv['TARGET_ISA'] == "alpha":
system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0]) system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0])
system.ruby = Ruby.create_system(options,
system,
system.piobus,
system.dma_devices)
elif buildEnv['TARGET_ISA'] == "x86": elif buildEnv['TARGET_ISA'] == "x86":
system = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0], True) system = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0], True)
setWorkCountOptions(system, options) setWorkCountOptions(system, options)
system.ruby = Ruby.create_system(options,
system,
system.piobus)
else: else:
fatal("incapable of building non-alpha or non-x86 full system!") fatal("incapable of building non-alpha or non-x86 full system!")
system.ruby = Ruby.create_system(options,
system,
system.piobus,
system._dma_devices)
system.cpu = [CPUClass(cpu_id=i) for i in xrange(options.num_cpus)] system.cpu = [CPUClass(cpu_id=i) for i in xrange(options.num_cpus)]
for (i, cpu) in enumerate(system.cpu): for (i, cpu) in enumerate(system.cpu):