Removed isa_traits.hh from targetarch, moved vptr.hh from arch/alpha to sim, fixed an include to have the new location, and removed an ambiguating function declaration in byteswap.hh.
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
This commit is contained in:
parent
4d4c105ac5
commit
2c5e03550a
19 changed files with 25 additions and 24 deletions
|
@ -347,16 +347,16 @@ targetarch_files = Split('''
|
||||||
ecoff_machdep.h
|
ecoff_machdep.h
|
||||||
ev5.hh
|
ev5.hh
|
||||||
faults.hh
|
faults.hh
|
||||||
isa_fullsys_traits.hh
|
|
||||||
isa_traits.hh
|
|
||||||
pseudo_inst.hh
|
pseudo_inst.hh
|
||||||
stacktrace.hh
|
stacktrace.hh
|
||||||
vptr.hh
|
|
||||||
vtophys.hh
|
vtophys.hh
|
||||||
''')
|
''')
|
||||||
|
# isa_traits.hh
|
||||||
# osfpal.hh
|
# osfpal.hh
|
||||||
# byte_swap.hh
|
# byte_swap.hh
|
||||||
# alpha_common_syscall_emul.hh
|
# alpha_common_syscall_emul.hh
|
||||||
|
# vptr.hh
|
||||||
|
# isa_fullsys_traits.hh
|
||||||
|
|
||||||
# Set up bridging headers to the architecture specific versions
|
# Set up bridging headers to the architecture specific versions
|
||||||
for f in targetarch_files:
|
for f in targetarch_files:
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
#include "sim/stats.hh"
|
#include "sim/stats.hh"
|
||||||
#include "sim/system.hh"
|
#include "sim/system.hh"
|
||||||
#include "sim/debug.hh"
|
#include "sim/debug.hh"
|
||||||
#include "targetarch/vptr.hh"
|
#include "sim/vptr.hh"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#ifndef __OBJECT_FILE_HH__
|
#ifndef __OBJECT_FILE_HH__
|
||||||
#define __OBJECT_FILE_HH__
|
#define __OBJECT_FILE_HH__
|
||||||
|
|
||||||
#include "targetarch/isa_traits.hh" // for Addr
|
#include "arch/isa_traits.hh" // for Addr
|
||||||
|
|
||||||
class FunctionalMemory;
|
class FunctionalMemory;
|
||||||
class SymbolTable;
|
class SymbolTable;
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <iosfwd>
|
#include <iosfwd>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
#include "targetarch/isa_traits.hh" // for Addr
|
#include "arch/isa_traits.hh" // for Addr
|
||||||
|
|
||||||
class Checkpoint;
|
class Checkpoint;
|
||||||
class SymbolTable
|
class SymbolTable
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include "cpu/sampler/sampler.hh"
|
#include "cpu/sampler/sampler.hh"
|
||||||
#include "sim/eventq.hh"
|
#include "sim/eventq.hh"
|
||||||
#include "sim/sim_object.hh"
|
#include "sim/sim_object.hh"
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
|
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
class System;
|
class System;
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include "base/refcnt.hh"
|
#include "base/refcnt.hh"
|
||||||
#include "encumbered/cpu/full/op_class.hh"
|
#include "encumbered/cpu/full/op_class.hh"
|
||||||
#include "sim/host.hh"
|
#include "sim/host.hh"
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
|
|
||||||
// forward declarations
|
// forward declarations
|
||||||
struct AlphaSimpleImpl;
|
struct AlphaSimpleImpl;
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
#include "sim/builder.hh"
|
#include "sim/builder.hh"
|
||||||
#include "sim/sim_object.hh"
|
#include "sim/sim_object.hh"
|
||||||
#include "sim/root.hh"
|
#include "sim/root.hh"
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#define __DEV_PLATFORM_HH__
|
#define __DEV_PLATFORM_HH__
|
||||||
|
|
||||||
#include "sim/sim_object.hh"
|
#include "sim/sim_object.hh"
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
|
|
||||||
class PciConfigAll;
|
class PciConfigAll;
|
||||||
class IntrControl;
|
class IntrControl;
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#define __DEV_SIMPLE_DISK_HH__
|
#define __DEV_SIMPLE_DISK_HH__
|
||||||
|
|
||||||
#include "sim/sim_object.hh"
|
#include "sim/sim_object.hh"
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
|
|
||||||
class DiskImage;
|
class DiskImage;
|
||||||
class PhysicalMemory;
|
class PhysicalMemory;
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
#include "kern/linux/thread_info.hh"
|
#include "kern/linux/thread_info.hh"
|
||||||
#include "kern/linux/sched.hh"
|
#include "kern/linux/sched.hh"
|
||||||
#include "targetarch/vptr.hh"
|
#include "sim/vptr.hh"
|
||||||
|
|
||||||
namespace Linux {
|
namespace Linux {
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include "kern/tru64/mbuf.hh"
|
#include "kern/tru64/mbuf.hh"
|
||||||
#include "sim/host.hh"
|
#include "sim/host.hh"
|
||||||
#include "targetarch/arguments.hh"
|
#include "targetarch/arguments.hh"
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
#include "targetarch/vtophys.hh"
|
#include "targetarch/vtophys.hh"
|
||||||
|
|
||||||
namespace tru64 {
|
namespace tru64 {
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#define __MBUF_HH__
|
#define __MBUF_HH__
|
||||||
|
|
||||||
#include "sim/host.hh"
|
#include "sim/host.hh"
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
|
|
||||||
namespace tru64 {
|
namespace tru64 {
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#include "kern/tru64/printf.hh"
|
#include "kern/tru64/printf.hh"
|
||||||
#include "mem/functional/memory_control.hh"
|
#include "mem/functional/memory_control.hh"
|
||||||
#include "targetarch/arguments.hh"
|
#include "targetarch/arguments.hh"
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
|
|
||||||
//void SkipFuncEvent::process(ExecContext *xc);
|
//void SkipFuncEvent::process(ExecContext *xc);
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include "mem/functional/memory_control.hh"
|
#include "mem/functional/memory_control.hh"
|
||||||
#include "mem/functional/physical.hh"
|
#include "mem/functional/physical.hh"
|
||||||
#include "sim/builder.hh"
|
#include "sim/builder.hh"
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
#include "targetarch/vtophys.hh"
|
#include "targetarch/vtophys.hh"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#define __KERN_TRU64_TRU64_SYSTEM_HH__
|
#define __KERN_TRU64_TRU64_SYSTEM_HH__
|
||||||
|
|
||||||
#include "sim/system.hh"
|
#include "sim/system.hh"
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
|
|
||||||
class ExecContext;
|
class ExecContext;
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,6 @@ static inline uint64_t swap_byte(uint64_t x) {return swap_byte64(x);}
|
||||||
static inline int64_t swap_byte(int64_t x) {return swap_byte64((uint64_t)x);}
|
static inline int64_t swap_byte(int64_t x) {return swap_byte64((uint64_t)x);}
|
||||||
static inline uint32_t swap_byte(uint32_t x) {return swap_byte32(x);}
|
static inline uint32_t swap_byte(uint32_t x) {return swap_byte32(x);}
|
||||||
static inline int32_t swap_byte(int32_t x) {return swap_byte32((uint32_t)x);}
|
static inline int32_t swap_byte(int32_t x) {return swap_byte32((uint32_t)x);}
|
||||||
static inline int32_t swap_byte(long x) {return swap_byte32((long)x);}
|
|
||||||
static inline uint16_t swap_byte(uint16_t x) {return swap_byte32(x);}
|
static inline uint16_t swap_byte(uint16_t x) {return swap_byte32(x);}
|
||||||
static inline int16_t swap_byte(int16_t x) {return swap_byte16((uint16_t)x);}
|
static inline int16_t swap_byte(int16_t x) {return swap_byte16((uint16_t)x);}
|
||||||
static inline uint8_t swap_byte(uint8_t x) {return x;}
|
static inline uint8_t swap_byte(uint8_t x) {return x;}
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "targetarch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
#include "sim/sim_object.hh"
|
#include "sim/sim_object.hh"
|
||||||
#include "sim/stats.hh"
|
#include "sim/stats.hh"
|
||||||
#include "base/statistics.hh"
|
#include "base/statistics.hh"
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
|
|
||||||
#include "base/intmath.hh" // for RoundUp
|
#include "base/intmath.hh" // for RoundUp
|
||||||
#include "mem/functional/functional.hh"
|
#include "mem/functional/functional.hh"
|
||||||
#include "targetarch/isa_traits.hh" // for Addr
|
#include "arch/isa_traits.hh" // for Addr
|
||||||
|
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
#include "cpu/exec_context.hh"
|
#include "cpu/exec_context.hh"
|
||||||
|
|
10
sim/vptr.hh
10
sim/vptr.hh
|
@ -29,7 +29,8 @@
|
||||||
#ifndef __ARCH_ALPHA_VPTR_HH__
|
#ifndef __ARCH_ALPHA_VPTR_HH__
|
||||||
#define __ARCH_ALPHA_VPTR_HH__
|
#define __ARCH_ALPHA_VPTR_HH__
|
||||||
|
|
||||||
#include "arch/alpha/vtophys.hh"
|
#include "targetarch/vtophys.hh"
|
||||||
|
#include "arch/isa_traits.hh"
|
||||||
|
|
||||||
class ExecContext;
|
class ExecContext;
|
||||||
|
|
||||||
|
@ -69,15 +70,16 @@ class VPtr
|
||||||
const VPtr<T> &operator+=(int offset)
|
const VPtr<T> &operator+=(int offset)
|
||||||
{
|
{
|
||||||
ptr += offset;
|
ptr += offset;
|
||||||
assert((ptr & (AlphaISA::PageBytes - 1)) + sizeof(T)
|
assert((ptr & (TheISA::PageBytes - 1)) + sizeof(T)
|
||||||
< AlphaISA::PageBytes);
|
< TheISA::PageBytes);
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
const VPtr<T> &operator=(Addr p)
|
const VPtr<T> &operator=(Addr p)
|
||||||
{
|
{
|
||||||
assert((p & (AlphaISA::PageBytes)) + sizeof(T) < AlphaISA::PageBytes);
|
assert((p & (TheISA::PageBytes - 1)) + sizeof(T)
|
||||||
|
< TheISA::PageBytes);
|
||||||
ptr = p;
|
ptr = p;
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
|
|
Loading…
Reference in a new issue