From 36ca0658a412671ee18cde40b8d264e319fb4710 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 12:58:02 -0500
Subject: ARM: Get rid of obsoleted predicated inst formats, etc.

---
 src/arch/arm/isa/formats/pred.isa | 58 ---------------------------------------
 1 file changed, 58 deletions(-)

(limited to 'src/arch/arm/isa/formats/pred.isa')

diff --git a/src/arch/arm/isa/formats/pred.isa b/src/arch/arm/isa/formats/pred.isa
index d5e3fec19..897edc2dc 100644
--- a/src/arch/arm/isa/formats/pred.isa
+++ b/src/arch/arm/isa/formats/pred.isa
@@ -186,23 +186,6 @@ def format DataImmOp(code, flagtype = logic) {{
     decode_block = DataImmDecode.subst(iop)
 }};
 
-def format DataModImmOp(code, flagtype = modImm) {{
-    code += "resTemp = resTemp;"
-    iop = InstObjParams(name, Name + "ModImm", 'PredModImmOp',
-                        {"code": code,
-                         "predicate_test": predicateTest})
-    ccIop = InstObjParams(name, Name + "ModImmCc", 'PredModImmOp',
-                          {"code": code + getImmCcCode(flagtype),
-                           "predicate_test": predicateTest})
-    header_output = BasicDeclare.subst(iop) + \
-                    BasicDeclare.subst(ccIop)
-    decoder_output = BasicConstructor.subst(iop) + \
-                     BasicConstructor.subst(ccIop)
-    exec_output = PredOpExecute.subst(iop) + \
-                  PredOpExecute.subst(ccIop)
-    decode_block = DataImmDecode.subst(iop)
-}};
-
 def format PredOp(code, *opt_flags) {{
     iop = InstObjParams(name, Name, 'PredOp',
                         {"code": code,
@@ -225,44 +208,3 @@ def format PredImmOp(code, *opt_flags) {{
     exec_output = PredOpExecute.subst(iop)
 }};
 
-def format PredImmOpCc(code, icValue, ivValue, *opt_flags) {{
-    ccCode = calcCcCode % vars()
-    code += ccCode;
-    iop = InstObjParams(name, Name, 'PredImmOp',
-                        {"code": code,
-                         "cc_code": ccCode,
-                         "predicate_test": predicateTest},
-                        opt_flags)
-    header_output = BasicDeclare.subst(iop)
-    decoder_output = BasicConstructor.subst(iop)
-    decode_block = BasicDecode.subst(iop)
-    exec_output = PredOpExecute.subst(iop)
-}};
-
-def format PredIntOp(code, *opt_flags) {{
-    new_code = ArmGenericCodeSubs(code)
-    iop = InstObjParams(name, Name, 'PredIntOp',
-                        {"code": new_code,
-                         "predicate_test": predicateTest},
-                        opt_flags)
-    header_output = BasicDeclare.subst(iop)
-    decoder_output = BasicConstructor.subst(iop)
-    decode_block = BasicDecode.subst(iop)
-    exec_output = PredOpExecute.subst(iop)
-}};
-
-def format PredIntOpCc(code, icValue, ivValue, *opt_flags) {{
-    ccCode = calcCcCode % vars()
-    code += ccCode;
-    new_code = ArmGenericCodeSubs(code)
-    iop = InstObjParams(name, Name, 'PredIntOp',
-                        {"code": new_code,
-                         "cc_code": ccCode,
-                         "predicate_test": predicateTest},
-                        opt_flags)
-    header_output = BasicDeclare.subst(iop)
-    decoder_output = BasicConstructor.subst(iop)
-    decode_block = BasicDecode.subst(iop)
-    exec_output = PredOpExecute.subst(iop)
-}};
-
-- 
cgit v1.2.3