Rename vfp to arm-vfp.
diff --git a/vm/mterp/arm-vfp/OP_ADD_DOUBLE.S b/vm/mterp/arm-vfp/OP_ADD_DOUBLE.S
new file mode 100644
index 0000000..5a5ad1d
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_ADD_DOUBLE.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinopWide.S" {"instr":"faddd d2, d0, d1"}
diff --git a/vm/mterp/arm-vfp/OP_ADD_DOUBLE_2ADDR.S b/vm/mterp/arm-vfp/OP_ADD_DOUBLE_2ADDR.S
new file mode 100644
index 0000000..9823765
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_ADD_DOUBLE_2ADDR.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinopWide2addr.S" {"instr":"faddd d2, d0, d1"}
diff --git a/vm/mterp/arm-vfp/OP_ADD_FLOAT.S b/vm/mterp/arm-vfp/OP_ADD_FLOAT.S
new file mode 100644
index 0000000..22023ec
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_ADD_FLOAT.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinop.S" {"instr":"fadds s2, s0, s1"}
diff --git a/vm/mterp/arm-vfp/OP_ADD_FLOAT_2ADDR.S b/vm/mterp/arm-vfp/OP_ADD_FLOAT_2ADDR.S
new file mode 100644
index 0000000..e787589
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_ADD_FLOAT_2ADDR.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinop2addr.S" {"instr":"fadds s2, s0, s1"}
diff --git a/vm/mterp/vfp/OP_CMPG_DOUBLE.S b/vm/mterp/arm-vfp/OP_CMPG_DOUBLE.S
similarity index 100%
rename from vm/mterp/vfp/OP_CMPG_DOUBLE.S
rename to vm/mterp/arm-vfp/OP_CMPG_DOUBLE.S
diff --git a/vm/mterp/vfp/OP_CMPG_FLOAT.S b/vm/mterp/arm-vfp/OP_CMPG_FLOAT.S
similarity index 100%
rename from vm/mterp/vfp/OP_CMPG_FLOAT.S
rename to vm/mterp/arm-vfp/OP_CMPG_FLOAT.S
diff --git a/vm/mterp/vfp/OP_CMPL_DOUBLE.S b/vm/mterp/arm-vfp/OP_CMPL_DOUBLE.S
similarity index 100%
rename from vm/mterp/vfp/OP_CMPL_DOUBLE.S
rename to vm/mterp/arm-vfp/OP_CMPL_DOUBLE.S
diff --git a/vm/mterp/vfp/OP_CMPL_FLOAT.S b/vm/mterp/arm-vfp/OP_CMPL_FLOAT.S
similarity index 100%
rename from vm/mterp/vfp/OP_CMPL_FLOAT.S
rename to vm/mterp/arm-vfp/OP_CMPL_FLOAT.S
diff --git a/vm/mterp/arm-vfp/OP_DIV_DOUBLE.S b/vm/mterp/arm-vfp/OP_DIV_DOUBLE.S
new file mode 100644
index 0000000..11770ad
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_DIV_DOUBLE.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinopWide.S" {"instr":"fdivd d2, d0, d1"}
diff --git a/vm/mterp/arm-vfp/OP_DIV_DOUBLE_2ADDR.S b/vm/mterp/arm-vfp/OP_DIV_DOUBLE_2ADDR.S
new file mode 100644
index 0000000..a52f434
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_DIV_DOUBLE_2ADDR.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinopWide2addr.S" {"instr":"fdivd d2, d0, d1"}
diff --git a/vm/mterp/arm-vfp/OP_DIV_FLOAT.S b/vm/mterp/arm-vfp/OP_DIV_FLOAT.S
new file mode 100644
index 0000000..2e82ada
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_DIV_FLOAT.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinop.S" {"instr":"fdivs s2, s0, s1"}
diff --git a/vm/mterp/arm-vfp/OP_DIV_FLOAT_2ADDR.S b/vm/mterp/arm-vfp/OP_DIV_FLOAT_2ADDR.S
new file mode 100644
index 0000000..2147583
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_DIV_FLOAT_2ADDR.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinop2addr.S" {"instr":"fdivs s2, s0, s1"}
diff --git a/vm/mterp/arm-vfp/OP_DOUBLE_TO_FLOAT.S b/vm/mterp/arm-vfp/OP_DOUBLE_TO_FLOAT.S
new file mode 100644
index 0000000..33d5b61
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_DOUBLE_TO_FLOAT.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/funopNarrower.S" {"instr":"fcvtsd s0, d0"}
diff --git a/vm/mterp/arm-vfp/OP_DOUBLE_TO_INT.S b/vm/mterp/arm-vfp/OP_DOUBLE_TO_INT.S
new file mode 100644
index 0000000..2ef4838
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_DOUBLE_TO_INT.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/funopNarrower.S" {"instr":"ftosizd s0, d0"}
diff --git a/vm/mterp/arm-vfp/OP_FLOAT_TO_DOUBLE.S b/vm/mterp/arm-vfp/OP_FLOAT_TO_DOUBLE.S
new file mode 100644
index 0000000..0acb3d8
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_FLOAT_TO_DOUBLE.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/funopWider.S" {"instr":"fcvtds d0, s0"}
diff --git a/vm/mterp/arm-vfp/OP_FLOAT_TO_INT.S b/vm/mterp/arm-vfp/OP_FLOAT_TO_INT.S
new file mode 100644
index 0000000..d0a9a2e
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_FLOAT_TO_INT.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/funop.S" {"instr":"ftosizs s1, s0"}
diff --git a/vm/mterp/arm-vfp/OP_INT_TO_DOUBLE.S b/vm/mterp/arm-vfp/OP_INT_TO_DOUBLE.S
new file mode 100644
index 0000000..6eb430e
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_INT_TO_DOUBLE.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/funopWider.S" {"instr":"fsitod d0, s0"}
diff --git a/vm/mterp/arm-vfp/OP_INT_TO_FLOAT.S b/vm/mterp/arm-vfp/OP_INT_TO_FLOAT.S
new file mode 100644
index 0000000..698bdc7
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_INT_TO_FLOAT.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/funop.S" {"instr":"fsitos s1, s0"}
diff --git a/vm/mterp/arm-vfp/OP_MUL_DOUBLE.S b/vm/mterp/arm-vfp/OP_MUL_DOUBLE.S
new file mode 100644
index 0000000..7563191
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_MUL_DOUBLE.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinopWide.S" {"instr":"fmuld d2, d0, d1"}
diff --git a/vm/mterp/arm-vfp/OP_MUL_DOUBLE_2ADDR.S b/vm/mterp/arm-vfp/OP_MUL_DOUBLE_2ADDR.S
new file mode 100644
index 0000000..eadf101
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_MUL_DOUBLE_2ADDR.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinopWide2addr.S" {"instr":"fmuld d2, d0, d1"}
diff --git a/vm/mterp/arm-vfp/OP_MUL_FLOAT.S b/vm/mterp/arm-vfp/OP_MUL_FLOAT.S
new file mode 100644
index 0000000..bb3ab42
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_MUL_FLOAT.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinop.S" {"instr":"fmuls s2, s0, s1"}
diff --git a/vm/mterp/arm-vfp/OP_MUL_FLOAT_2ADDR.S b/vm/mterp/arm-vfp/OP_MUL_FLOAT_2ADDR.S
new file mode 100644
index 0000000..3918537
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_MUL_FLOAT_2ADDR.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinop2addr.S" {"instr":"fmuls s2, s0, s1"}
diff --git a/vm/mterp/arm-vfp/OP_SUB_DOUBLE.S b/vm/mterp/arm-vfp/OP_SUB_DOUBLE.S
new file mode 100644
index 0000000..d40e083
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_SUB_DOUBLE.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinopWide.S" {"instr":"fsubd d2, d0, d1"}
diff --git a/vm/mterp/arm-vfp/OP_SUB_DOUBLE_2ADDR.S b/vm/mterp/arm-vfp/OP_SUB_DOUBLE_2ADDR.S
new file mode 100644
index 0000000..705124f
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_SUB_DOUBLE_2ADDR.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinopWide2addr.S" {"instr":"fsubd d2, d0, d1"}
diff --git a/vm/mterp/arm-vfp/OP_SUB_FLOAT.S b/vm/mterp/arm-vfp/OP_SUB_FLOAT.S
new file mode 100644
index 0000000..0bf2bc0
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_SUB_FLOAT.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinop.S" {"instr":"fsubs s2, s0, s1"}
diff --git a/vm/mterp/arm-vfp/OP_SUB_FLOAT_2ADDR.S b/vm/mterp/arm-vfp/OP_SUB_FLOAT_2ADDR.S
new file mode 100644
index 0000000..e214068
--- /dev/null
+++ b/vm/mterp/arm-vfp/OP_SUB_FLOAT_2ADDR.S
@@ -0,0 +1,2 @@
+%verify "executed"
+%include "arm-vfp/fbinop2addr.S" {"instr":"fsubs s2, s0, s1"}
diff --git a/vm/mterp/vfp/fbinop.S b/vm/mterp/arm-vfp/fbinop.S
similarity index 100%
rename from vm/mterp/vfp/fbinop.S
rename to vm/mterp/arm-vfp/fbinop.S
diff --git a/vm/mterp/vfp/fbinop2addr.S b/vm/mterp/arm-vfp/fbinop2addr.S
similarity index 100%
rename from vm/mterp/vfp/fbinop2addr.S
rename to vm/mterp/arm-vfp/fbinop2addr.S
diff --git a/vm/mterp/vfp/fbinopWide.S b/vm/mterp/arm-vfp/fbinopWide.S
similarity index 100%
rename from vm/mterp/vfp/fbinopWide.S
rename to vm/mterp/arm-vfp/fbinopWide.S
diff --git a/vm/mterp/vfp/fbinopWide2addr.S b/vm/mterp/arm-vfp/fbinopWide2addr.S
similarity index 100%
rename from vm/mterp/vfp/fbinopWide2addr.S
rename to vm/mterp/arm-vfp/fbinopWide2addr.S
diff --git a/vm/mterp/vfp/funop.S b/vm/mterp/arm-vfp/funop.S
similarity index 100%
rename from vm/mterp/vfp/funop.S
rename to vm/mterp/arm-vfp/funop.S
diff --git a/vm/mterp/vfp/funopNarrower.S b/vm/mterp/arm-vfp/funopNarrower.S
similarity index 100%
rename from vm/mterp/vfp/funopNarrower.S
rename to vm/mterp/arm-vfp/funopNarrower.S
diff --git a/vm/mterp/vfp/funopWider.S b/vm/mterp/arm-vfp/funopWider.S
similarity index 100%
rename from vm/mterp/vfp/funopWider.S
rename to vm/mterp/arm-vfp/funopWider.S
diff --git a/vm/mterp/config-armv5te-vfp b/vm/mterp/config-armv5te-vfp
index 863f09f..3749eed 100644
--- a/vm/mterp/config-armv5te-vfp
+++ b/vm/mterp/config-armv5te-vfp
@@ -43,32 +43,32 @@
# opcode list; argument to op-start is default directory
op-start armv5te
- op OP_ADD_DOUBLE vfp
- op OP_ADD_DOUBLE_2ADDR vfp
- op OP_ADD_FLOAT vfp
- op OP_ADD_FLOAT_2ADDR vfp
- op OP_CMPG_DOUBLE vfp
- op OP_CMPG_FLOAT vfp
- op OP_CMPL_DOUBLE vfp
- op OP_CMPL_FLOAT vfp
- op OP_DIV_DOUBLE vfp
- op OP_DIV_DOUBLE_2ADDR vfp
- op OP_DIV_FLOAT vfp
- op OP_DIV_FLOAT_2ADDR vfp
- op OP_DOUBLE_TO_FLOAT vfp
- op OP_DOUBLE_TO_INT vfp
- op OP_FLOAT_TO_DOUBLE vfp
- op OP_FLOAT_TO_INT vfp
- op OP_INT_TO_DOUBLE vfp
- op OP_INT_TO_FLOAT vfp
- op OP_MUL_DOUBLE vfp
- op OP_MUL_DOUBLE_2ADDR vfp
- op OP_MUL_FLOAT vfp
- op OP_MUL_FLOAT_2ADDR vfp
- op OP_SUB_DOUBLE vfp
- op OP_SUB_DOUBLE_2ADDR vfp
- op OP_SUB_FLOAT vfp
- op OP_SUB_FLOAT_2ADDR vfp
+ op OP_ADD_DOUBLE arm-vfp
+ op OP_ADD_DOUBLE_2ADDR arm-vfp
+ op OP_ADD_FLOAT arm-vfp
+ op OP_ADD_FLOAT_2ADDR arm-vfp
+ op OP_CMPG_DOUBLE arm-vfp
+ op OP_CMPG_FLOAT arm-vfp
+ op OP_CMPL_DOUBLE arm-vfp
+ op OP_CMPL_FLOAT arm-vfp
+ op OP_DIV_DOUBLE arm-vfp
+ op OP_DIV_DOUBLE_2ADDR arm-vfp
+ op OP_DIV_FLOAT arm-vfp
+ op OP_DIV_FLOAT_2ADDR arm-vfp
+ op OP_DOUBLE_TO_FLOAT arm-vfp
+ op OP_DOUBLE_TO_INT arm-vfp
+ op OP_FLOAT_TO_DOUBLE arm-vfp
+ op OP_FLOAT_TO_INT arm-vfp
+ op OP_INT_TO_DOUBLE arm-vfp
+ op OP_INT_TO_FLOAT arm-vfp
+ op OP_MUL_DOUBLE arm-vfp
+ op OP_MUL_DOUBLE_2ADDR arm-vfp
+ op OP_MUL_FLOAT arm-vfp
+ op OP_MUL_FLOAT_2ADDR arm-vfp
+ op OP_SUB_DOUBLE arm-vfp
+ op OP_SUB_DOUBLE_2ADDR arm-vfp
+ op OP_SUB_FLOAT arm-vfp
+ op OP_SUB_FLOAT_2ADDR arm-vfp
# use trivial integer operation
#op OP_NEG_DOUBLE armv5te
diff --git a/vm/mterp/out/InterpAsm-armv5te-vfp.S b/vm/mterp/out/InterpAsm-armv5te-vfp.S
index 3fb16ff..f38ee7e 100644
--- a/vm/mterp/out/InterpAsm-armv5te-vfp.S
+++ b/vm/mterp/out/InterpAsm-armv5te-vfp.S
@@ -1302,7 +1302,7 @@
/* ------------------------------ */
.balign 64
.L_OP_CMPL_FLOAT: /* 0x2d */
-/* File: vfp/OP_CMPL_FLOAT.S */
+/* File: arm-vfp/OP_CMPL_FLOAT.S */
/*
* Compare two floating-point values. Puts 0, 1, or -1 into the
* destination register based on the results of the comparison.
@@ -1341,7 +1341,7 @@
/* ------------------------------ */
.balign 64
.L_OP_CMPG_FLOAT: /* 0x2e */
-/* File: vfp/OP_CMPG_FLOAT.S */
+/* File: arm-vfp/OP_CMPG_FLOAT.S */
/*
* Compare two floating-point values. Puts 0, 1, or -1 into the
* destination register based on the results of the comparison.
@@ -1380,7 +1380,7 @@
/* ------------------------------ */
.balign 64
.L_OP_CMPL_DOUBLE: /* 0x2f */
-/* File: vfp/OP_CMPL_DOUBLE.S */
+/* File: arm-vfp/OP_CMPL_DOUBLE.S */
/*
* Compare two floating-point values. Puts 0, 1, or -1 into the
* destination register based on the results of the comparison.
@@ -1419,7 +1419,7 @@
/* ------------------------------ */
.balign 64
.L_OP_CMPG_DOUBLE: /* 0x30 */
-/* File: vfp/OP_CMPG_DOUBLE.S */
+/* File: arm-vfp/OP_CMPG_DOUBLE.S */
/*
* Compare two floating-point values. Puts 0, 1, or -1 into the
* destination register based on the results of the comparison.
@@ -3705,8 +3705,8 @@
/* ------------------------------ */
.balign 64
.L_OP_INT_TO_FLOAT: /* 0x82 */
-/* File: vfp/OP_INT_TO_FLOAT.S */
-/* File: vfp/funop.S */
+/* File: arm-vfp/OP_INT_TO_FLOAT.S */
+/* File: arm-vfp/funop.S */
/*
* Generic 32-bit unary floating-point operation. Provide an "instr"
* line that specifies an instruction that performs "s1 = op s0".
@@ -3730,8 +3730,8 @@
/* ------------------------------ */
.balign 64
.L_OP_INT_TO_DOUBLE: /* 0x83 */
-/* File: vfp/OP_INT_TO_DOUBLE.S */
-/* File: vfp/funopWider.S */
+/* File: arm-vfp/OP_INT_TO_DOUBLE.S */
+/* File: arm-vfp/funopWider.S */
/*
* Generic 32bit-to-64bit floating point unary operation. Provide an
* "instr" line that specifies an instruction that performs "d0 = op s0".
@@ -3833,8 +3833,8 @@
/* ------------------------------ */
.balign 64
.L_OP_FLOAT_TO_INT: /* 0x87 */
-/* File: vfp/OP_FLOAT_TO_INT.S */
-/* File: vfp/funop.S */
+/* File: arm-vfp/OP_FLOAT_TO_INT.S */
+/* File: arm-vfp/funop.S */
/*
* Generic 32-bit unary floating-point operation. Provide an "instr"
* line that specifies an instruction that performs "s1 = op s0".
@@ -3887,8 +3887,8 @@
/* ------------------------------ */
.balign 64
.L_OP_FLOAT_TO_DOUBLE: /* 0x89 */
-/* File: vfp/OP_FLOAT_TO_DOUBLE.S */
-/* File: vfp/funopWider.S */
+/* File: arm-vfp/OP_FLOAT_TO_DOUBLE.S */
+/* File: arm-vfp/funopWider.S */
/*
* Generic 32bit-to-64bit floating point unary operation. Provide an
* "instr" line that specifies an instruction that performs "d0 = op s0".
@@ -3912,8 +3912,8 @@
/* ------------------------------ */
.balign 64
.L_OP_DOUBLE_TO_INT: /* 0x8a */
-/* File: vfp/OP_DOUBLE_TO_INT.S */
-/* File: vfp/funopNarrower.S */
+/* File: arm-vfp/OP_DOUBLE_TO_INT.S */
+/* File: arm-vfp/funopNarrower.S */
/*
* Generic 64bit-to-32bit unary floating point operation. Provide an
* "instr" line that specifies an instruction that performs "s0 = op d0".
@@ -3968,8 +3968,8 @@
/* ------------------------------ */
.balign 64
.L_OP_DOUBLE_TO_FLOAT: /* 0x8c */
-/* File: vfp/OP_DOUBLE_TO_FLOAT.S */
-/* File: vfp/funopNarrower.S */
+/* File: arm-vfp/OP_DOUBLE_TO_FLOAT.S */
+/* File: arm-vfp/funopNarrower.S */
/*
* Generic 64bit-to-32bit unary floating point operation. Provide an
* "instr" line that specifies an instruction that performs "s0 = op d0".
@@ -4980,8 +4980,8 @@
/* ------------------------------ */
.balign 64
.L_OP_ADD_FLOAT: /* 0xa6 */
-/* File: vfp/OP_ADD_FLOAT.S */
-/* File: vfp/fbinop.S */
+/* File: arm-vfp/OP_ADD_FLOAT.S */
+/* File: arm-vfp/fbinop.S */
/*
* Generic 32-bit floating-point operation. Provide an "instr" line that
* specifies an instruction that performs "s2 = s0 op s1". Because we
@@ -5010,8 +5010,8 @@
/* ------------------------------ */
.balign 64
.L_OP_SUB_FLOAT: /* 0xa7 */
-/* File: vfp/OP_SUB_FLOAT.S */
-/* File: vfp/fbinop.S */
+/* File: arm-vfp/OP_SUB_FLOAT.S */
+/* File: arm-vfp/fbinop.S */
/*
* Generic 32-bit floating-point operation. Provide an "instr" line that
* specifies an instruction that performs "s2 = s0 op s1". Because we
@@ -5040,8 +5040,8 @@
/* ------------------------------ */
.balign 64
.L_OP_MUL_FLOAT: /* 0xa8 */
-/* File: vfp/OP_MUL_FLOAT.S */
-/* File: vfp/fbinop.S */
+/* File: arm-vfp/OP_MUL_FLOAT.S */
+/* File: arm-vfp/fbinop.S */
/*
* Generic 32-bit floating-point operation. Provide an "instr" line that
* specifies an instruction that performs "s2 = s0 op s1". Because we
@@ -5070,8 +5070,8 @@
/* ------------------------------ */
.balign 64
.L_OP_DIV_FLOAT: /* 0xa9 */
-/* File: vfp/OP_DIV_FLOAT.S */
-/* File: vfp/fbinop.S */
+/* File: arm-vfp/OP_DIV_FLOAT.S */
+/* File: arm-vfp/fbinop.S */
/*
* Generic 32-bit floating-point operation. Provide an "instr" line that
* specifies an instruction that performs "s2 = s0 op s1". Because we
@@ -5143,8 +5143,8 @@
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE: /* 0xab */
-/* File: vfp/OP_ADD_DOUBLE.S */
-/* File: vfp/fbinopWide.S */
+/* File: arm-vfp/OP_ADD_DOUBLE.S */
+/* File: arm-vfp/fbinopWide.S */
/*
* Generic 64-bit double-precision floating point binary operation.
* Provide an "instr" line that specifies an instruction that performs
@@ -5173,8 +5173,8 @@
/* ------------------------------ */
.balign 64
.L_OP_SUB_DOUBLE: /* 0xac */
-/* File: vfp/OP_SUB_DOUBLE.S */
-/* File: vfp/fbinopWide.S */
+/* File: arm-vfp/OP_SUB_DOUBLE.S */
+/* File: arm-vfp/fbinopWide.S */
/*
* Generic 64-bit double-precision floating point binary operation.
* Provide an "instr" line that specifies an instruction that performs
@@ -5203,8 +5203,8 @@
/* ------------------------------ */
.balign 64
.L_OP_MUL_DOUBLE: /* 0xad */
-/* File: vfp/OP_MUL_DOUBLE.S */
-/* File: vfp/fbinopWide.S */
+/* File: arm-vfp/OP_MUL_DOUBLE.S */
+/* File: arm-vfp/fbinopWide.S */
/*
* Generic 64-bit double-precision floating point binary operation.
* Provide an "instr" line that specifies an instruction that performs
@@ -5233,8 +5233,8 @@
/* ------------------------------ */
.balign 64
.L_OP_DIV_DOUBLE: /* 0xae */
-/* File: vfp/OP_DIV_DOUBLE.S */
-/* File: vfp/fbinopWide.S */
+/* File: arm-vfp/OP_DIV_DOUBLE.S */
+/* File: arm-vfp/fbinopWide.S */
/*
* Generic 64-bit double-precision floating point binary operation.
* Provide an "instr" line that specifies an instruction that performs
@@ -6155,8 +6155,8 @@
/* ------------------------------ */
.balign 64
.L_OP_ADD_FLOAT_2ADDR: /* 0xc6 */
-/* File: vfp/OP_ADD_FLOAT_2ADDR.S */
-/* File: vfp/fbinop2addr.S */
+/* File: arm-vfp/OP_ADD_FLOAT_2ADDR.S */
+/* File: arm-vfp/fbinop2addr.S */
/*
* Generic 32-bit floating point "/2addr" binary operation. Provide
* an "instr" line that specifies an instruction that performs
@@ -6183,8 +6183,8 @@
/* ------------------------------ */
.balign 64
.L_OP_SUB_FLOAT_2ADDR: /* 0xc7 */
-/* File: vfp/OP_SUB_FLOAT_2ADDR.S */
-/* File: vfp/fbinop2addr.S */
+/* File: arm-vfp/OP_SUB_FLOAT_2ADDR.S */
+/* File: arm-vfp/fbinop2addr.S */
/*
* Generic 32-bit floating point "/2addr" binary operation. Provide
* an "instr" line that specifies an instruction that performs
@@ -6211,8 +6211,8 @@
/* ------------------------------ */
.balign 64
.L_OP_MUL_FLOAT_2ADDR: /* 0xc8 */
-/* File: vfp/OP_MUL_FLOAT_2ADDR.S */
-/* File: vfp/fbinop2addr.S */
+/* File: arm-vfp/OP_MUL_FLOAT_2ADDR.S */
+/* File: arm-vfp/fbinop2addr.S */
/*
* Generic 32-bit floating point "/2addr" binary operation. Provide
* an "instr" line that specifies an instruction that performs
@@ -6239,8 +6239,8 @@
/* ------------------------------ */
.balign 64
.L_OP_DIV_FLOAT_2ADDR: /* 0xc9 */
-/* File: vfp/OP_DIV_FLOAT_2ADDR.S */
-/* File: vfp/fbinop2addr.S */
+/* File: arm-vfp/OP_DIV_FLOAT_2ADDR.S */
+/* File: arm-vfp/fbinop2addr.S */
/*
* Generic 32-bit floating point "/2addr" binary operation. Provide
* an "instr" line that specifies an instruction that performs
@@ -6308,8 +6308,8 @@
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
-/* File: vfp/OP_ADD_DOUBLE_2ADDR.S */
-/* File: vfp/fbinopWide2addr.S */
+/* File: arm-vfp/OP_ADD_DOUBLE_2ADDR.S */
+/* File: arm-vfp/fbinopWide2addr.S */
/*
* Generic 64-bit floating point "/2addr" binary operation. Provide
* an "instr" line that specifies an instruction that performs
@@ -6337,8 +6337,8 @@
/* ------------------------------ */
.balign 64
.L_OP_SUB_DOUBLE_2ADDR: /* 0xcc */
-/* File: vfp/OP_SUB_DOUBLE_2ADDR.S */
-/* File: vfp/fbinopWide2addr.S */
+/* File: arm-vfp/OP_SUB_DOUBLE_2ADDR.S */
+/* File: arm-vfp/fbinopWide2addr.S */
/*
* Generic 64-bit floating point "/2addr" binary operation. Provide
* an "instr" line that specifies an instruction that performs
@@ -6366,8 +6366,8 @@
/* ------------------------------ */
.balign 64
.L_OP_MUL_DOUBLE_2ADDR: /* 0xcd */
-/* File: vfp/OP_MUL_DOUBLE_2ADDR.S */
-/* File: vfp/fbinopWide2addr.S */
+/* File: arm-vfp/OP_MUL_DOUBLE_2ADDR.S */
+/* File: arm-vfp/fbinopWide2addr.S */
/*
* Generic 64-bit floating point "/2addr" binary operation. Provide
* an "instr" line that specifies an instruction that performs
@@ -6395,8 +6395,8 @@
/* ------------------------------ */
.balign 64
.L_OP_DIV_DOUBLE_2ADDR: /* 0xce */
-/* File: vfp/OP_DIV_DOUBLE_2ADDR.S */
-/* File: vfp/fbinopWide2addr.S */
+/* File: arm-vfp/OP_DIV_DOUBLE_2ADDR.S */
+/* File: arm-vfp/fbinopWide2addr.S */
/*
* Generic 64-bit floating point "/2addr" binary operation. Provide
* an "instr" line that specifies an instruction that performs
diff --git a/vm/mterp/vfp/OP_ADD_DOUBLE.S b/vm/mterp/vfp/OP_ADD_DOUBLE.S
deleted file mode 100644
index 4d4bd64..0000000
--- a/vm/mterp/vfp/OP_ADD_DOUBLE.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinopWide.S" {"instr":"faddd d2, d0, d1"}
diff --git a/vm/mterp/vfp/OP_ADD_DOUBLE_2ADDR.S b/vm/mterp/vfp/OP_ADD_DOUBLE_2ADDR.S
deleted file mode 100644
index 012f93a..0000000
--- a/vm/mterp/vfp/OP_ADD_DOUBLE_2ADDR.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinopWide2addr.S" {"instr":"faddd d2, d0, d1"}
diff --git a/vm/mterp/vfp/OP_ADD_FLOAT.S b/vm/mterp/vfp/OP_ADD_FLOAT.S
deleted file mode 100644
index c30ce00..0000000
--- a/vm/mterp/vfp/OP_ADD_FLOAT.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinop.S" {"instr":"fadds s2, s0, s1"}
diff --git a/vm/mterp/vfp/OP_ADD_FLOAT_2ADDR.S b/vm/mterp/vfp/OP_ADD_FLOAT_2ADDR.S
deleted file mode 100644
index e3f38bb..0000000
--- a/vm/mterp/vfp/OP_ADD_FLOAT_2ADDR.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinop2addr.S" {"instr":"fadds s2, s0, s1"}
diff --git a/vm/mterp/vfp/OP_DIV_DOUBLE.S b/vm/mterp/vfp/OP_DIV_DOUBLE.S
deleted file mode 100644
index 346afab..0000000
--- a/vm/mterp/vfp/OP_DIV_DOUBLE.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinopWide.S" {"instr":"fdivd d2, d0, d1"}
diff --git a/vm/mterp/vfp/OP_DIV_DOUBLE_2ADDR.S b/vm/mterp/vfp/OP_DIV_DOUBLE_2ADDR.S
deleted file mode 100644
index 5b21994..0000000
--- a/vm/mterp/vfp/OP_DIV_DOUBLE_2ADDR.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinopWide2addr.S" {"instr":"fdivd d2, d0, d1"}
diff --git a/vm/mterp/vfp/OP_DIV_FLOAT.S b/vm/mterp/vfp/OP_DIV_FLOAT.S
deleted file mode 100644
index e8b6e16..0000000
--- a/vm/mterp/vfp/OP_DIV_FLOAT.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinop.S" {"instr":"fdivs s2, s0, s1"}
diff --git a/vm/mterp/vfp/OP_DIV_FLOAT_2ADDR.S b/vm/mterp/vfp/OP_DIV_FLOAT_2ADDR.S
deleted file mode 100644
index edc611c..0000000
--- a/vm/mterp/vfp/OP_DIV_FLOAT_2ADDR.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinop2addr.S" {"instr":"fdivs s2, s0, s1"}
diff --git a/vm/mterp/vfp/OP_DOUBLE_TO_FLOAT.S b/vm/mterp/vfp/OP_DOUBLE_TO_FLOAT.S
deleted file mode 100644
index 7987183..0000000
--- a/vm/mterp/vfp/OP_DOUBLE_TO_FLOAT.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/funopNarrower.S" {"instr":"fcvtsd s0, d0"}
diff --git a/vm/mterp/vfp/OP_DOUBLE_TO_INT.S b/vm/mterp/vfp/OP_DOUBLE_TO_INT.S
deleted file mode 100644
index 8887858..0000000
--- a/vm/mterp/vfp/OP_DOUBLE_TO_INT.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/funopNarrower.S" {"instr":"ftosizd s0, d0"}
diff --git a/vm/mterp/vfp/OP_FLOAT_TO_DOUBLE.S b/vm/mterp/vfp/OP_FLOAT_TO_DOUBLE.S
deleted file mode 100644
index 79f7eac..0000000
--- a/vm/mterp/vfp/OP_FLOAT_TO_DOUBLE.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/funopWider.S" {"instr":"fcvtds d0, s0"}
diff --git a/vm/mterp/vfp/OP_FLOAT_TO_INT.S b/vm/mterp/vfp/OP_FLOAT_TO_INT.S
deleted file mode 100644
index ef397d9..0000000
--- a/vm/mterp/vfp/OP_FLOAT_TO_INT.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/funop.S" {"instr":"ftosizs s1, s0"}
diff --git a/vm/mterp/vfp/OP_INT_TO_DOUBLE.S b/vm/mterp/vfp/OP_INT_TO_DOUBLE.S
deleted file mode 100644
index 02f278a..0000000
--- a/vm/mterp/vfp/OP_INT_TO_DOUBLE.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/funopWider.S" {"instr":"fsitod d0, s0"}
diff --git a/vm/mterp/vfp/OP_INT_TO_FLOAT.S b/vm/mterp/vfp/OP_INT_TO_FLOAT.S
deleted file mode 100644
index ec8e08e..0000000
--- a/vm/mterp/vfp/OP_INT_TO_FLOAT.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/funop.S" {"instr":"fsitos s1, s0"}
diff --git a/vm/mterp/vfp/OP_MUL_DOUBLE.S b/vm/mterp/vfp/OP_MUL_DOUBLE.S
deleted file mode 100644
index 4257684..0000000
--- a/vm/mterp/vfp/OP_MUL_DOUBLE.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinopWide.S" {"instr":"fmuld d2, d0, d1"}
diff --git a/vm/mterp/vfp/OP_MUL_DOUBLE_2ADDR.S b/vm/mterp/vfp/OP_MUL_DOUBLE_2ADDR.S
deleted file mode 100644
index ddcc328..0000000
--- a/vm/mterp/vfp/OP_MUL_DOUBLE_2ADDR.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinopWide2addr.S" {"instr":"fmuld d2, d0, d1"}
diff --git a/vm/mterp/vfp/OP_MUL_FLOAT.S b/vm/mterp/vfp/OP_MUL_FLOAT.S
deleted file mode 100644
index 5de44c5..0000000
--- a/vm/mterp/vfp/OP_MUL_FLOAT.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinop.S" {"instr":"fmuls s2, s0, s1"}
diff --git a/vm/mterp/vfp/OP_MUL_FLOAT_2ADDR.S b/vm/mterp/vfp/OP_MUL_FLOAT_2ADDR.S
deleted file mode 100644
index ea925f3..0000000
--- a/vm/mterp/vfp/OP_MUL_FLOAT_2ADDR.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinop2addr.S" {"instr":"fmuls s2, s0, s1"}
diff --git a/vm/mterp/vfp/OP_SUB_DOUBLE.S b/vm/mterp/vfp/OP_SUB_DOUBLE.S
deleted file mode 100644
index 5ec55a0..0000000
--- a/vm/mterp/vfp/OP_SUB_DOUBLE.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinopWide.S" {"instr":"fsubd d2, d0, d1"}
diff --git a/vm/mterp/vfp/OP_SUB_DOUBLE_2ADDR.S b/vm/mterp/vfp/OP_SUB_DOUBLE_2ADDR.S
deleted file mode 100644
index 13d47d9..0000000
--- a/vm/mterp/vfp/OP_SUB_DOUBLE_2ADDR.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinopWide2addr.S" {"instr":"fsubd d2, d0, d1"}
diff --git a/vm/mterp/vfp/OP_SUB_FLOAT.S b/vm/mterp/vfp/OP_SUB_FLOAT.S
deleted file mode 100644
index 7967132..0000000
--- a/vm/mterp/vfp/OP_SUB_FLOAT.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinop.S" {"instr":"fsubs s2, s0, s1"}
diff --git a/vm/mterp/vfp/OP_SUB_FLOAT_2ADDR.S b/vm/mterp/vfp/OP_SUB_FLOAT_2ADDR.S
deleted file mode 100644
index 1fed95b..0000000
--- a/vm/mterp/vfp/OP_SUB_FLOAT_2ADDR.S
+++ /dev/null
@@ -1,2 +0,0 @@
-%verify "executed"
-%include "vfp/fbinop2addr.S" {"instr":"fsubs s2, s0, s1"}