merge
authorDerek Hower <drh5@cs.wisc.edu>
Tue, 19 Jan 2010 21:48:12 +0000 (15:48 -0600)
committerDerek Hower <drh5@cs.wisc.edu>
Tue, 19 Jan 2010 21:48:12 +0000 (15:48 -0600)
commit279f179babc9e5663156777c533c06edc91bce9a
treee6718ee514cc81678491b50562ce8c463c0b20fd
parent5aa104e072eb20f6aca49b169521b0c2da33c844
parent295516a590b6e47c9a881f193027447e500c749c
merge
14 files changed:
src/mem/protocol/MI_example-dir.sm
src/mem/protocol/RubySlicc_ComponentMapping.sm
src/mem/protocol/SConsopts
src/mem/ruby/config/MI_example-homogeneous.rb
src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb
src/mem/ruby/libruby.hh
src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
src/mem/ruby/system/CacheMemory.cc
src/mem/ruby/system/CacheMemory.hh
src/mem/ruby/system/DirectoryMemory.cc
src/mem/ruby/system/Sequencer.hh
src/mem/slicc/symbols/StateMachine.py
src/mem/slicc/symbols/Type.py
tests/configs/ruby_config.py