From 8d84f81e7041bd26320b0795800100f2aa298965 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 26 Apr 2009 02:04:32 -0700 Subject: X86, Config: Make makeX86System consider the number of CPUs, and clean up interrupt assignment. --- configs/example/fs.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configs/example') diff --git a/configs/example/fs.py b/configs/example/fs.py index c013a97ae..b5be79a08 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -96,6 +96,8 @@ else: else: bm = [SysConfig()] +np = options.num_cpus + if m5.build_env['TARGET_ISA'] == "alpha": test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0]) elif m5.build_env['TARGET_ISA'] == "mips": @@ -103,7 +105,7 @@ elif m5.build_env['TARGET_ISA'] == "mips": elif m5.build_env['TARGET_ISA'] == "sparc": test_sys = makeSparcSystem(test_mem_mode, bm[0]) elif m5.build_env['TARGET_ISA'] == "x86": - test_sys = makeLinuxX86System(test_mem_mode, bm[0]) + test_sys = makeLinuxX86System(test_mem_mode, np, bm[0]) else: m5.fatal("incapable of building non-alpha or non-sparc full system!") @@ -113,8 +115,6 @@ if options.kernel is not None: if options.script is not None: test_sys.readfile = options.script -np = options.num_cpus - if options.l2cache: test_sys.l2 = L2Cache(size = '2MB') test_sys.tol2bus = Bus() @@ -153,7 +153,7 @@ if len(bm) == 2: elif m5.build_env['TARGET_ISA'] == 'sparc': drive_sys = makeSparcSystem(drive_mem_mode, bm[1]) elif m5.build.env['TARGET_ISA'] == 'x86': - drive_sys = makeX86System(drive_mem_mode, bm[1]) + drive_sys = makeX86System(drive_mem_mode, np, bm[1]) drive_sys.cpu = DriveCPUClass(cpu_id=0) drive_sys.cpu.connectMemPorts(drive_sys.membus) if options.fastmem: -- cgit v1.2.3