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.
126 lines
3.6 KiB
C++
126 lines
3.6 KiB
C++
/*
|
|
* Copyright (c) 2006-2009 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: Gabe Black
|
|
*/
|
|
|
|
#ifndef __CPU_NATIVETRACE_HH__
|
|
#define __CPU_NATIVETRACE_HH__
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <cerrno>
|
|
|
|
#include "base/socket.hh"
|
|
#include "base/trace.hh"
|
|
#include "base/types.hh"
|
|
#include "cpu/exetrace.hh"
|
|
#include "cpu/static_inst.hh"
|
|
|
|
class ThreadContext;
|
|
|
|
namespace Trace {
|
|
|
|
class NativeTrace;
|
|
|
|
class NativeTraceRecord : public ExeTracerRecord
|
|
{
|
|
protected:
|
|
NativeTrace * parent;
|
|
|
|
public:
|
|
NativeTraceRecord(NativeTrace * _parent,
|
|
Tick _when, ThreadContext *_thread,
|
|
const StaticInstPtr _staticInst, TheISA::PCState _pc,
|
|
bool spec, const StaticInstPtr _macroStaticInst = NULL)
|
|
: ExeTracerRecord(_when, _thread, _staticInst, _pc, spec,
|
|
_macroStaticInst),
|
|
parent(_parent)
|
|
{
|
|
}
|
|
|
|
void dump();
|
|
};
|
|
|
|
class NativeTrace : public ExeTracer
|
|
{
|
|
protected:
|
|
int fd;
|
|
|
|
ListenSocket native_listener;
|
|
|
|
public:
|
|
|
|
NativeTrace(const Params *p);
|
|
virtual ~NativeTrace() {}
|
|
|
|
NativeTraceRecord *
|
|
getInstRecord(Tick when, ThreadContext *tc,
|
|
const StaticInstPtr staticInst, TheISA::PCState pc,
|
|
const StaticInstPtr macroStaticInst = NULL)
|
|
{
|
|
if (tc->misspeculating())
|
|
return NULL;
|
|
|
|
return new NativeTraceRecord(this, when, tc,
|
|
staticInst, pc, tc->misspeculating(), macroStaticInst);
|
|
}
|
|
|
|
template<class T>
|
|
bool
|
|
checkReg(const char * regName, T &val, T &realVal)
|
|
{
|
|
if(val != realVal)
|
|
{
|
|
DPRINTFN("Register %s should be %#x but is %#x.\n",
|
|
regName, realVal, val);
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void
|
|
read(void *ptr, size_t size)
|
|
{
|
|
size_t soFar = 0;
|
|
while (soFar < size) {
|
|
ssize_t res = ::read(fd, (uint8_t *)ptr + soFar, size - soFar);
|
|
if (res < 0)
|
|
panic("Read call failed! %s\n", strerror(errno));
|
|
else
|
|
soFar += res;
|
|
}
|
|
}
|
|
|
|
virtual void
|
|
check(NativeTraceRecord *record) = 0;
|
|
};
|
|
|
|
} // namespace Trace
|
|
|
|
#endif // __CPU_NATIVETRACE_HH__
|