diff options
author | Korey Sewell <ksewell@umich.edu> | 2009-05-12 15:01:14 -0400 |
---|---|---|
committer | Korey Sewell <ksewell@umich.edu> | 2009-05-12 15:01:14 -0400 |
commit | 5127ea226a0a2cd75334c5af4cb182a1fd9b6cf1 (patch) | |
tree | 7ca2a867dd44c4c4b2e4d7de44ff04ec4cfd88c0 /src/cpu/inorder/inorder_dyn_inst.hh | |
parent | 98b1452058ae7e82df7cb7c0373c62a97981a2b9 (diff) | |
download | gem5-5127ea226a0a2cd75334c5af4cb182a1fd9b6cf1.tar.xz |
inorder-unified-tlb: use unified TLB instead of old TLB model
Diffstat (limited to 'src/cpu/inorder/inorder_dyn_inst.hh')
-rw-r--r-- | src/cpu/inorder/inorder_dyn_inst.hh | 9 |
1 files changed, 4 insertions, 5 deletions
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); |