diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-16 01:25:48 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-16 01:25:48 -0500 |
| commit | b161d2a731ec7d75bdeb896d1b89efcbb125a09f (patch) | |
| tree | a1a92378afb4d05e8c9e2d047c1c9edbcc9e3447 /cpu/o3/alpha_dyn_inst_impl.hh | |
| parent | 7f17f1f2df7dc7123448ec624a345ee7c0e996b5 (diff) | |
| parent | 10c79efe556697ebbed74c82214b5505b405da5b (diff) | |
| download | gem5-b161d2a731ec7d75bdeb896d1b89efcbb125a09f.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : d8626acb2686e123ad0bb6cf94e85c992657470d
Diffstat (limited to 'cpu/o3/alpha_dyn_inst_impl.hh')
| -rw-r--r-- | cpu/o3/alpha_dyn_inst_impl.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/o3/alpha_dyn_inst_impl.hh b/cpu/o3/alpha_dyn_inst_impl.hh index d1ebb812d..b20af48cd 100644 --- a/cpu/o3/alpha_dyn_inst_impl.hh +++ b/cpu/o3/alpha_dyn_inst_impl.hh @@ -98,20 +98,20 @@ AlphaDynInst<Impl>::setFpcr(uint64_t val) #if FULL_SYSTEM template <class Impl> uint64_t -AlphaDynInst<Impl>::readIpr(int idx, Fault &fault) +AlphaDynInst<Impl>::readIpr(int idx, Fault * &fault) { return this->cpu->readIpr(idx, fault); } template <class Impl> -Fault +Fault * AlphaDynInst<Impl>::setIpr(int idx, uint64_t val) { return this->cpu->setIpr(idx, val); } template <class Impl> -Fault +Fault * AlphaDynInst<Impl>::hwrei() { return this->cpu->hwrei(); @@ -140,7 +140,7 @@ AlphaDynInst<Impl>::inPalMode() template <class Impl> void -AlphaDynInst<Impl>::trap(Fault fault) +AlphaDynInst<Impl>::trap(Fault * fault) { this->cpu->trap(fault); } |