From 5127ea226a0a2cd75334c5af4cb182a1fd9b6cf1 Mon Sep 17 00:00:00 2001 From: Korey Sewell Date: Tue, 12 May 2009 15:01:14 -0400 Subject: inorder-unified-tlb: use unified TLB instead of old TLB model --- src/cpu/inorder/inorder_dyn_inst.hh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/cpu/inorder/inorder_dyn_inst.hh') diff --git a/src/cpu/inorder/inorder_dyn_inst.hh b/src/cpu/inorder/inorder_dyn_inst.hh index 143d10783..042a6485a 100644 --- a/src/cpu/inorder/inorder_dyn_inst.hh +++ b/src/cpu/inorder/inorder_dyn_inst.hh @@ -419,11 +419,10 @@ class InOrderDynInst : public FastAlloc, public RefCounted /** Print Resource Schedule */ + /** @NOTE: DEBUG ONLY */ void printSched() { - using namespace ThePipeline; - - ResSchedule tempSched; + ThePipeline::ResSchedule tempSched; std::cerr << "\tInst. Res. Schedule: "; while (!resSched.empty()) { std::cerr << '\t' << resSched.top()->stageNum << "-" @@ -835,7 +834,7 @@ class InOrderDynInst : public FastAlloc, public RefCounted IntReg readIntRegOperand(const StaticInst *si, int idx, unsigned tid=0); FloatReg readFloatRegOperand(const StaticInst *si, int idx, int width = TheISA::SingleWidth); - FloatRegBits readFloatRegOperandBits(const StaticInst *si, int idx, + TheISA::FloatRegBits readFloatRegOperandBits(const StaticInst *si, int idx, int width = TheISA::SingleWidth); MiscReg readMiscReg(int misc_reg); MiscReg readMiscRegNoEffect(int misc_reg); @@ -878,7 +877,7 @@ class InOrderDynInst : public FastAlloc, public RefCounted void setIntRegOperand(const StaticInst *si, int idx, IntReg val); void setFloatRegOperand(const StaticInst *si, int idx, FloatReg val, int width = TheISA::SingleWidth); - void setFloatRegOperandBits(const StaticInst *si, int idx, FloatRegBits val, + void setFloatRegOperandBits(const StaticInst *si, int idx, TheISA::FloatRegBits val, int width = TheISA::SingleWidth); void setMiscReg(int misc_reg, const MiscReg &val); void setMiscRegNoEffect(int misc_reg, const MiscReg &val); -- cgit v1.2.3