f58d85128d
which is evaluated slightly differently than in previous versions of gcc.
arch/alpha/alpha_linux_process.cc:
Alphabetize includes.
arch/alpha/vptr.hh:
Change the constants that are being used for alpha pagebytes to come from the ISA.
base/random.hh:
cpu/static_inst.cc:
sim/param.cc:
Fix up template syntax.
base/range.hh:
Include iostream for << operator.
base/res_list.hh:
base/statistics.hh:
cpu/simple_cpu/simple_cpu.hh:
cpu/static_inst.hh:
sim/eventq.hh:
sim/param.hh:
Fixup for templated code to resolve different scope lookup in gcc 3.4. This defers the lookup of the
function/variable until actual instantiation time by making it dependent on the templated class/function.
base/trace.cc:
Fix call to new.
base/trace.hh:
Fix up #define to have full path.
cpu/base_cpu.cc:
Fix up call to new.
dev/etherlink.hh:
dev/ns_gige.hh:
dev/sinic.hh:
Fixup for friend class/function declaration. g++ 3.4 no longer allows typedefs to be declared as
a friend class.
dev/pcidev.hh:
Fix up re-definition of access level to params.
kern/linux/linux_syscalls.hh:
kern/tru64/tru64_syscalls.hh:
Fix up header. Fix up template syntax.
sim/serialize.cc:
Include errno.h.
sim/startup.cc:
Change startupq. queue was getting destructed before all things had called ~StartupCallback(), which lead
to a segfault. This puts startupq in global space, and we allocate it ourselves. Other code may be similar
to this and may need changing in the future.
sim/syscall_emul.hh:
Include cpu/exec_context.hh and sim/process.hh, as forward declarations are no longer sufficient.
sim/universe.cc:
Include errno.h
--HG--
extra : convert_revision : e49d08ee89eb06a28351f02bafc028ca6652d5af
114 lines
3.1 KiB
C++
114 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2004 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.
|
|
*/
|
|
|
|
#ifndef __ARCH_ALPHA_VPTR_HH__
|
|
#define __ARCH_ALPHA_VPTR_HH__
|
|
|
|
#include "arch/alpha/vtophys.hh"
|
|
|
|
class ExecContext;
|
|
|
|
template <class T>
|
|
class VPtr
|
|
{
|
|
public:
|
|
typedef T Type;
|
|
|
|
private:
|
|
ExecContext *xc;
|
|
Addr ptr;
|
|
|
|
public:
|
|
ExecContext *GetXC() const { return xc; }
|
|
Addr GetPointer() const { return ptr; }
|
|
|
|
public:
|
|
explicit VPtr(ExecContext *_xc, Addr p = 0) : xc(_xc), ptr(p) { }
|
|
template <class U>
|
|
VPtr(const VPtr<U> &vp) : xc(vp.GetXC()), ptr(vp.GetPointer()) {}
|
|
~VPtr() {}
|
|
|
|
bool operator!() const
|
|
{
|
|
return ptr == 0;
|
|
}
|
|
|
|
VPtr<T> operator+(int offset)
|
|
{
|
|
VPtr<T> ptr(*this);
|
|
ptr += offset;
|
|
|
|
return ptr;
|
|
}
|
|
|
|
const VPtr<T> &operator+=(int offset)
|
|
{
|
|
ptr += offset;
|
|
assert((ptr & (AlphaISA::PageBytes - 1)) + sizeof(T)
|
|
< AlphaISA::PageBytes);
|
|
|
|
return *this;
|
|
}
|
|
|
|
const VPtr<T> &operator=(Addr p)
|
|
{
|
|
assert((p & (AlphaISA::PageBytes)) + sizeof(T) < AlphaISA::PageBytes);
|
|
ptr = p;
|
|
|
|
return *this;
|
|
}
|
|
|
|
template <class U>
|
|
const VPtr<T> &operator=(const VPtr<U> &vp)
|
|
{
|
|
xc = vp.GetXC();
|
|
ptr = vp.GetPointer();
|
|
|
|
return *this;
|
|
}
|
|
|
|
operator T *()
|
|
{
|
|
void *addr = vtomem(xc, ptr, sizeof(T));
|
|
return (T *)addr;
|
|
}
|
|
|
|
T *operator->()
|
|
{
|
|
void *addr = vtomem(xc, ptr, sizeof(T));
|
|
return (T *)addr;
|
|
}
|
|
|
|
T &operator*()
|
|
{
|
|
void *addr = vtomem(xc, ptr, sizeof(T));
|
|
return *(T *)addr;
|
|
}
|
|
};
|
|
|
|
#endif // __ARCH_ALPHA_VPTR_HH__
|