diff options
| author | Korey Sewell <ksewell@umich.edu> | 2010-03-23 00:29:10 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2010-03-23 00:29:10 -0400 |
| commit | d484e1b334c6fd3f2721a2a4628c2324ed14fd08 (patch) | |
| tree | c95594df5ecae29b11262967f3f8b99fca82ca5d /src/mem/ruby/common/Global.hh | |
| parent | 70308bc835035b940efb36d7f335643dfaa39851 (diff) | |
| parent | a0651b8f6127c8b7994a165b525e93d87c470d20 (diff) | |
| download | gem5-d484e1b334c6fd3f2721a2a4628c2324ed14fd08.tar.xz | |
m5merge(2): another merge of regression stats
Diffstat (limited to 'src/mem/ruby/common/Global.hh')
| -rw-r--r-- | src/mem/ruby/common/Global.hh | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/src/mem/ruby/common/Global.hh b/src/mem/ruby/common/Global.hh index 16465656d..de96c5a6b 100644 --- a/src/mem/ruby/common/Global.hh +++ b/src/mem/ruby/common/Global.hh @@ -1,4 +1,3 @@ - /* * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood * All rights reserved. @@ -27,42 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - * $Id$ - * - * */ - -#ifndef GLOBAL_H -#define GLOBAL_H - -/* -#ifdef SINGLE_LEVEL_CACHE -const bool TWO_LEVEL_CACHE = false; -#define L1I_CACHE_MEMBER_VARIABLE m_L1Cache_cacheMemory_vec[m_version] // currently all protocols require L1s == nodes -#define L1D_CACHE_MEMBER_VARIABLE m_L1Cache_cacheMemory_vec[m_version] // " -#define L2_CACHE_MEMBER_VARIABLE m_L1Cache_cacheMemory_vec[m_version] // " -#define L2_CACHE_VARIABLE m_L1Cache_cacheMemory_vec -#else -const bool TWO_LEVEL_CACHE = true; -#ifdef IS_CMP -#define L1I_CACHE_MEMBER_VARIABLE m_L1Cache_L1IcacheMemory_vec[m_version] -#define L1D_CACHE_MEMBER_VARIABLE m_L1Cache_L1DcacheMemory_vec[m_version] -#define L2_CACHE_MEMBER_VARIABLE m_L2Cache_L2cacheMemory_vec[m_version] -#define L2_CACHE_VARIABLE m_L2Cache_L2cacheMemory_vec -#else // not IS_CMP -#define L1I_CACHE_MEMBER_VARIABLE m_L1Cache_L1IcacheMemory_vec[m_version] // currently all protocols require L1s == nodes -#define L1D_CACHE_MEMBER_VARIABLE m_L1Cache_L1DcacheMemory_vec[m_version] // " -// #define L2_CACHE_MEMBER_VARIABLE m_L1Cache_L2cacheMemory_vec[m_version] // old exclusive caches don't support L2s != nodes -#define L2_CACHE_MEMBER_VARIABLE m_L1Cache_cacheMemory_vec[m_version] // old exclusive caches don't support L2s != nodes -#define L2_CACHE_VARIABLE m_L1Cache_L2cacheMemory_vec -#endif // IS_CMP -#endif //SINGLE_LEVEL_CACHE - -#define DIRECTORY_MEMBER_VARIABLE m_Directory_directory_vec[m_version] -#define TBE_TABLE_MEMBER_VARIABLE m_L1Cache_TBEs_vec[m_version] - -*/ - +#ifndef __MEM_RUBY_COMMON_GLOBAL_HH__ +#define __MEM_RUBY_COMMON_GLOBAL_HH__ // external includes for all classes #include "mem/ruby/common/TypeDefines.hh" @@ -85,13 +50,12 @@ extern RubySystem* g_system_ptr; class Debug; extern Debug* g_debug_ptr; -// FIXME: this is required by the contructor of Directory_Entry.hh. It can't go -// into slicc_util.hh because it opens a can of ugly worms +// FIXME: this is required by the contructor of Directory_Entry.hh. +// It can't go into slicc_util.hh because it opens a can of ugly worms extern inline int max_tokens() { return 1024; } - -#endif //GLOBAL_H +#endif // __MEM_RUBY_COMMON_GLOBAL_HH__ |