diff -r 508bbec99e58 -r 13f5134a2a87 src/arch/alpha/isa/mem.isa
--- a/src/arch/alpha/isa/mem.isa	Tue Jan 10 22:50:54 2012 -0800
+++ b/src/arch/alpha/isa/mem.isa	Wed Jan 11 12:13:40 2012 -0500
@@ -465,27 +465,14 @@
     mem_flags = makeList(mem_flags)
     inst_flags = makeList(inst_flags)
 
-    # Some CPU models execute the memory operation as an atomic unit,
-    # while others want to separate them into an effective address
-    # computation and a memory access operation.  As a result, we need
-    # to generate three StaticInst objects.  Note that the latter two
-    # are nested inside the larger "atomic" one.
-
-    # Generate InstObjParams for each of the three objects.  Note that
-    # they differ only in the set of code objects contained (which in
-    # turn affects the object's overall operand list).
     iop = InstObjParams(name, Name, base_class,
                         { 'ea_code':ea_code, 'memacc_code':memacc_code, 'postacc_code':postacc_code },
                         inst_flags)
-    memacc_iop = InstObjParams(name, Name, base_class,
-                        { 'memacc_code':memacc_code, 'postacc_code':postacc_code },
-                        inst_flags)
 
     if mem_flags:
         mem_flags = [ 'Request::%s' % flag for flag in mem_flags ]
         s = '\n\tmemAccessFlags = ' + string.join(mem_flags, '|') + ';'
         iop.constructor += s
-        memacc_iop.constructor += s
 
     # select templates
 
diff -r 508bbec99e58 -r 13f5134a2a87 src/cpu/o3/dyn_inst.hh
--- a/src/cpu/o3/dyn_inst.hh	Tue Jan 10 22:50:54 2012 -0800
+++ b/src/cpu/o3/dyn_inst.hh	Wed Jan 11 12:13:40 2012 -0500
@@ -58,6 +58,9 @@
  * allow for passing in of all types, such as the CPU type and the ISA
  * type. The AlphaDynInst serves as the primary interface to the CPU
  * for instructions that are executing.
+ *
+ * Note: AlphaDynInst doesn't appear to exist anymore -- perhaps the above
+ * comment is still relevant to BaseO3DynInst ? 
  */
 template <class Impl>
 class BaseO3DynInst : public BaseDynInst<Impl>
@@ -293,5 +296,5 @@
     }
 };
 
-#endif // __CPU_O3_ALPHA_DYN_INST_HH__
+#endif // __CPU_O3_DYN_INST_HH__