diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-06-12 00:49:24 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-06-12 00:49:24 -0400 |
| commit | 15a8f050605919579e81b6abb98a0b596334216d (patch) | |
| tree | 583b0b30f13d9874a69015d58d041ce2d7352960 /src/arch/alpha/tlb.hh | |
| parent | 60a734e1750f3c051fe92fea6f12158db6e2dcb9 (diff) | |
| parent | df4b4f001e4db902297acf3b75480e4886e4e882 (diff) | |
| download | gem5-15a8f050605919579e81b6abb98a0b596334216d.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
src/arch/sparc/regfile.hh:
Hand Merge
--HG--
extra : convert_revision : c47202689202069892524a7d71962082469996ee
Diffstat (limited to 'src/arch/alpha/tlb.hh')
| -rw-r--r-- | src/arch/alpha/tlb.hh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/arch/alpha/tlb.hh b/src/arch/alpha/tlb.hh index f6256020e..07d01fa5c 100644 --- a/src/arch/alpha/tlb.hh +++ b/src/arch/alpha/tlb.hh @@ -24,6 +24,9 @@ * 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. + * + * Authors: Nathan Binkert + * Steve Reinhardt */ #ifndef __ALPHA_MEMORY_HH__ @@ -38,7 +41,7 @@ #include "mem/request.hh" #include "sim/sim_object.hh" -class ExecContext; +class ThreadContext; class AlphaTLB : public SimObject { @@ -92,7 +95,7 @@ class AlphaITB : public AlphaTLB AlphaITB(const std::string &name, int size); virtual void regStats(); - Fault translate(RequestPtr &req, ExecContext *xc) const; + Fault translate(RequestPtr &req, ThreadContext *tc) const; }; class AlphaDTB : public AlphaTLB @@ -115,7 +118,7 @@ class AlphaDTB : public AlphaTLB AlphaDTB(const std::string &name, int size); virtual void regStats(); - Fault translate(RequestPtr &req, ExecContext *xc, bool write) const; + Fault translate(RequestPtr &req, ThreadContext *tc, bool write) const; }; #endif // __ALPHA_MEMORY_HH__ |