summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2009-06-21 17:14:51 -0700
committerGabe Black <gblack@eecs.umich.edu>2009-06-21 17:14:51 -0700
commit2a39570b78dd5871582089e7e1b21b739d2e9d68 (patch)
tree43eadd2d39707dd93327319f32a824aec40d8807
parentd1d733f63641156c49d37a58377668aacd01f9ba (diff)
downloadgem5-2a39570b78dd5871582089e7e1b21b739d2e9d68.tar.xz
ARM: Remove the currently unecessary FPAOp class.
-rw-r--r--src/arch/arm/isa/formats/fp.isa30
1 files changed, 4 insertions, 26 deletions
diff --git a/src/arch/arm/isa/formats/fp.isa b/src/arch/arm/isa/formats/fp.isa
index fda1175b0..e88531580 100644
--- a/src/arch/arm/isa/formats/fp.isa
+++ b/src/arch/arm/isa/formats/fp.isa
@@ -33,28 +33,6 @@
// Floating Point operate instructions
//
-output header {{
-
- /**
- * Base class for FP operations.
- */
- class FPAOp : public PredOp
- {
- protected:
-
- /// Constructor
- FPAOp(const char *mnem, MachInst _machInst, OpClass __opClass) : PredOp(mnem, _machInst, __opClass)
- {
- }
-
- //std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
- };
-
-}};
-
-output exec {{
-}};
-
def template FPAExecute {{
Fault %(class_name)s::execute(%(CPU_exec_context)s *xc, Trace::InstRecord *traceData) const
{
@@ -101,7 +79,7 @@ def format FloatOp(code, *flags) {{
orig_code = code
cblk = code
- iop = InstObjParams(name, Name, 'FPAOp',
+ iop = InstObjParams(name, Name, 'PredOp',
{"code": cblk,
"predicate_test": predicateTest},
flags)
@@ -110,7 +88,7 @@ def format FloatOp(code, *flags) {{
exec_output = FPAExecute.subst(iop)
sng_cblk = code
- sng_iop = InstObjParams(name, Name+'S', 'FPAOp',
+ sng_iop = InstObjParams(name, Name+'S', 'PredOp',
{"code": sng_cblk,
"predicate_test": predicateTest},
flags)
@@ -121,7 +99,7 @@ def format FloatOp(code, *flags) {{
dbl_code = re.sub(r'\.sf', '.df', orig_code)
dbl_cblk = dbl_code
- dbl_iop = InstObjParams(name, Name+'D', 'FPAOp',
+ dbl_iop = InstObjParams(name, Name+'D', 'PredOp',
{"code": dbl_cblk,
"predicate_test": predicateTest},
flags)
@@ -148,7 +126,7 @@ let {{
def format FloatCmp(fReg1, fReg2, *flags) {{
code = calcFPCcCode % vars()
- iop = InstObjParams(name, Name, 'FPAOp',
+ iop = InstObjParams(name, Name, 'PredOp',
{"code": code,
"predicate_test": predicateTest},
flags)