Hand merge. Stuff probably doesn't compile.

--HG--
rename : arch/alpha/isa_desc => arch/alpha/isa/main.isa
rename : arch/alpha/alpha_linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/alpha_linux_process.hh => arch/alpha/linux/process.hh
rename : arch/alpha/alpha_tru64_process.cc => arch/alpha/tru64/process.cc
rename : arch/alpha/alpha_tru64_process.hh => arch/alpha/tru64/process.hh
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : 7d1efcedd708815d985a951f6f010fbd83dc27e8

1 files changed, 160 insertions, 0 deletions

diff --git a/arch/mips/faults.hh b/arch/mips/faults.hh
new file mode 100644
index 000000000..c1cb956b0
--- /dev/null
+++ b/arch/mips/faults.hh
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2003-2005 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __MIPS_FAULTS_HH__
+#define __MIPS_FAULTS_HH__
+
+#include "sim/faults.hh"
+#include "arch/isa_traits.hh" //For the Addr type
+
+class MipsFault : public FaultBase
+{
+  public:
+    MipsFault(char * newName, int newId, Addr newVect)
+        : FaultBase(newName, newId), vect(newVect)
+    {;}
+
+    Addr vect;
+};
+
+extern class ResetFaultType : public MipsFault
+{
+  public:
+    ResetFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const ResetFault;
+
+extern class ArithmeticFaultType : public MipsFault
+{
+  public:
+    ArithmeticFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const ArithmeticFault;
+
+extern class InterruptFaultType : public MipsFault
+{
+  public:
+    InterruptFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const InterruptFault;
+
+extern class NDtbMissFaultType : public MipsFault
+{
+  public:
+    NDtbMissFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const NDtbMissFault;
+
+extern class PDtbMissFaultType : public MipsFault
+{
+  public:
+    PDtbMissFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const PDtbMissFault;
+
+extern class DtbPageFaultType : public MipsFault
+{
+  public:
+    DtbPageFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const DtbPageFault;
+
+extern class DtbAcvFaultType : public MipsFault
+{
+  public:
+    DtbAcvFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const DtbAcvFault;
+
+extern class ItbMissFaultType : public MipsFault
+{
+  public:
+    ItbMissFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const ItbMissFault;
+
+extern class ItbPageFaultType : public MipsFault
+{
+  public:
+    ItbPageFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const ItbPageFault;
+
+extern class ItbAcvFaultType : public MipsFault
+{
+  public:
+    ItbAcvFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const ItbAcvFault;
+
+extern class UnimplementedOpcodeFaultType : public MipsFault
+{
+  public:
+    UnimplementedOpcodeFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const UnimplementedOpcodeFault;
+
+extern class FloatEnableFaultType : public MipsFault
+{
+  public:
+    FloatEnableFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const FloatEnableFault;
+
+extern class PalFaultType : public MipsFault
+{
+  public:
+    PalFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const PalFault;
+
+extern class IntegerOverflowFaultType : public MipsFault
+{
+  public:
+    IntegerOverflowFaultType(char * newName, int newId, Addr newVect)
+        : MipsFault(newName, newId, newVect)
+    {;}
+} * const IntegerOverflowFault;
+
+extern Fault ** ListOfFaults[];
+extern int NumFaults;
+
+#endif // __FAULTS_HH__