diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-03-08 13:26:30 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-03-08 13:26:30 -0500 |
| commit | 67732a7b2816929e41a52998c25eb008217041a5 (patch) | |
| tree | e4f51373195cab0f88e7f727d3837255a6909614 /cpu/o3/alpha_cpu_impl.hh | |
| parent | 4d44e53736507de176e48cbf99b064ffa0ae5a7a (diff) | |
| parent | 0df85fd8d8b7a8c8d11b1b3da5b6277e4a5e54ec (diff) | |
| download | gem5-67732a7b2816929e41a52998c25eb008217041a5.tar.xz | |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
arch/alpha/ev5.cc:
cpu/o3/cpu.hh:
SCCS merged
--HG--
extra : convert_revision : 38889011ea02005c8fd3a7f3b0be3395223f6166
Diffstat (limited to 'cpu/o3/alpha_cpu_impl.hh')
| -rw-r--r-- | cpu/o3/alpha_cpu_impl.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu/o3/alpha_cpu_impl.hh b/cpu/o3/alpha_cpu_impl.hh index 30ef4bd43..9f1fa24f6 100644 --- a/cpu/o3/alpha_cpu_impl.hh +++ b/cpu/o3/alpha_cpu_impl.hh @@ -26,6 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "arch/alpha/faults.hh" #include "base/cprintf.hh" #include "base/statistics.hh" #include "base/timebuf.hh" @@ -268,7 +269,7 @@ Fault AlphaFullCPU<Impl>::hwrei() { if (!inPalMode()) - return new UnimplementedOpcodeFault; + return new AlphaISA::UnimplementedOpcodeFault; this->setNextPC(this->regFile.miscRegs.readReg(AlphaISA::IPR_EXC_ADDR)); |