diff options
| author | Derek Hower <drh5@cs.wisc.edu> | 2009-08-04 23:05:37 -0500 |
|---|---|---|
| committer | Derek Hower <drh5@cs.wisc.edu> | 2009-08-04 23:05:37 -0500 |
| commit | 7f012ef8dab812ac6dbad0ccafb8a5d22c1f3dcb (patch) | |
| tree | 203f7f90177bc03b14de4681acf60287130aa6e0 /src/mem/ruby | |
| parent | 33b28fde7aca9bf1ae16b9db09e71ccd44d3ae76 (diff) | |
| download | gem5-7f012ef8dab812ac6dbad0ccafb8a5d22c1f3dcb.tar.xz | |
ruby: made mapAddressToRange based off a bit count
Diffstat (limited to 'src/mem/ruby')
| -rw-r--r-- | src/mem/ruby/config/MOESI_CMP_directory.rb | 3 | ||||
| -rw-r--r-- | src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/mem/ruby/config/MOESI_CMP_directory.rb b/src/mem/ruby/config/MOESI_CMP_directory.rb index 936eb8e80..34f7c1776 100644 --- a/src/mem/ruby/config/MOESI_CMP_directory.rb +++ b/src/mem/ruby/config/MOESI_CMP_directory.rb @@ -26,14 +26,13 @@ class MOESI_CMP_directory_L1CacheController < L1CacheController num_block_bits = log_int(RubySystem.block_size_bytes) l2_select_low_bit = num_block_bits - l2_select_high_bit = num_block_bits + num_select_bits - 1 vec = super() vec += " icache " + @icache.obj_name vec += " dcache " + @dcache.obj_name vec += " request_latency "+request_latency().to_s vec += " l2_select_low_bit " + l2_select_low_bit.to_s - vec += " l2_select_high_bit " + l2_select_high_bit.to_s + vec += " l2_select_num_bits " + num_select_bits.to_s return vec end end diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh index a6d99ada9..96405c8dd 100644 --- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh +++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh @@ -86,10 +86,12 @@ MachineID map_Address_to_DMA(const Address & addr) } inline -MachineID mapAddressToRange(const Address & addr, MachineType type, int low_bit, int high_bit) +MachineID mapAddressToRange(const Address & addr, MachineType type, int low_bit, int num_bits) { MachineID mach = {type, 0}; - mach.num = addr.bitSelect(low_bit, high_bit); + if (num_bits == 0) + return mach; + mach.num = addr.bitSelect(low_bit, low_bit+num_bits-1); return mach; } |