make MIPS specific

--HG--
extra : convert_revision : c019fad60fbf1a316bc6201b8ce8acf5a9875989

diff --git a/arch/mips/SConscript b/arch/mips/SConscript
index bd67c98e9b6444da70e84e99a559285df173df40..a6af916698ba2f14021721a7e2d7b3f447e2568a 100644 (file)
--- a/arch/mips/SConscript
+++ b/arch/mips/SConscript
@@ -42,7 +42,7 @@ Import('env')
 # Base sources used by all configurations.
 arch_base_sources = Split('''
        arch/mips/decoder.cc
-        arch/mips/alpha_o3_exec.cc
+        arch/mips/mips_o3_exec.cc
        arch/mips/fast_cpu_exec.cc
        arch/mips/simple_cpu_exec.cc
        arch/mips/full_cpu_exec.cc
@@ -52,9 +52,9 @@ arch_base_sources = Split('''
 
 # Full-system sources
 arch_full_system_sources = Split('''
-       arch/mips/alpha_memory.cc
+       arch/mips/memory.cc
        arch/mips/arguments.cc
-       arch/mips/ev5.cc
+       arch/mips/mips34k.cc
        arch/mips/osfpal.cc
        arch/mips/stacktrace.cc
        arch/mips/vtophys.cc
@@ -62,9 +62,9 @@ arch_full_system_sources = Split('''
 
 # Syscall emulation (non-full-system) sources
 arch_syscall_emulation_sources = Split('''
-       arch/mips/alpha_common_syscall_emul.cc
-       arch/mips/alpha_linux_process.cc
-       arch/mips/alpha_tru64_process.cc
+       arch/mips/common_syscall_emul.cc
+       arch/mips/linux_process.cc
+       arch/mips/tru64_process.cc
        ''')
 
 # Set up complete list of sources based on configuration.

diff --git a/arch/mips/isa/base.isa b/arch/mips/isa/base.isa
index db37cf49ccd98b03b16e849dbb1cba75c30048dc..846d161b9e774427cd58e3f4397c94ffc1dc9e4a 100644 (file)
--- a/arch/mips/isa/base.isa
+++ b/arch/mips/isa/base.isa
@@ -8,7 +8,7 @@
 //Outputs to decoder.hh
 output header {{
         /**
-         * Base class for all SPARC static instructions.
+         * Base class for all MIPS static instructions.
          */
         class MipsStaticInst : public StaticInst<MIPSISA>
         {

diff --git a/arch/mips/isa/formats/unimp.isa b/arch/mips/isa/formats/unimp.isa
index 7678881572aad2fec0cc0f60c0a8c0599af3556a..a7a71c6814a22fdb8d7c131e99c6a5ce4cf13ce4 100644 (file)
--- a/arch/mips/isa/formats/unimp.isa
+++ b/arch/mips/isa/formats/unimp.isa
@@ -34,12 +34,12 @@ output header {{
      * 'Unknown' class is used for unrecognized/illegal instructions.
      * This is a leaf class.
      */
-    class FailUnimplemented : public AlphaStaticInst
+    class FailUnimplemented : public MipsStaticInst
     {
       public:
         /// Constructor
         FailUnimplemented(const char *_mnemonic, MachInst _machInst)
-            : AlphaStaticInst(_mnemonic, _machInst, No_OpClass)
+            : MipsStaticInst(_mnemonic, _machInst, No_OpClass)
         {
             // don't call execute() (which panics) if we're on a
             // speculative path
@@ -61,7 +61,7 @@ output header {{
      * probably make the 'warned' flag a static member of the derived
      * class.
      */
-    class WarnUnimplemented : public AlphaStaticInst
+    class WarnUnimplemented : public MipsStaticInst
     {
       private:
         /// Have we warned on this instruction yet?
@@ -70,7 +70,7 @@ output header {{
       public:
         /// Constructor
         WarnUnimplemented(const char *_mnemonic, MachInst _machInst)
-            : AlphaStaticInst(_mnemonic, _machInst, No_OpClass), warned(false)
+            : MipsStaticInst(_mnemonic, _machInst, No_OpClass), warned(false)
         {
             // don't call execute() (which panics) if we're on a
             // speculative path
@@ -144,12 +144,12 @@ output header {{
      * These cause simulator termination if they are executed in a
      * non-speculative mode.  This is a leaf class.
      */
-    class Unknown : public AlphaStaticInst
+    class Unknown : public MipsStaticInst
     {
       public:
         /// Constructor
         Unknown(MachInst _machInst)
-            : AlphaStaticInst("unknown", _machInst, No_OpClass)
+            : MipsStaticInst("unknown", _machInst, No_OpClass)
         {
             // don't call execute() (which panics) if we're on a
             // speculative path

diff --git a/arch/mips/isa_traits.hh b/arch/mips/isa_traits.hh
index e171737a3ffb811d34f154b88723ea13d5887050..603af60e24031ea5b36bf9e1944d1c1dec924035 100644 (file)
--- a/arch/mips/isa_traits.hh
+++ b/arch/mips/isa_traits.hh
@@ -46,7 +46,7 @@ class Checkpoint;
 template <class ISA> class StaticInst;
 template <class ISA> class StaticInstPtr;
 
-//namespace EV5
+//namespace MIPS34K
 //{
 //     int DTB_ASN_ASN(uint64_t reg);
 //     int ITB_ASN_ASN(uint64_t reg);
@@ -437,7 +437,7 @@ class MipsISA
                 void unserialize(Checkpoint *cp, const std::string &section);
         };
 
-        static StaticInstPtr<AlphaISA> decodeInst(MachInst);
+        static StaticInstPtr<MipsISA> decodeInst(MachInst);
 
         // return a no-op instruction... used for instruction fetch faults
         static const MachInst NoopMachInst;
@@ -528,7 +528,7 @@ class SyscallReturn {
 
 #ifdef FULL_SYSTEM
 
-#include "arch/alpha/ev5.hh"
+#include "arch/mips/mips34k.hh"
 #endif
 
 #endif // __ARCH_MIPS_ISA_TRAITS_HH__