summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-02-20 14:48:10 -0500
committerKorey Sewell <ksewell@umich.edu>2006-02-20 14:48:10 -0500
commitbdf3fd92ba3ebe1fd300238e8fd9cca4ae5c2614 (patch)
tree9ceb62e1e96f9a7b7f2d49083471a1285d76a02a /arch
parent19534176e06578cb167d5f10d9146f6b1c361cb5 (diff)
downloadgem5-bdf3fd92ba3ebe1fd300238e8fd9cca4ae5c2614.tar.xz
make MIPS specific
--HG-- extra : convert_revision : c019fad60fbf1a316bc6201b8ce8acf5a9875989
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/SConscript12
-rw-r--r--arch/mips/isa/base.isa2
-rw-r--r--arch/mips/isa/formats/unimp.isa12
-rw-r--r--arch/mips/isa_traits.hh6
4 files changed, 16 insertions, 16 deletions
diff --git a/arch/mips/SConscript b/arch/mips/SConscript
index bd67c98e9..a6af91669 100644
--- 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 db37cf49c..846d161b9 100644
--- 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 767888157..a7a71c681 100644
--- 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 e171737a3..603af60e2 100644
--- 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__