Merge 6800:7180 from the bleeding edge branch to the experimental/gc branch.

src/arm/constants-arm.h

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 367 matching lines @@
   kDoublePrecision = 1
 };
 
 
 // VFP FPSCR constants.
 enum VFPConversionMode {
   kFPSCRRounding = 0,
   kDefaultRoundToZero = 1
 };
 
+// This mask does not include the "inexact" or "input denormal" cumulative
+// exceptions flags, because we usually don't want to check for it.
 static const uint32_t kVFPExceptionMask = 0xf;
+static const uint32_t kVFPInvalidOpExceptionBit = 1 << 0;
+static const uint32_t kVFPOverflowExceptionBit = 1 << 2;
+static const uint32_t kVFPUnderflowExceptionBit = 1 << 3;
+static const uint32_t kVFPInexactExceptionBit = 1 << 4;
 static const uint32_t kVFPFlushToZeroMask = 1 << 24;
-static const uint32_t kVFPInvalidExceptionBit = 1;
 
 static const uint32_t kVFPNConditionFlagBit = 1 << 31;
 static const uint32_t kVFPZConditionFlagBit = 1 << 30;
 static const uint32_t kVFPCConditionFlagBit = 1 << 29;
 static const uint32_t kVFPVConditionFlagBit = 1 << 28;
 
 
 // VFP rounding modes. See ARM DDI 0406B Page A2-29.
 enum VFPRoundingMode {
   RN = 0 << 22,   // Round to Nearest.
   RP = 1 << 22,   // Round towards Plus Infinity.
   RM = 2 << 22,   // Round towards Minus Infinity.
   RZ = 3 << 22,   // Round towards zero.
 
   // Aliases.
   kRoundToNearest = RN,
   kRoundToPlusInf = RP,
   kRoundToMinusInf = RM,
   kRoundToZero = RZ
 };
 
 static const uint32_t kVFPRoundingModeMask = 3 << 22;
 
+enum CheckForInexactConversion {
+  kCheckForInexactConversion,
+  kDontCheckForInexactConversion
+};
+
 // -----------------------------------------------------------------------------
 // Hints.
 
 // Branch hints are not used on the ARM.  They are defined so that they can
 // appear in shared function signatures, but will be ignored in ARM
 // implementations.
 enum Hint { no_hint };
 
 // Hints are not used on the arm.  Negating is trivial.
 inline Hint NegateHint(Hint ignored) { return no_hint; }
@@ skipping 328 matching lines @@
   static int Number(const char* name, bool* is_double);
 
  private:
   static const char* names_[kNumVFPRegisters];
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_ARM_CONSTANTS_ARM_H_