2c5e03550a
SConscript:
Moved isa_fullsys_traits.hh out of targetarch, since the only place it's included, and the only place the comments in the file say it should be included, is in the alpha isa_traits.hh
targetarch/isa_traits.hh is now included through arch/isa_traits.hh
vptr.hh was removed from targetarch, and moved to sim
arch/alpha/pseudo_inst.cc:
Moved vptr.hh from targetarch to sim
base/loader/object_file.hh:
base/loader/symtab.hh:
cpu/base.hh:
dev/ide_disk.cc:
Changed the include of isa_traits.hh from targetarch to arch
cpu/static_inst.hh:
dev/platform.hh:
dev/simple_disk.hh:
kern/tru64/dump_mbuf.cc:
kern/tru64/mbuf.hh:
kern/tru64/tru64_events.cc:
kern/tru64/tru64_system.cc:
kern/tru64/tru64_system.hh:
sim/process.hh:
sim/syscall_emul.hh:
Changed the include of isa_traits.hh from targetarch to arch.
kern/linux/linux_threadinfo.hh:
Changed the include of vptr.hh from targetarch to sim.
sim/byteswap.hh:
Removed the line declaring swap_byte(long), since it ambiguates with swap_byte(int32_t)
sim/vptr.hh:
Fixed the assert in the equals operator.
Changed the AlphaISA namespace reference to TheISA.
Changed arch/alpha/vtophys.hh to targetarch/vtophys.hh, since this file is now for all architectures.
Added an include of arch/isa_traits.hh so that TheISA would be defined.
--HG--
extra : convert_revision : e3c6ac17ed0277cfeba1d35cd63eba66eba5996f
117 lines
3.1 KiB
C++
117 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2004-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.
|
|
*/
|
|
|
|
#ifndef __ARCH_ALPHA_VPTR_HH__
|
|
#define __ARCH_ALPHA_VPTR_HH__
|
|
|
|
#include "targetarch/vtophys.hh"
|
|
#include "arch/isa_traits.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 & (TheISA::PageBytes - 1)) + sizeof(T)
|
|
< TheISA::PageBytes);
|
|
|
|
return *this;
|
|
}
|
|
|
|
const VPtr<T> &operator=(Addr p)
|
|
{
|
|
assert((p & (TheISA::PageBytes - 1)) + sizeof(T)
|
|
< TheISA::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__
|