commit 6958e9edbf0cbc04c7c2aab7ccd63516b794a92d
author Ben Cheng <bccheng@android.com> Tue Jan 25 10:58:02 2011 -0800
committer Ben Cheng <bccheng@android.com> Tue Jan 25 10:58:02 2011 -0800
tree 90b98633c126e237128fa091efdf12a74faa1b44
parent 0b7926b9becc0f849ded05a33bb192113f6839af

Fix armv5te-vfp build.

c++ dislikes variables named template.

Change-Id: I6aaf623b449bfdb0c88b9664c55824268992058d

vm/compiler/codegen/arm/FP/ThumbVFP.c

diff --git a/vm/compiler/codegen/arm/FP/ThumbVFP.c b/vm/compiler/codegen/arm/FP/ThumbVFP.c
index 18cc38f..bec54ca 100644
--- a/vm/compiler/codegen/arm/FP/ThumbVFP.c
+++ b/vm/compiler/codegen/arm/FP/ThumbVFP.c
@@ -158,37 +158,37 @@
     bool longDest = false;
     RegLocation rlSrc;
     RegLocation rlDest;
-    TemplateOpcode template;
+    TemplateOpcode templateOpcode;
     switch (opcode) {
         case OP_INT_TO_FLOAT:
             longSrc = false;
             longDest = false;
-            template = TEMPLATE_INT_TO_FLOAT_VFP;
+            templateOpcode = TEMPLATE_INT_TO_FLOAT_VFP;
             break;
         case OP_FLOAT_TO_INT:
             longSrc = false;
             longDest = false;
-            template = TEMPLATE_FLOAT_TO_INT_VFP;
+            templateOpcode = TEMPLATE_FLOAT_TO_INT_VFP;
             break;
         case OP_DOUBLE_TO_FLOAT:
             longSrc = true;
             longDest = false;
-            template = TEMPLATE_DOUBLE_TO_FLOAT_VFP;
+            templateOpcode = TEMPLATE_DOUBLE_TO_FLOAT_VFP;
             break;
         case OP_FLOAT_TO_DOUBLE:
             longSrc = false;
             longDest = true;
-            template = TEMPLATE_FLOAT_TO_DOUBLE_VFP;
+            templateOpcode = TEMPLATE_FLOAT_TO_DOUBLE_VFP;
             break;
         case OP_INT_TO_DOUBLE:
             longSrc = false;
             longDest = true;
-            template = TEMPLATE_INT_TO_DOUBLE_VFP;
+            templateOpcode = TEMPLATE_INT_TO_DOUBLE_VFP;
             break;
         case OP_DOUBLE_TO_INT:
             longSrc = true;
             longDest = false;
-            template = TEMPLATE_DOUBLE_TO_INT_VFP;
+            templateOpcode = TEMPLATE_DOUBLE_TO_INT_VFP;
             break;
         case OP_LONG_TO_DOUBLE:
         case OP_FLOAT_TO_LONG:
@@ -212,7 +212,7 @@
     }
     loadValueAddressDirect(cUnit, rlDest, r0);
     loadValueAddressDirect(cUnit, rlSrc, r1);
-    genDispatchToHandler(cUnit, template);
+    genDispatchToHandler(cUnit, templateOpcode);
     if (rlDest.wide) {
         rlDest = dvmCompilerUpdateLocWide(cUnit, rlDest);
         dvmCompilerClobber(cUnit, rlDest.highReg);
@@ -226,31 +226,31 @@
 static bool genCmpFP(CompilationUnit *cUnit, MIR *mir, RegLocation rlDest,
                      RegLocation rlSrc1, RegLocation rlSrc2)
 {
-    TemplateOpcode template;
+    TemplateOpcode templateOpcode;
     RegLocation rlResult = dvmCompilerGetReturn(cUnit);
     bool wide = true;
 
     switch(mir->dalvikInsn.opcode) {
         case OP_CMPL_FLOAT:
-            template = TEMPLATE_CMPL_FLOAT_VFP;
+            templateOpcode = TEMPLATE_CMPL_FLOAT_VFP;
             wide = false;
             break;
         case OP_CMPG_FLOAT:
-            template = TEMPLATE_CMPG_FLOAT_VFP;
+            templateOpcode = TEMPLATE_CMPG_FLOAT_VFP;
             wide = false;
             break;
         case OP_CMPL_DOUBLE:
-            template = TEMPLATE_CMPL_DOUBLE_VFP;
+            templateOpcode = TEMPLATE_CMPL_DOUBLE_VFP;
             break;
         case OP_CMPG_DOUBLE:
-            template = TEMPLATE_CMPG_DOUBLE_VFP;
+            templateOpcode = TEMPLATE_CMPG_DOUBLE_VFP;
             break;
         default:
             return true;
     }
     loadValueAddressDirect(cUnit, rlSrc1, r0);
     loadValueAddressDirect(cUnit, rlSrc2, r1);
-    genDispatchToHandler(cUnit, template);
+    genDispatchToHandler(cUnit, templateOpcode);
     storeValue(cUnit, rlDest, rlResult);
     return false;
 }