diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-03-07 10:58:15 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-03-07 10:58:15 -0500 |
| commit | b290ecf1bb0d3d65f4f2ddd72e0273a203d36243 (patch) | |
| tree | 808819330f22050ea78351df14a3a741c33e5f37 /cpu/static_inst.cc | |
| parent | 45eb26e67c4be623dd0cb0b660caa1200f729d42 (diff) | |
| parent | e5f945967b2d49f3c14384be947a12dbf02260da (diff) | |
| download | gem5-b290ecf1bb0d3d65f4f2ddd72e0273a203d36243.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : 2b73bffea88cb0e3bb5dff232a15afea8498f4e3
Diffstat (limited to 'cpu/static_inst.cc')
| -rw-r--r-- | cpu/static_inst.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/static_inst.cc b/cpu/static_inst.cc index 7069d89ec..d522dbf5a 100644 --- a/cpu/static_inst.cc +++ b/cpu/static_inst.cc @@ -68,7 +68,7 @@ StaticInst<AlphaISA>::nullStaticInstPtr; template <class ISA> bool -StaticInst<ISA>::hasBranchTarget(Addr pc, ExecContext *xc, Addr &tgt) +StaticInst<ISA>::hasBranchTarget(Addr pc, ExecContext *xc, Addr &tgt) const { if (isDirectCtrl()) { tgt = branchTarget(pc); |