From 2c5e03550adcd1348cc1d6f3c00af77cbf99c5ce Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 12 Feb 2006 12:40:58 -0500
Subject: 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
---
 kern/linux/linux_threadinfo.hh | 2 +-
 kern/tru64/dump_mbuf.cc        | 2 +-
 kern/tru64/mbuf.hh             | 2 +-
 kern/tru64/tru64_events.cc     | 2 +-
 kern/tru64/tru64_system.cc     | 2 +-
 kern/tru64/tru64_system.hh     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kern')

diff --git a/kern/linux/linux_threadinfo.hh b/kern/linux/linux_threadinfo.hh
index 0c60b9f5c..9bab1dc49 100644
--- a/kern/linux/linux_threadinfo.hh
+++ b/kern/linux/linux_threadinfo.hh
@@ -31,7 +31,7 @@
 
 #include "kern/linux/thread_info.hh"
 #include "kern/linux/sched.hh"
-#include "targetarch/vptr.hh"
+#include "sim/vptr.hh"
 
 namespace Linux {
 
diff --git a/kern/tru64/dump_mbuf.cc b/kern/tru64/dump_mbuf.cc
index 215930923..85cb4de96 100644
--- a/kern/tru64/dump_mbuf.cc
+++ b/kern/tru64/dump_mbuf.cc
@@ -35,7 +35,7 @@
 #include "kern/tru64/mbuf.hh"
 #include "sim/host.hh"
 #include "targetarch/arguments.hh"
-#include "targetarch/isa_traits.hh"
+#include "arch/isa_traits.hh"
 #include "targetarch/vtophys.hh"
 
 namespace tru64 {
diff --git a/kern/tru64/mbuf.hh b/kern/tru64/mbuf.hh
index f89074653..93424858f 100644
--- a/kern/tru64/mbuf.hh
+++ b/kern/tru64/mbuf.hh
@@ -30,7 +30,7 @@
 #define __MBUF_HH__
 
 #include "sim/host.hh"
-#include "targetarch/isa_traits.hh"
+#include "arch/isa_traits.hh"
 
 namespace tru64 {
 
diff --git a/kern/tru64/tru64_events.cc b/kern/tru64/tru64_events.cc
index 2079922b7..d769aab0f 100644
--- a/kern/tru64/tru64_events.cc
+++ b/kern/tru64/tru64_events.cc
@@ -34,7 +34,7 @@
 #include "kern/tru64/printf.hh"
 #include "mem/functional/memory_control.hh"
 #include "targetarch/arguments.hh"
-#include "targetarch/isa_traits.hh"
+#include "arch/isa_traits.hh"
 
 //void SkipFuncEvent::process(ExecContext *xc);
 
diff --git a/kern/tru64/tru64_system.cc b/kern/tru64/tru64_system.cc
index f65293474..ebcdc1553 100644
--- a/kern/tru64/tru64_system.cc
+++ b/kern/tru64/tru64_system.cc
@@ -36,7 +36,7 @@
 #include "mem/functional/memory_control.hh"
 #include "mem/functional/physical.hh"
 #include "sim/builder.hh"
-#include "targetarch/isa_traits.hh"
+#include "arch/isa_traits.hh"
 #include "targetarch/vtophys.hh"
 
 using namespace std;
diff --git a/kern/tru64/tru64_system.hh b/kern/tru64/tru64_system.hh
index a9077e112..d4eb5a59a 100644
--- a/kern/tru64/tru64_system.hh
+++ b/kern/tru64/tru64_system.hh
@@ -30,7 +30,7 @@
 #define __KERN_TRU64_TRU64_SYSTEM_HH__
 
 #include "sim/system.hh"
-#include "targetarch/isa_traits.hh"
+#include "arch/isa_traits.hh"
 
 class ExecContext;
 
-- 
cgit v1.2.3