Deleted Added
sdiff udiff text old ( 5142:73aa4932b65b ) new ( 5222:bb733a878f85 )
full compact
1# Copyright (c) 2006-2007 The Regents of The University of Michigan
2# All rights reserved.
3#
4# Redistribution and use in source and binary forms, with or without
5# modification, are permitted provided that the following conditions are
6# met: redistributions of source code must retain the above copyright
7# notice, this list of conditions and the following disclaimer;
8# redistributions in binary form must reproduce the above copyright

--- 83 unchanged lines hidden (view full) ---

92else:
93 if options.dual:
94 bm = [SysConfig(), SysConfig()]
95 else:
96 bm = [SysConfig()]
97
98if m5.build_env['TARGET_ISA'] == "alpha":
99 test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0])
100elif m5.build_env['TARGET_ISA'] == "sparc":
101 test_sys = makeSparcSystem(test_mem_mode, bm[0])
102elif m5.build_env['TARGET_ISA'] == "x86":
103 test_sys = makeX86System(test_mem_mode, bm[0])
104else:
105 m5.panic("incapable of building non-alpha or non-sparc full system!")
106
107if options.kernel is not None:

--- 27 unchanged lines hidden (view full) ---

135 if options.l2cache:
136 test_sys.cpu[i].connectMemPorts(test_sys.tol2bus)
137 else:
138 test_sys.cpu[i].connectMemPorts(test_sys.membus)
139
140 if options.fastmem:
141 test_sys.cpu[i].physmem_port = test_sys.physmem.port
142
143if len(bm) == 2:
144 if m5.build_env['TARGET_ISA'] == 'alpha':
145 drive_sys = makeLinuxAlphaSystem(drive_mem_mode, bm[1])
146 elif m5.build_env['TARGET_ISA'] == 'sparc':
147 drive_sys = makeSparcSystem(drive_mem_mode, bm[1])
148 elif m5.build.env['TARGET_ISA'] == 'x86':
149 drive_sys = makeX86System(drive_mem_mode, bm[1])
150 drive_sys.cpu = DriveCPUClass(cpu_id=0)
151 drive_sys.cpu.connectMemPorts(drive_sys.membus)
152 if options.fastmem:
153 drive_sys.cpu.physmem_port = drive_sys.physmem.port
154 if options.kernel is not None:
155 drive_sys.kernel = binary(options.kernel)
156
157 root = makeDualRoot(test_sys, drive_sys, options.etherdump)
158elif len(bm) == 1:
159 root = Root(system=test_sys)
160else:
161 print "Error I don't know how to create more than 2 systems."
162 sys.exit(1)
163
164Simulation.run(options, root, test_sys, FutureClass)