92c5a5c8cb
configs/common/FSConfig.py:
seperate the hypervisor memory and the guest0 memory. In reality we're going to need a better way to do this at some point. Perhaps auto generating the hv-desc image based on the specified config.
src/arch/sparc/isa/decoder.isa:
change reads/writes to the [hs]tick(cmpr) registers to use readmiscregwitheffect
src/arch/sparc/miscregfile.cc:
For niagra stick and tick are aliased to one value (if we end up doing mps we might not want this).
Use instruction count from cpu rather than cycles because that is what legion does
we can change it back after were done with legion
src/base/bitfield.hh:
add a new function mbits() that just masks off bits of interest but doesn't shift
src/cpu/base.cc:
src/cpu/base.hh:
add instruction count to cpu
src/cpu/exetrace.cc:
src/cpu/m5legion_interface.h:
compare instruction count between legion and m5 too
src/cpu/simple/atomic.cc:
change asserts of packet success to if panics wrapped with NDEBUG defines
so we can get some more useful information when we have a bad address
src/dev/isa_fake.cc:
src/dev/isa_fake.hh:
src/python/m5/objects/Device.py:
expand isa fake a bit more having data for each size request, the ability to have writes update the data and to warn on accesses
src/python/m5/objects/System.py:
convert some tabs to spaces
src/python/m5/objects/T1000.py:
add more fake devices for each l1 bank and each memory controller
--HG--
extra : convert_revision : 8024ae07b765a04ff6f600e5875b55d8a7d3d276
108 lines
3 KiB
C++
108 lines
3 KiB
C++
/*
|
|
* Copyright (c) 2003-2005 The Regents of The University of Michigan
|
|
* 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: Steve Reinhardt
|
|
* Nathan Binkert
|
|
*/
|
|
|
|
#ifndef __BASE_BITFIELD_HH__
|
|
#define __BASE_BITFIELD_HH__
|
|
|
|
#include <inttypes.h>
|
|
|
|
/**
|
|
* Generate a 64-bit mask of 'nbits' 1s, right justified.
|
|
*/
|
|
inline uint64_t
|
|
mask(int nbits)
|
|
{
|
|
return (nbits == 64) ? (uint64_t)-1LL : (1ULL << nbits) - 1;
|
|
}
|
|
|
|
|
|
/**
|
|
* Extract the bitfield from position 'first' to 'last' (inclusive)
|
|
* from 'val' and right justify it. MSB is numbered 63, LSB is 0.
|
|
*/
|
|
template <class T>
|
|
inline
|
|
T
|
|
bits(T val, int first, int last)
|
|
{
|
|
int nbits = first - last + 1;
|
|
return (val >> last) & mask(nbits);
|
|
}
|
|
|
|
/**
|
|
* Mask off the given bits in place like bits() but without shifting.
|
|
* msb = 63, lsb = 0
|
|
*/
|
|
template <class T>
|
|
inline
|
|
T
|
|
mbits(T val, int first, int last)
|
|
{
|
|
return val & (mask(first+1) & ~mask(last));
|
|
}
|
|
|
|
/**
|
|
* Sign-extend an N-bit value to 64 bits.
|
|
*/
|
|
template <int N>
|
|
inline
|
|
int64_t
|
|
sext(uint64_t val)
|
|
{
|
|
int sign_bit = bits(val, N-1, N-1);
|
|
return sign_bit ? (val | ~mask(N)) : val;
|
|
}
|
|
|
|
/**
|
|
* Return val with bits first to last set to bit_val
|
|
*/
|
|
template <class T, class B>
|
|
inline
|
|
T
|
|
insertBits(T val, int first, int last, B bit_val)
|
|
{
|
|
T bmask = mask(first - last + 1) << last;
|
|
return ((bit_val << last) & bmask) | (val & ~bmask);
|
|
}
|
|
|
|
/**
|
|
* A convenience function to replace bits first to last of val with bit_val
|
|
* in place.
|
|
*/
|
|
template <class T, class B>
|
|
inline
|
|
void
|
|
replaceBits(T& val, int first, int last, B bit_val)
|
|
{
|
|
val = insertBits(val, first, last, bit_val);
|
|
}
|
|
|
|
#endif // __BASE_BITFIELD_HH__
|