Alot of changes to push towards ISA independence. Highlights are renaming of the...

SConscript:
    Moved some files out of targetarch. The either no longer need to be there, never needed to be there, or should be referred to directly in arch/alpha due to there strictly alpha content.
arch/alpha/isa_traits.hh:
    Added alpha's endianness to it's isa_traits.hh
arch/mips/isa_traits.hh:
    Added MIPS endianness to it's isa_traits.hh
arch/sparc/isa_traits.hh:
    Added SPARCs endianess to it's isa_traits.hh
build/SConstruct:
    Added MIPS as a valid architecture
cpu/exec_context.hh:
    Included arch/isa_traits.hh to bring in the endianness of the system.
cpu/o3/alpha_cpu.hh:
    Included arch/isa_traits.hh to bring in the systems endianness, and removed the hardcoding of little endianness
cpu/o3/fetch_impl.hh:
kern/freebsd/freebsd_system.cc:
    Included arch/isa_traits.hh to bring in the systems endianness, and removed the hardcoding to little endianness.
sim/system.cc:
    Included arch/isa_traits.hh to bring in the systems endianness, and removed the hardcoding to little endian.

--HG--
extra : convert_revision : b1ab34b7569db531cd1c74f273b24222e63f9007

diff --git a/SConscript b/SConscript
index 98dfad2177161c811b1a4329e67fdcfdcde10396..56a4e36101806093d4dc6ded710f298bbf4ba52b 100644 (file)
--- a/SConscript
+++ b/SConscript
@@ -339,24 +339,24 @@ syscall_emulation_sources = Split('''
 #      arch/alpha/alpha_tru64_process.cc
 
 targetarch_files = Split('''
-        alpha_common_syscall_emul.hh
         alpha_linux_process.hh
         alpha_memory.hh
         alpha_tru64_process.hh
         aout_machdep.h
         arguments.hh
-        byte_swap.hh
         ecoff_machdep.h
         ev5.hh
         faults.hh
         isa_fullsys_traits.hh
         isa_traits.hh
-        osfpal.hh
         pseudo_inst.hh
         stacktrace.hh
         vptr.hh
         vtophys.hh
         ''')
+#        osfpal.hh
+#        byte_swap.hh
+#        alpha_common_syscall_emul.hh
 
 # Set up bridging headers to the architecture specific versions
 for f in targetarch_files:
@@ -368,6 +368,9 @@ arch_source = SConscript('arch/%s/SConscript' % env['TARGET_ISA'],
        build_dir = 'build/%s/' % env['BUILD_DIR'],
        exports = 'env', duplicate = False)
 
+# Add a flag defining what THE_ISA should be for all compilation
+env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())])
+
 # Set up complete list of sources based on configuration.
 sources = base_sources + arch_source
 
@@ -432,7 +435,7 @@ env.Command(Split('''
        env['TARGET_ISA'],
        env['TARGET_ISA'])),
        Split('''
-       arch/%s/isa_desc
+       arch/%s/isa/main.isa
        arch/isa_parser.py''' %
        env['TARGET_ISA']),
        '$SRCDIR/arch/isa_parser.py $SOURCE $TARGET.dir arch/%s' % env['TARGET_ISA'])

diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh
index 2570d12f0fb01528f2b44010c7a7c58f5670de04..a17cde49b06a02b645e64450265f11a4c41592e8 100644 (file)
--- a/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@ -29,6 +29,9 @@
 #ifndef __ARCH_ALPHA_ISA_TRAITS_HH__
 #define __ARCH_ALPHA_ISA_TRAITS_HH__
 
+namespace LittleEndianGuest {}
+using namespace LittleEndianGuest;
+
 #include "arch/alpha/faults.hh"
 #include "base/misc.hh"
 #include "config/full_system.hh"

