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.hh | |
| 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.hh')
| -rw-r--r-- | cpu/static_inst.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpu/static_inst.hh b/cpu/static_inst.hh index 25c98b12a..3ac88fd3d 100644 --- a/cpu/static_inst.hh +++ b/cpu/static_inst.hh @@ -294,13 +294,13 @@ class StaticInst : public StaticInstBase * String representation of disassembly (lazily evaluated via * disassemble()). */ - std::string *cachedDisassembly; + mutable std::string *cachedDisassembly; /** * Internal function to generate disassembly string. */ - virtual std::string generateDisassembly(Addr pc, - const SymbolTable *symtab) = 0; + virtual std::string + generateDisassembly(Addr pc, const SymbolTable *symtab) const = 0; /// Constructor. StaticInst(const char *_mnemonic, MachInst _machInst, OpClass __opClass) @@ -347,7 +347,7 @@ class StaticInst : public StaticInstBase * Return true if the instruction is a control transfer, and if so, * return the target address as well. */ - bool hasBranchTarget(Addr pc, ExecContext *xc, Addr &tgt); + bool hasBranchTarget(Addr pc, ExecContext *xc, Addr &tgt) const; /** * Return string representation of disassembled instruction. @@ -357,7 +357,7 @@ class StaticInst : public StaticInstBase * should not be cached, this function should be overridden directly. */ virtual const std::string &disassemble(Addr pc, - const SymbolTable *symtab = 0) + const SymbolTable *symtab = 0) const { if (!cachedDisassembly) cachedDisassembly = |