bb80f71f21
SConscript:
comment out most devices
add vport.cc
arch/alpha/arguments.cc:
arch/alpha/arguments.hh:
push in alpha name space
fix for new memory system
arch/alpha/faults.cc:
arch/alpha/faults.hh:
Added an unimplemented fault that can be returned if a certain
function isn't implemented
arch/alpha/freebsd/system.cc:
arch/alpha/linux/system.cc:
arch/alpha/stacktrace.cc:
arch/alpha/system.cc:
arch/alpha/tlb.hh:
arch/alpha/tru64/system.cc:
fixed for new memory system
arch/alpha/tlb.cc:
fixed for new memory system
removed code that seems to have no purpose
arch/alpha/vtophys.cc:
arch/alpha/vtophys.hh:
fixed for new memory system
put in namespace AlphaISA
base/remote_gdb.cc:
fix for new memory system
cpu/cpu_exec_context.cc:
cpu/cpu_exec_context.hh:
cpu/exec_context.hh:
create two ports one of physical accesses and one for superpage accesses
Add functions getVirtPort() getPhysPort() delVirtPort(). To get statically
allocated physical or virtual ports or if an execcontext is passed in
get a dynamically allocated virtual port
dev/alpha_console.cc:
dev/alpha_console.hh:
Redo for new memory system
dev/io_device.cc:
dev/io_device.hh:
new I/O devices for new memory system
kern/linux/events.cc:
kern/linux/printk.cc:
kern/linux/printk.hh:
kern/tru64/dump_mbuf.hh:
kern/tru64/printf.cc:
kern/tru64/printf.hh:
Arguments now in namespaces
kern/tru64/tru64_events.cc:
mem/bus.cc:
fix for new memory syste
mem/physical.hh:
new addressranges function
getPort should be public
mem/port.hh:
Add write/read methods to functional port
update getDeviceAddrRanges to have a list of both snoops and response lists
sim/pseudo_inst.cc:
sim/system.cc:
sim/system.hh:
Update for new mem system
sim/vptr.hh:
comment out code and replace with panics
This will need to be fixed at some point, but it's not easy.
--HG--
extra : convert_revision : 41f41f422cfbab3751284d55cccb6ea64a7956e2
122 lines
3.3 KiB
C++
122 lines
3.3 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 "arch/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 *()
|
|
{
|
|
panic("Needs to be rewritten\n");
|
|
/* void *addr = vtomem(xc, ptr, sizeof(T));
|
|
return (T *)addr;
|
|
*/
|
|
}
|
|
|
|
T *operator->()
|
|
{
|
|
panic("Needs to be rewritten\n");
|
|
/* void *addr = vtomem(xc, ptr, sizeof(T));
|
|
return (T *)addr;
|
|
*/
|
|
}
|
|
|
|
T &operator*()
|
|
{
|
|
panic("Needs to be rewritten\n");
|
|
/* void *addr = vtomem(xc, ptr, sizeof(T));
|
|
return *(T *)addr;
|
|
*/
|
|
}
|
|
};
|
|
|
|
#endif // __ARCH_ALPHA_VPTR_HH__
|