diff --git a/arch/mips/isa_traits.hh b/arch/mips/isa_traits.hh
index e8401cefb9bf067a63f1b9997b76bc9e30cfb61d..55e9c0dcba38f27469634a75dd944dcd34b28d2b 100644 (file)
--- a/arch/mips/isa_traits.hh
+++ b/arch/mips/isa_traits.hh
@@ -29,6 +29,10 @@
 #ifndef __ARCH_MIPS_ISA_TRAITS_HH__
 #define __ARCH_MIPS_ISA_TRAITS_HH__
 
+//This makes sure the big endian versions of certain functions are used.
+namespace LittleEndianGuest {}
+using namespace LittleEndianGuest
+
 #include "arch/mips/faults.hh"
 #include "base/misc.hh"
 #include "sim/host.hh"

diff --git a/arch/sparc/isa_traits.hh b/arch/sparc/isa_traits.hh
index 9513b99fc3897afa857da563fd10b256f076935b..7dd49aed9c71c9bae26233e9b77ea138c2e00dad 100644 (file)
--- a/arch/sparc/isa_traits.hh
+++ b/arch/sparc/isa_traits.hh
@@ -29,6 +29,10 @@
 #ifndef __ARCH_SPARC_ISA_TRAITS_HH__
 #define __ARCH_SPARC_ISA_TRAITS_HH__
 
+//This makes sure the big endian versions of certain functions are used.
+namespace BigEndianGuest {}
+using namespace BigEndianGuest;
+
 #include "arch/sparc/faults.hh"
 #include "base/misc.hh"
 #include "sim/host.hh"

diff --git a/build/SConstruct b/build/SConstruct
index 72b0930e17e1463f4ce595d9261a7165d80454e7..c552e5639bc29925b7d160d72e6a8d29f3e3c2cb 100644 (file)
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -223,7 +223,7 @@ env = conf.Finish()
 # value becomes sticky).
 sticky_opts = Options(args=ARGUMENTS)
 sticky_opts.AddOptions(
-    EnumOption('TARGET_ISA', 'Target ISA', 'alpha', ('alpha', 'sparc')),
+    EnumOption('TARGET_ISA', 'Target ISA', 'alpha', ('alpha', 'sparc', 'mips')),
     BoolOption('FULL_SYSTEM', 'Full-system support', False),
     BoolOption('ALPHA_TLASER',
                'Model Alpha TurboLaser platform (vs. Tsunami)', False),

diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh
index 2bde053b2e54add825d9b9e7d946390940478092..846be831a5192261795d8edd6b109c10b205a34a 100644 (file)
--- a/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@ -34,6 +34,7 @@
 #include "mem/mem_req.hh"
 #include "sim/host.hh"
 #include "sim/serialize.hh"
+#include "arch/isa_traits.hh"
 #include "sim/byteswap.hh"
 
 // forward declaration: see functional_memory.hh

diff --git a/cpu/o3/alpha_cpu.hh b/cpu/o3/alpha_cpu.hh
index 164da4968d149130afa3329665eec6f114366621..1e1a72af07d1d24ce731282bedd7d0da7961b773 100644 (file)
--- a/cpu/o3/alpha_cpu.hh
+++ b/cpu/o3/alpha_cpu.hh
@@ -33,6 +33,8 @@
 #define __CPU_O3_CPU_ALPHA_FULL_CPU_HH__
 
 #include "cpu/o3/cpu.hh"
+#include "arch/isa_traits.hh"
+#include "sim/byteswap.hh"
 
 template <class Impl>
 class AlphaFullCPU : public FullO3CPU<Impl>
@@ -220,7 +222,7 @@ class AlphaFullCPU : public FullO3CPU<Impl>
 
         Fault error;
         error = this->mem->read(req, data);
-        data = LittleEndianGuest::gtoh(data);
+        data = gtoh(data);
         return error;
     }
 
@@ -277,7 +279,7 @@ class AlphaFullCPU : public FullO3CPU<Impl>
 
 #endif
 
-        return this->mem->write(req, (T)LittleEndianGuest::htog(data));
+        return this->mem->write(req, (T)::htog(data));
     }
 
     template <class T>

