summaryrefslogtreecommitdiff
path: root/src/arch/arm/isa/templates
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:16 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:16 -0500
commit0fe0390f73eaf49dc682846cc7cd2382dd49eebb (patch)
tree4103b438dbe6580b348617bbfbf8fac30005db51 /src/arch/arm/isa/templates
parentc919ab5b4fa1d9f8721552dd2831c71c953c914f (diff)
downloadgem5-0fe0390f73eaf49dc682846cc7cd2382dd49eebb.tar.xz
ARM: Clean up the implementation of the VFP instructions.
Diffstat (limited to 'src/arch/arm/isa/templates')
-rw-r--r--src/arch/arm/isa/templates/vfp.isa66
1 files changed, 31 insertions, 35 deletions
diff --git a/src/arch/arm/isa/templates/vfp.isa b/src/arch/arm/isa/templates/vfp.isa
index cf5e5638c..b0443c734 100644
--- a/src/arch/arm/isa/templates/vfp.isa
+++ b/src/arch/arm/isa/templates/vfp.isa
@@ -37,20 +37,19 @@
//
// Authors: Gabe Black
-def template VfpRegRegOpDeclare {{
+def template FpRegRegOpDeclare {{
class %(class_name)s : public %(base_class)s
{
- protected:
- public:
- // Constructor
- %(class_name)s(ExtMachInst machInst,
- IntRegIndex _dest, IntRegIndex _op1,
- VfpMicroMode mode = VfpNotAMicroop);
- %(BasicExecDeclare)s
+ public:
+ // Constructor
+ %(class_name)s(ExtMachInst machInst,
+ IntRegIndex _dest, IntRegIndex _op1,
+ VfpMicroMode mode = VfpNotAMicroop);
+ %(BasicExecDeclare)s
};
}};
-def template VfpRegRegOpConstructor {{
+def template FpRegRegOpConstructor {{
inline %(class_name)s::%(class_name)s(ExtMachInst machInst,
IntRegIndex _dest, IntRegIndex _op1,
VfpMicroMode mode)
@@ -61,19 +60,18 @@ def template VfpRegRegOpConstructor {{
}
}};
-def template VfpRegImmOpDeclare {{
+def template FpRegImmOpDeclare {{
class %(class_name)s : public %(base_class)s
{
- protected:
- public:
- // Constructor
- %(class_name)s(ExtMachInst machInst, IntRegIndex _dest,
- uint64_t _imm, VfpMicroMode mode = VfpNotAMicroop);
- %(BasicExecDeclare)s
+ public:
+ // Constructor
+ %(class_name)s(ExtMachInst machInst, IntRegIndex _dest,
+ uint64_t _imm, VfpMicroMode mode = VfpNotAMicroop);
+ %(BasicExecDeclare)s
};
}};
-def template VfpRegImmOpConstructor {{
+def template FpRegImmOpConstructor {{
inline %(class_name)s::%(class_name)s(ExtMachInst machInst,
IntRegIndex _dest, uint64_t _imm, VfpMicroMode mode)
: %(base_class)s("%(mnemonic)s", machInst, %(op_class)s,
@@ -83,20 +81,19 @@ def template VfpRegImmOpConstructor {{
}
}};
-def template VfpRegRegImmOpDeclare {{
+def template FpRegRegImmOpDeclare {{
class %(class_name)s : public %(base_class)s
{
- protected:
- public:
- // Constructor
- %(class_name)s(ExtMachInst machInst,
- IntRegIndex _dest, IntRegIndex _op1,
- uint64_t _imm, VfpMicroMode mode = VfpNotAMicroop);
- %(BasicExecDeclare)s
+ public:
+ // Constructor
+ %(class_name)s(ExtMachInst machInst,
+ IntRegIndex _dest, IntRegIndex _op1,
+ uint64_t _imm, VfpMicroMode mode = VfpNotAMicroop);
+ %(BasicExecDeclare)s
};
}};
-def template VfpRegRegImmOpConstructor {{
+def template FpRegRegImmOpConstructor {{
inline %(class_name)s::%(class_name)s(ExtMachInst machInst,
IntRegIndex _dest,
IntRegIndex _op1,
@@ -109,20 +106,19 @@ def template VfpRegRegImmOpConstructor {{
}
}};
-def template VfpRegRegRegOpDeclare {{
+def template FpRegRegRegOpDeclare {{
class %(class_name)s : public %(base_class)s
{
- protected:
- public:
- // Constructor
- %(class_name)s(ExtMachInst machInst,
- IntRegIndex _dest, IntRegIndex _op1, IntRegIndex _op2,
- VfpMicroMode mode = VfpNotAMicroop);
- %(BasicExecDeclare)s
+ public:
+ // Constructor
+ %(class_name)s(ExtMachInst machInst,
+ IntRegIndex _dest, IntRegIndex _op1, IntRegIndex _op2,
+ VfpMicroMode mode = VfpNotAMicroop);
+ %(BasicExecDeclare)s
};
}};
-def template VfpRegRegRegOpConstructor {{
+def template FpRegRegRegOpConstructor {{
inline %(class_name)s::%(class_name)s(ExtMachInst machInst,
IntRegIndex _dest,
IntRegIndex _op1,