diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mem/SConscript | 22 | ||||
| -rw-r--r-- | src/mem/ruby/SConscript | 22 | ||||
| -rw-r--r-- | src/mem/ruby/SConsopts | 39 |
3 files changed, 22 insertions, 61 deletions
diff --git a/src/mem/SConscript b/src/mem/SConscript index 939c8320f..ddd57d11b 100644 --- a/src/mem/SConscript +++ b/src/mem/SConscript @@ -87,25 +87,3 @@ DebugFlag('MemoryAccess') DebugFlag('PacketQueue') DebugFlag("DRAMSim2") - -DebugFlag('ProtocolTrace') -DebugFlag('RubyCache') -DebugFlag('RubyCacheTrace') -DebugFlag('RubyDma') -DebugFlag('RubyGenerated') -DebugFlag('RubyMemory') -DebugFlag('RubyNetwork') -DebugFlag('RubyPort') -DebugFlag('RubyPrefetcher') -DebugFlag('RubyQueue') -DebugFlag('RubySequencer') -DebugFlag('RubySlicc') -DebugFlag('RubySystem') -DebugFlag('RubyTester') -DebugFlag('RubyStats') -DebugFlag('RubyResourceStalls') - -CompoundFlag('Ruby', [ 'RubyQueue', 'RubyNetwork', 'RubyTester', - 'RubyGenerated', 'RubySlicc', 'RubySystem', 'RubyCache', - 'RubyMemory', 'RubyDma', 'RubyPort', 'RubySequencer', 'RubyCacheTrace', - 'RubyPrefetcher']) diff --git a/src/mem/ruby/SConscript b/src/mem/ruby/SConscript index a1f7a47d9..2072470ac 100644 --- a/src/mem/ruby/SConscript +++ b/src/mem/ruby/SConscript @@ -37,6 +37,28 @@ import SCons Import('*') +DebugFlag('ProtocolTrace') +DebugFlag('RubyCache') +DebugFlag('RubyCacheTrace') +DebugFlag('RubyDma') +DebugFlag('RubyGenerated') +DebugFlag('RubyMemory') +DebugFlag('RubyNetwork') +DebugFlag('RubyPort') +DebugFlag('RubyPrefetcher') +DebugFlag('RubyQueue') +DebugFlag('RubySequencer') +DebugFlag('RubySlicc') +DebugFlag('RubySystem') +DebugFlag('RubyTester') +DebugFlag('RubyStats') +DebugFlag('RubyResourceStalls') + +CompoundFlag('Ruby', [ 'RubyQueue', 'RubyNetwork', 'RubyTester', + 'RubyGenerated', 'RubySlicc', 'RubySystem', 'RubyCache', + 'RubyMemory', 'RubyDma', 'RubyPort', 'RubySequencer', 'RubyCacheTrace', + 'RubyPrefetcher']) + if env['TARGET_ISA'] == 'null': Return() diff --git a/src/mem/ruby/SConsopts b/src/mem/ruby/SConsopts deleted file mode 100644 index 1f20cfc18..000000000 --- a/src/mem/ruby/SConsopts +++ /dev/null @@ -1,39 +0,0 @@ -# -*- mode:python -*- - -# Copyright (c) 2009 The Hewlett-Packard Development Company -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer; -# redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution; -# neither the name of the copyright holders nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Authors: Nathan Binkert - -Import('*') - -sticky_vars.AddVariables( - BoolVariable('NO_VECTOR_BOUNDS_CHECKS', "Don't do bounds checks in Ruby", - True), - ) - -export_vars += [ 'NO_VECTOR_BOUNDS_CHECKS' ] - |