diff --git a/cpu/o3/fetch_impl.hh b/cpu/o3/fetch_impl.hh
index 1a8411cc1690e83a6f891a5610d6f5a301991c9c..cd1ed1351633447fd2bc37873543ab29eee913b9 100644 (file)
--- a/cpu/o3/fetch_impl.hh
+++ b/cpu/o3/fetch_impl.hh
@@ -29,7 +29,7 @@
 // Remove this later; used only for debugging.
 #define OPCODE(X)                       (X >> 26) & 0x3f
 
-
+#include "arch/isa_traits.hh"
 #include "sim/byteswap.hh"
 #include "cpu/exetrace.hh"
 #include "mem/base_mem.hh"
@@ -535,7 +535,7 @@ SimpleFetch<Impl>::fetch()
             assert(offset <= cacheBlkSize - instSize);
 
             // Get the instruction from the array of the cache line.
-            inst = LittleEndianGuest::gtoh(*reinterpret_cast<MachInst *>
+            inst = gtoh(*reinterpret_cast<MachInst *>
                         (&cacheData[offset]));
 
             // Create a new DynInst from the instruction fetched.

diff --git a/kern/freebsd/freebsd_system.cc b/kern/freebsd/freebsd_system.cc
index f3fe84e007e35ec9d35346c3dfb1398c6fb6fef0..dbf60a3fc89d14b868c26f54f1d5ad53e577d0a3 100644 (file)
--- a/kern/freebsd/freebsd_system.cc
+++ b/kern/freebsd/freebsd_system.cc
@@ -39,6 +39,7 @@
 #include "mem/functional/memory_control.hh"
 #include "mem/functional/physical.hh"
 #include "sim/builder.hh"
+#include "arch/isa_traits.hh"
 #include "sim/byteswap.hh"
 #include "targetarch/vtophys.hh"
 
@@ -83,8 +84,8 @@ FreebsdSystem::doCalibrateClocks(ExecContext *xc)
     uint8_t *ppc = physmem->dma_addr(ppc_paddr, sizeof(uint32_t));
     uint8_t *timer = physmem->dma_addr(timer_paddr, sizeof(uint32_t));
 
-    *(uint32_t *)ppc = LittleEndianGuest::htog((uint32_t)Clock::Frequency);
-    *(uint32_t *)timer = LittleEndianGuest::htog((uint32_t)TIMER_FREQUENCY);
+    *(uint32_t *)ppc = htog((uint32_t)Clock::Frequency);
+    *(uint32_t *)timer = htog((uint32_t)TIMER_FREQUENCY);
 }
 
 

diff --git a/sim/system.cc b/sim/system.cc
index a69bf27f1bd2a475e1988cbc7e0d571ea41948c7..990145826b88fc45e7f99a874acbf168ea30e6c6 100644 (file)
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -35,6 +35,8 @@
 #include "mem/functional/physical.hh"
 #include "targetarch/vtophys.hh"
 #include "sim/builder.hh"
+#include "arch/isa_traits.hh"
+#include "sim/byteswap.hh"
 #include "sim/system.hh"
 #include "base/trace.hh"
 
@@ -152,8 +154,8 @@ System::System(Params *p)
         if (!hwrpb)
             panic("could not translate hwrpb addr\n");
 
-        *(uint64_t*)(hwrpb+0x50) = LittleEndianGuest::htog(params->system_type);
-        *(uint64_t*)(hwrpb+0x58) = LittleEndianGuest::htog(params->system_rev);
+        *(uint64_t*)(hwrpb+0x50) = htog(params->system_type);
+        *(uint64_t*)(hwrpb+0x58) = htog(params->system_rev);
     } else
         panic("could not find hwrpb\n");
 
@@ -249,7 +251,7 @@ System::setAlphaAccess(Addr access)
         if (!m5AlphaAccess)
             panic("could not translate m5AlphaAccess addr\n");
 
-        *m5AlphaAccess = LittleEndianGuest::htog(EV5::Phys2K0Seg(access));
+        *m5AlphaAccess = htog(EV5::Phys2K0Seg(access));
     } else
         panic("could not find m5AlphaAccess\n");
 }