diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2009-08-17 00:21:57 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2009-08-17 00:21:57 -0700 |
commit | a43ae579dd3128a0ced2238532f26d99db197361 (patch) | |
tree | 271a90c0fdfde8b58180ee494c528a3fbec57588 /src/mem/ruby/config/cfg.rb | |
parent | 32c8514b450a7dda77a3963d00642fcc5de658da (diff) | |
parent | a6b39c07d9d03955382a0e930b363c6e6fd4b942 (diff) | |
download | gem5-a43ae579dd3128a0ced2238532f26d99db197361.tar.xz |
Merge with head.
Diffstat (limited to 'src/mem/ruby/config/cfg.rb')
-rw-r--r-- | src/mem/ruby/config/cfg.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/ruby/config/cfg.rb b/src/mem/ruby/config/cfg.rb index ffc36dd67..445bb4885 100644 --- a/src/mem/ruby/config/cfg.rb +++ b/src/mem/ruby/config/cfg.rb @@ -11,7 +11,7 @@ end def assert(condition,message) unless condition - raise AssertionFailure, "Assertion failed: #{message}" + raise AssertionFailure, "\n\nAssertion failed: \n\n #{message}\n\n" end end @@ -309,7 +309,7 @@ class CacheController < NetPort cache.controller = self } - if !@@total_cache_controllers.has_key?(mach_type) + if !@@total_cache_controllers.key?(mach_type) @@total_cache_controllers[mach_type] = 0 end @version = @@total_cache_controllers[mach_type] @@ -631,7 +631,7 @@ class Network < LibRubyObject vec += " buffer_size "+buffer_size.to_s vec += " link_latency "+adaptive_routing.to_s vec += " on_chip_latency "+on_chip_latency.to_s - + vec += " control_msg_size "+control_msg_size.to_s end def printTopology() |