From 695414217fdb4bfa4e6faf9fe92297c519140396 Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@google.com>
Date: Mon, 6 Nov 2017 18:38:32 -0800
Subject: sparc: Pull most of the Nop format out of the ISA description.

The Nop format mostly just made instructions that inherited from the
Nop base class but with different mnemonics, so there doesn't need
to be very much dynamic content.

Change-Id: I1cf5e25ca8372f9b71f56d49756879c7545c9f6c
Reviewed-on: https://gem5-review.googlesource.com/5462
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
---
 src/arch/sparc/isa/formats/nop.isa | 65 ++++++++------------------------------
 1 file changed, 13 insertions(+), 52 deletions(-)

(limited to 'src/arch/sparc/isa/formats')

diff --git a/src/arch/sparc/isa/formats/nop.isa b/src/arch/sparc/isa/formats/nop.isa
index d1257907f..6fb609360 100644
--- a/src/arch/sparc/isa/formats/nop.isa
+++ b/src/arch/sparc/isa/formats/nop.isa
@@ -31,60 +31,21 @@
 //
 // Nop instruction
 //
-
-// Per-cpu-model nop execute method.
-def template NopExec {{
-}};
-
-output header {{
-        /**
-         * Nop class.
-         */
-        class Nop : public SparcStaticInst
-        {
-          public:
-            // Constructor
-            Nop(const char *mnem, ExtMachInst _machInst, OpClass __opClass) :
-                SparcStaticInst(mnem, _machInst, __opClass)
-            {
-                flags[IsNop] = true;
-            }
-
-            Fault
-            execute(ExecContext *xc, Trace::InstRecord *traceData) const
-            {
-                return NoFault;
-            }
-
-            std::string generateDisassembly(Addr pc,
-                    const SymbolTable *symtab) const;
-        };
-}};
-
-output decoder {{
-        std::string Nop::generateDisassembly(Addr pc,
-                const SymbolTable *symtab) const
-        {
-            std::stringstream response;
-            printMnemonic(response, mnemonic);
-            return response.str();
-        }
-}};
-
-def template NopExecute {{
-        Fault %(class_name)s::execute(ExecContext *xc,
-                Trace::InstRecord *traceData) const
-        {
-            // Nothing to see here, move along
-            return NoFault;
-        }
+def template NopDeclare {{
+/**
+ * Static instruction class for "%(mnemonic)s".
+ */
+class %(class_name)s : public %(base_class)s
+{
+  public:
+    %(class_name)s(ExtMachInst machInst);
+};
 }};
 
-// Primary format for integer operate instructions:
-def format Nop(code, *opt_flags) {{
-        iop = InstObjParams(name, Name, 'Nop', code, opt_flags)
-        header_output = BasicDeclare.subst(iop)
+// Format for instructions that don't actually do anything:
+def format Nop(*opt_flags) {{
+        iop = InstObjParams(name, Name, 'Nop', '', opt_flags)
+        header_output = NopDeclare.subst(iop)
         decoder_output = BasicConstructor.subst(iop)
         decode_block = BasicDecode.subst(iop)
-        exec_output = NopExecute.subst(iop)
 }};
-- 
cgit v1.2.3