diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-06-29 21:38:16 -0400 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-06-29 21:38:16 -0400 |
commit | 0fbecab797ffe7fc68e3a9af9fd0a21df37ec635 (patch) | |
tree | 4983720f62cd4fc1ee57690678228e5aca75d531 /src/cpu/o3/alpha_cpu_impl.hh | |
parent | ad6788493c09aec456a1136f126abde7000696ab (diff) | |
parent | de90be348239a0a58ebb659dfc6a2f2fe5909292 (diff) | |
download | gem5-0fbecab797ffe7fc68e3a9af9fd0a21df37ec635.tar.xz |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 0756f7f1f63fae472e0ef1d20e9eb38e56de78c8
Diffstat (limited to 'src/cpu/o3/alpha_cpu_impl.hh')
-rw-r--r-- | src/cpu/o3/alpha_cpu_impl.hh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/cpu/o3/alpha_cpu_impl.hh b/src/cpu/o3/alpha_cpu_impl.hh index 532611fb6..eca6fbbcb 100644 --- a/src/cpu/o3/alpha_cpu_impl.hh +++ b/src/cpu/o3/alpha_cpu_impl.hh @@ -755,14 +755,6 @@ AlphaO3CPU<Impl>::simPalCheck(int palFunc, unsigned tid) template <class Impl> void -AlphaO3CPU<Impl>::trap(Fault fault, unsigned tid) -{ - // Pass the thread's TC into the invoke method. - fault->invoke(this->threadContexts[tid]); -} - -template <class Impl> -void AlphaO3CPU<Impl>::processInterrupts() { // Check for interrupts here. For now can copy the code that @@ -823,6 +815,14 @@ AlphaO3CPU<Impl>::processInterrupts() #endif // FULL_SYSTEM +template <class Impl> +void +AlphaO3CPU<Impl>::trap(Fault fault, unsigned tid) +{ + // Pass the thread's TC into the invoke method. + fault->invoke(this->threadContexts[tid]); +} + #if !FULL_SYSTEM template <class Impl> |