From: Kevin Lim <ktlim@umich.edu>
Date: Fri, 28 May 2004 15:41:52 +0000 (-0400)
Subject: Merged in new FastCPU stuff with existing code.
X-Git-Tag: m5_1.0_beta2~16
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67b5f6afc10a87a5942d24ad503f3e6b9358580c;p=gem5.git

Merged in new FastCPU stuff with existing code.

arch/alpha/ev5.cc:
    Added templatized processInterrupts() function that can be used by all of the CPU models.
arch/alpha/isa_desc:
    Merged in changes to remove CPU dependence.
arch/isa_parser.py:
    Merged in changes.
cpu/static_inst.hh:
    Includes FastCPU execute methods.

--HG--
extra : convert_revision : fcaa1dca35a9b316c73982bec8680df564f50bd8
---

67b5f6afc10a87a5942d24ad503f3e6b9358580c
diff --cc arch/alpha/ev5.cc
index 96d54c54c,fe665abe6..e88f6d0a3
--- a/arch/alpha/ev5.cc
+++ b/arch/alpha/ev5.cc
@@@ -1,14 -1,17 +1,15 @@@
  /* $Id$ */
  
 -#include "targetarch/alpha_memory.hh"
 -#include "sim/annotation.hh"
 -#ifdef DEBUG
 -#include "sim/debug.hh"
 -#endif
 +#include "arch/alpha/alpha_memory.hh"
 +#include "arch/alpha/isa_traits.hh"
 +#include "arch/alpha/osfpal.hh"
 +#include "base/kgdb.h"
 +#include "base/remote_gdb.hh"
 +#include "base/stats/events.hh"
  #include "cpu/exec_context.hh"
+ #include "cpu/fast_cpu/fast_cpu.hh"
 +#include "sim/debug.hh"
  #include "sim/sim_events.hh"
 -#include "targetarch/isa_traits.hh"
 -#include "base/remote_gdb.hh"
 -#include "base/kgdb.h"	// for ALPHA_KENTRY_IF
 -#include "targetarch/osfpal.hh"
  
  #ifdef FULL_SYSTEM
  
diff --cc cpu/static_inst.hh
index 088fdbdb7,131c5f756..3eeefb675
--- a/cpu/static_inst.hh
+++ b/cpu/static_inst.hh
@@@ -42,7 -42,11 +42,8 @@@
  // forward declarations
  class ExecContext;
  class DynInst;
 -typedef DynInst FullCPUExecContext;
+ class FastCPU;
 -typedef FastCPU FastCPUExecContext;
  class SimpleCPU;
 -typedef SimpleCPU SimpleCPUExecContext;
  class SymbolTable;
  
  namespace Trace {
@@@ -310,8 -309,15 +311,13 @@@ class StaticInst : public StaticInstBas
      /**
       * Execute this instruction under SimpleCPU model.
       */
 -    virtual Fault execute(SimpleCPUExecContext *xc,
 -                          Trace::InstRecord *traceData) = 0;
 +    virtual Fault execute(SimpleCPU *xc, Trace::InstRecord *traceData) = 0;
  
+     /**
+      * Execute this instruction under FastCPU model.
+      */
 -    virtual Fault execute(FastCPUExecContext *xc,
 -                          Trace::InstRecord *traceData) = 0;
++    virtual Fault execute(FastCPU *xc, Trace::InstRecord *traceData) = 0;
+ 
      /**
       * Execute this instruction under detailed FullCPU model.
       */