diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-11-10 12:44:15 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-11-10 12:44:15 -0500 |
| commit | b5e68fb54677f601bb00c23af52db8fd6571301f (patch) | |
| tree | dc3c17198ba4010d907ecd8cb7189aa7959948d4 /src/cpu/ozone/dyn_inst.hh | |
| parent | 264f9ce374ff4689fec3c32d8289fe76b0b65078 (diff) | |
| parent | 9ef51f2dbaba88c10366d708f0ca872bb39064e4 (diff) | |
| download | gem5-b5e68fb54677f601bb00c23af52db8fd6571301f.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem
--HG--
extra : convert_revision : 0c2db1e1b5fdb91c1ac5705ab872a6bfb575a67a
Diffstat (limited to 'src/cpu/ozone/dyn_inst.hh')
| -rw-r--r-- | src/cpu/ozone/dyn_inst.hh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/cpu/ozone/dyn_inst.hh b/src/cpu/ozone/dyn_inst.hh index e7390626e..9445a5309 100644 --- a/src/cpu/ozone/dyn_inst.hh +++ b/src/cpu/ozone/dyn_inst.hh @@ -230,17 +230,14 @@ class OzoneDynInst : public BaseDynInst<Impl> // ISA stuff MiscReg readMiscReg(int misc_reg); - MiscReg readMiscRegWithEffect(int misc_reg, Fault &fault); + MiscReg readMiscRegWithEffect(int misc_reg); - Fault setMiscReg(int misc_reg, const MiscReg &val); + void setMiscReg(int misc_reg, const MiscReg &val); - Fault setMiscRegWithEffect(int misc_reg, const MiscReg &val); + void setMiscRegWithEffect(int misc_reg, const MiscReg &val); #if FULL_SYSTEM Fault hwrei(); - int readIntrFlag(); - void setIntrFlag(int val); - bool inPalMode(); void trap(Fault fault); bool simPalCheck(int palFunc); #else |