7d4f187700
This patch adds the necessary flags to the SConstruct and SConscript files for compiling using clang 2.9 and later (on Ubuntu et al and OSX XCode 4.2), and also cleans up a bunch of compiler warnings found by clang. Most of the warnings are related to hidden virtual functions, comparisons with unsigneds >= 0, and if-statements with empty bodies. A number of mismatches between struct and class are also fixed. clang 2.8 is not working as it has problems with class names that occur in multiple namespaces (e.g. Statistics in kernel_stats.hh). clang has a bug (http://llvm.org/bugs/show_bug.cgi?id=7247) which causes confusion between the container std::set and the function Packet::set, and this is currently addressed by not including the entire namespace std, but rather selecting e.g. "using std::vector" in the appropriate places.
100 lines
3.3 KiB
C++
100 lines
3.3 KiB
C++
/*
|
|
* Copyright (c) 2011 Google
|
|
* 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: Gabe Black
|
|
*/
|
|
|
|
#ifndef __ARCH_GENERIC_MEMHELPERS_HH__
|
|
#define __ARCH_GENERIC_MEMHELPERS_HH__
|
|
|
|
#include "base/types.hh"
|
|
#include "sim/byteswap.hh"
|
|
#include "sim/fault_fwd.hh"
|
|
#include "sim/insttracer.hh"
|
|
|
|
/// Read from memory in timing mode.
|
|
template <class XC, class MemT>
|
|
Fault
|
|
readMemTiming(XC *xc, Trace::InstRecord *traceData, Addr addr,
|
|
MemT &mem, unsigned flags)
|
|
{
|
|
return xc->readMem(addr, (uint8_t *)&mem, sizeof(MemT), flags);
|
|
}
|
|
|
|
/// Extract the data returned from a timing mode read.
|
|
template <class MemT>
|
|
void
|
|
getMem(PacketPtr pkt, MemT &mem, Trace::InstRecord *traceData)
|
|
{
|
|
mem = pkt->get<MemT>();
|
|
if (traceData)
|
|
traceData->setData(mem);
|
|
}
|
|
|
|
/// Read from memory in atomic mode.
|
|
template <class XC, class MemT>
|
|
Fault
|
|
readMemAtomic(XC *xc, Trace::InstRecord *traceData, Addr addr, MemT &mem,
|
|
unsigned flags)
|
|
{
|
|
memset(&mem, 0, sizeof(mem));
|
|
Fault fault = readMemTiming(xc, traceData, addr, mem, flags);
|
|
if (fault == NoFault) {
|
|
mem = TheISA::gtoh(mem);
|
|
if (traceData)
|
|
traceData->setData(mem);
|
|
}
|
|
return fault;
|
|
}
|
|
|
|
/// Write to memory in timing mode.
|
|
template <class XC, class MemT>
|
|
Fault
|
|
writeMemTiming(XC *xc, Trace::InstRecord *traceData, MemT mem, Addr addr,
|
|
unsigned flags, uint64_t *res)
|
|
{
|
|
if (traceData) {
|
|
traceData->setData(mem);
|
|
}
|
|
mem = TheISA::htog(mem);
|
|
return xc->writeMem((uint8_t *)&mem, sizeof(MemT), addr, flags, res);
|
|
}
|
|
|
|
/// Write to memory in atomic mode.
|
|
template <class XC, class MemT>
|
|
Fault
|
|
writeMemAtomic(XC *xc, Trace::InstRecord *traceData, const MemT &mem,
|
|
Addr addr, unsigned flags, uint64_t *res)
|
|
{
|
|
Fault fault = writeMemTiming(xc, traceData, mem, addr, flags, res);
|
|
if (fault == NoFault && res != NULL) {
|
|
*res = TheISA::gtoh((MemT)*res);
|
|
}
|
|
return fault;
|
|
}
|
|
|
|
#endif
|