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

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

63 l2_cntrl_nodes = []
64 dir_cntrl_nodes = []
65 dma_cntrl_nodes = []
66
67 #
68 # Must create the individual controllers before the network to ensure the
69 # controller constructors are called before the network constructor
70 #
71
72 for i in xrange(options.num_cpus):
73 #
74 # First create the Ruby objects associated with this cpu
75 #
76 l1i_cache = L1Cache(size = options.l1i_size,
77 assoc = options.l1i_assoc)
78 l1d_cache = L1Cache(size = options.l1d_size,
79 assoc = options.l1d_assoc)
80
81 cpu_seq = RubySequencer(version = i,
82 icache = l1i_cache,
83 dcache = l1d_cache,
84 physMemPort = system.physmem.port,
85 physmem = system.physmem)
86
87 if piobus != None:
88 cpu_seq.pio_port = piobus.port
89
90 l1_cntrl = L1Cache_Controller(version = i,
91 sequencer = cpu_seq,
92 L1IcacheMemory = l1i_cache,
93 L1DcacheMemory = l1d_cache,
94 l2_select_num_bits = \
95 math.log(options.num_l2caches,
96 2))
97
98 exec("system.l1_cntrl%d = l1_cntrl" % i)
99 #
100 # Add controllers and sequencers to the appropriate lists
101 #
102 cpu_sequencers.append(cpu_seq)
103 l1_cntrl_nodes.append(l1_cntrl)
104
105 for i in xrange(options.num_l2caches):
106 #
107 # First create the Ruby objects associated with this cpu
108 #
109 l2_cache = L2Cache(size = options.l2_size,
110 assoc = options.l2_assoc)
111
112 l2_cntrl = L2Cache_Controller(version = i,
113 L2cacheMemory = l2_cache)
114
115 exec("system.l2_cntrl%d = l2_cntrl" % i)
116 l2_cntrl_nodes.append(l2_cntrl)
117
118 phys_mem_size = long(system.physmem.range.second) - \

--- 47 unchanged lines hidden ---