Merge zizzer.eecs.umich.edu:/bk/newmem

into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 50102b96ba07b2b132d649a111268ee1f08c2147

1 files changed, 31 insertions, 2 deletions

diff --git a/src/arch/sparc/isa/formats/micro.isa b/src/arch/sparc/isa/formats/micro.isa
index 82d7fb4cb..da0f97d1b 100644
--- a/src/arch/sparc/isa/formats/micro.isa
+++ b/src/arch/sparc/isa/formats/micro.isa
@@ -1,4 +1,4 @@
-// Copyright (c) 2006 The Regents of The University of Michigan
+// Copyright (c) 2006-2007 The Regents of The University of Michigan
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,33 @@
 //
 // Authors: Gabe Black
 
+//This delcares the initiateAcc function in memory operations
+def template MacroInitiateAcc {{
+    Fault initiateAcc(%(CPU_exec_context)s *, Trace::InstRecord *) const
+    {
+        panic("Tried to execute a macroop directly!\n");
+        return NoFault;
+    }
+}};
+
+def template MacroCompleteAcc {{
+    Fault completeAcc(PacketPtr, %(CPU_exec_context)s *,
+            Trace::InstRecord *) const
+    {
+        panic("Tried to execute a macroop directly!\n");
+        return NoFault;
+    }
+}};
+
+//This template provides the execute functions for a store
+def template MacroExecute {{
+    Fault execute(%(CPU_exec_context)s *, Trace::InstRecord *) const
+    {
+        panic("Tried to execute a macroop directly!\n");
+        return NoFault;
+    }
+}};
+
 output header {{
 
         class SparcMacroInst : public SparcStaticInst
@@ -60,7 +87,9 @@ output header {{
                 return microOps[microPC];
             }
 
-            %(BasicExecPanic)s
+            %(MacroExecute)s
+            %(MacroInitiateAcc)s
+            %(MacroCompleteAcc)s
         };
 
         class SparcMicroInst : public SparcStaticInst