ARM: Merging constants in simulator and assembler header files and other clea...

src/arm/lithium-codegen-arm.cc

Index: src/arm/lithium-codegen-arm.cc
===================================================================
--- src/arm/lithium-codegen-arm.cc	(revision 6430)
+++ src/arm/lithium-codegen-arm.cc	(working copy)
@@ -1482,7 +1482,7 @@
   if (r.IsInteger32()) {
     Register reg = ToRegister(instr->input());
     __ cmp(reg, Operand(0));
-    EmitBranch(true_block, false_block, nz);
+    EmitBranch(true_block, false_block, ne);
   } else if (r.IsDouble()) {
     DoubleRegister reg = ToDoubleRegister(instr->input());
     Register scratch = scratch0();
@@ -1540,7 +1540,7 @@
       __ CallStub(&stub);
       __ cmp(reg, Operand(0));
       __ ldm(ia_w, sp, saved_regs);
-      EmitBranch(true_block, false_block, nz);
+      EmitBranch(true_block, false_block, ne);
     }
   }
 }