From f8fc0419c5b1f4e20fd6886ca44626a2ca264fae Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 7 Feb 2011 01:22:15 -0800 Subject: X86, Config: Move the setting of work count options to a separate function. This way things that don't care about work count options and/or aren't called by something that has those command line options set up doesn't have to build a fake object to carry in inert values. --- configs/example/fs.py | 3 ++- configs/example/ruby_fs.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'configs/example') diff --git a/configs/example/fs.py b/configs/example/fs.py index a097c4138..b392f1a91 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -131,7 +131,8 @@ elif buildEnv['TARGET_ISA'] == "mips": elif buildEnv['TARGET_ISA'] == "sparc": test_sys = makeSparcSystem(test_mem_mode, bm[0]) elif buildEnv['TARGET_ISA'] == "x86": - test_sys = makeLinuxX86System(test_mem_mode, options, bm[0]) + test_sys = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0]) + setWorkCountOptions(test_sys, options) elif buildEnv['TARGET_ISA'] == "arm": test_sys = makeLinuxArmSystem(test_mem_mode, bm[0], bare_metal=options.bare_metal, machine_type=options.machine_type) diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py index 6f35f02cd..adc8e6147 100644 --- a/configs/example/ruby_fs.py +++ b/configs/example/ruby_fs.py @@ -116,7 +116,8 @@ if buildEnv['TARGET_ISA'] == "alpha": system.piobus, system.dma_devices) elif buildEnv['TARGET_ISA'] == "x86": - system = makeLinuxX86System(test_mem_mode, options, bm[0], True) + system = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0], True) + setWorkCountOptions(system, options) system.ruby = Ruby.create_system(options, system, system.piobus) -- cgit v1.2.3