Merge zizzer:/bk/newmem

into  zeep.pool:/tmp/newmem

--HG--
extra : convert_revision : f078a05729b5fe464a06a58bc4adcb374f560572

1 files changed, 4 insertions, 4 deletions

diff --git a/src/arch/alpha/miscregfile.hh b/src/arch/alpha/miscregfile.hh
index 31b3e59b3..aea702849 100644
--- a/src/arch/alpha/miscregfile.hh
+++ b/src/arch/alpha/miscregfile.hh
@@ -75,18 +75,18 @@ namespace AlphaISA
 #endif
         }
 
-        MiscReg readReg(int misc_reg);
+        MiscReg readRegNoEffect(int misc_reg);
 
-        MiscReg readRegWithEffect(int misc_reg, ThreadContext *tc);
+        MiscReg readReg(int misc_reg, ThreadContext *tc);
 
         //These functions should be removed once the simplescalar cpu model
         //has been replaced.
         int getInstAsid();
         int getDataAsid();
 
-        void setReg(int misc_reg, const MiscReg &val);
+        void setRegNoEffect(int misc_reg, const MiscReg &val);
 
-        void setRegWithEffect(int misc_reg, const MiscReg &val,
+        void setReg(int misc_reg, const MiscReg &val,
                 ThreadContext *tc);
 
         void clear()