diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-03-08 21:03:20 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-03-08 21:03:20 -0500 |
| commit | 2162b433adfa596bc0d6515b8157b24cd2599541 (patch) | |
| tree | 96c01743fc94260c77848a92cefcc0e4e8dbc248 /cpu/static_inst.cc | |
| parent | bb41c21d6ae3417cfcbfa1bb5ecc9efbae1950ab (diff) | |
| parent | 550e6a5010602049b9be426ba41939ee7167ccd9 (diff) | |
| download | gem5-2162b433adfa596bc0d6515b8157b24cd2599541.tar.xz | |
Hand-merge static_inst.hh. These execute functions are within an external file in the new CPU case.
cpu/static_inst.hh:
Hand-merge. These execute functions are within an external file in the new CPU case.
--HG--
extra : convert_revision : a34112f471fa31bdd5bb53552ddd704b9571c110
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); |