Fix carry out calculation in ARM simulator.

runtime/vm/simulator_arm.h

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // Declares a Simulator for ARM instructions if we are not generating a native
 // ARM binary. This Simulator allows us to run and debug ARM code generation on
 // regular desktop machines.
 // Dart calls into generated code by "calling" the InvokeDartCode stub,
 // which will start execution in the Simulator or forwards to the real entry
 // on a ARM HW platform.
@@ skipping 161 matching lines @@
   void Format(Instr* instr, const char* format);
 
   // Checks if the current instruction should be executed based on its
   // condition bits.
   bool ConditionallyExecute(Instr* instr);
 
   // Helper functions to set the conditional flags in the architecture state.
   void SetNZFlags(int32_t val);
   void SetCFlag(bool val);
   void SetVFlag(bool val);
-  bool CarryFrom(int32_t left, int32_t right);
-  bool BorrowFrom(int32_t left, int32_t right);
-  bool OverflowFrom(int32_t alu_out,
-                    int32_t left,
-                    int32_t right,
-                    bool addition);
+  bool CarryFrom(int32_t left, int32_t right, int32_t carry);
+  bool OverflowFrom(int32_t left, int32_t right, int32_t carry);
 
   // Helper functions to decode common "addressing" modes.
   int32_t GetShiftRm(Instr* instr, bool* carry_out);
   int32_t GetImm(Instr* instr, bool* carry_out);
   void HandleRList(Instr* instr, bool load);
   void SupervisorCall(Instr* instr);
 
   // Read and write memory.
   void UnalignedAccess(const char* msg, uword addr, Instr* instr);
 
@@ skipping 68 matching lines @@
   }
 
   friend class SimulatorDebugger;
   friend class SimulatorSetjmpBuffer;
   DISALLOW_COPY_AND_ASSIGN(Simulator);
 };
 
 }  // namespace dart
 
 #endif  // VM_SIMULATOR_ARM_H_