| Index: runtime/lib/integers.cc
|
| diff --git a/runtime/lib/integers.cc b/runtime/lib/integers.cc
|
| index efb12af1345e82c1def25ae7086fb8bb5ebfc336..36241789153360801feaaf5db8a11c36d2238eb9 100644
|
| --- a/runtime/lib/integers.cc
|
| +++ b/runtime/lib/integers.cc
|
| @@ -16,8 +16,10 @@
|
|
|
| namespace dart {
|
|
|
| -DEFINE_FLAG(bool, trace_intrinsified_natives, false,
|
| - "Report if any of the intrinsified natives are called");
|
| +DEFINE_FLAG(bool,
|
| + trace_intrinsified_natives,
|
| + false,
|
| + "Report if any of the intrinsified natives are called");
|
|
|
| // Smi natives.
|
|
|
| @@ -42,8 +44,8 @@ DEFINE_NATIVE_ENTRY(Integer_bitAndFromInteger, 2) {
|
| ASSERT(CheckInteger(right));
|
| ASSERT(CheckInteger(left));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Integer_bitAndFromInteger %s & %s\n",
|
| - right.ToCString(), left.ToCString());
|
| + OS::Print("Integer_bitAndFromInteger %s & %s\n", right.ToCString(),
|
| + left.ToCString());
|
| }
|
| const Integer& result = Integer::Handle(left.BitOp(Token::kBIT_AND, right));
|
| // A null result indicates that a bigint operation is required.
|
| @@ -57,8 +59,8 @@ DEFINE_NATIVE_ENTRY(Integer_bitOrFromInteger, 2) {
|
| ASSERT(CheckInteger(right));
|
| ASSERT(CheckInteger(left));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Integer_bitOrFromInteger %s | %s\n",
|
| - left.ToCString(), right.ToCString());
|
| + OS::Print("Integer_bitOrFromInteger %s | %s\n", left.ToCString(),
|
| + right.ToCString());
|
| }
|
| const Integer& result = Integer::Handle(left.BitOp(Token::kBIT_OR, right));
|
| // A null result indicates that a bigint operation is required.
|
| @@ -72,8 +74,8 @@ DEFINE_NATIVE_ENTRY(Integer_bitXorFromInteger, 2) {
|
| ASSERT(CheckInteger(right));
|
| ASSERT(CheckInteger(left));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Integer_bitXorFromInteger %s ^ %s\n",
|
| - left.ToCString(), right.ToCString());
|
| + OS::Print("Integer_bitXorFromInteger %s ^ %s\n", left.ToCString(),
|
| + right.ToCString());
|
| }
|
| const Integer& result = Integer::Handle(left.BitOp(Token::kBIT_XOR, right));
|
| // A null result indicates that a bigint operation is required.
|
| @@ -87,8 +89,8 @@ DEFINE_NATIVE_ENTRY(Integer_addFromInteger, 2) {
|
| ASSERT(CheckInteger(right_int));
|
| ASSERT(CheckInteger(left_int));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Integer_addFromInteger %s + %s\n",
|
| - left_int.ToCString(), right_int.ToCString());
|
| + OS::Print("Integer_addFromInteger %s + %s\n", left_int.ToCString(),
|
| + right_int.ToCString());
|
| }
|
| const Integer& result =
|
| Integer::Handle(left_int.ArithmeticOp(Token::kADD, right_int));
|
| @@ -103,8 +105,8 @@ DEFINE_NATIVE_ENTRY(Integer_subFromInteger, 2) {
|
| ASSERT(CheckInteger(right_int));
|
| ASSERT(CheckInteger(left_int));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Integer_subFromInteger %s - %s\n",
|
| - left_int.ToCString(), right_int.ToCString());
|
| + OS::Print("Integer_subFromInteger %s - %s\n", left_int.ToCString(),
|
| + right_int.ToCString());
|
| }
|
| const Integer& result =
|
| Integer::Handle(left_int.ArithmeticOp(Token::kSUB, right_int));
|
| @@ -119,8 +121,8 @@ DEFINE_NATIVE_ENTRY(Integer_mulFromInteger, 2) {
|
| ASSERT(CheckInteger(right_int));
|
| ASSERT(CheckInteger(left_int));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Integer_mulFromInteger %s * %s\n",
|
| - left_int.ToCString(), right_int.ToCString());
|
| + OS::Print("Integer_mulFromInteger %s * %s\n", left_int.ToCString(),
|
| + right_int.ToCString());
|
| }
|
| const Integer& result =
|
| Integer::Handle(left_int.ArithmeticOp(Token::kMUL, right_int));
|
| @@ -148,8 +150,8 @@ DEFINE_NATIVE_ENTRY(Integer_moduloFromInteger, 2) {
|
| ASSERT(CheckInteger(right_int));
|
| ASSERT(CheckInteger(left_int));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Integer_moduloFromInteger %s mod %s\n",
|
| - left_int.ToCString(), right_int.ToCString());
|
| + OS::Print("Integer_moduloFromInteger %s mod %s\n", left_int.ToCString(),
|
| + right_int.ToCString());
|
| }
|
| if (right_int.IsZero()) {
|
| // Should have been caught before calling into runtime.
|
| @@ -168,8 +170,8 @@ DEFINE_NATIVE_ENTRY(Integer_greaterThanFromInteger, 2) {
|
| ASSERT(CheckInteger(right));
|
| ASSERT(CheckInteger(left));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Integer_greaterThanFromInteger %s > %s\n",
|
| - left.ToCString(), right.ToCString());
|
| + OS::Print("Integer_greaterThanFromInteger %s > %s\n", left.ToCString(),
|
| + right.ToCString());
|
| }
|
| return Bool::Get(left.CompareWith(right) == 1).raw();
|
| }
|
| @@ -181,8 +183,8 @@ DEFINE_NATIVE_ENTRY(Integer_equalToInteger, 2) {
|
| ASSERT(CheckInteger(left));
|
| ASSERT(CheckInteger(right));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Integer_equalToInteger %s == %s\n",
|
| - left.ToCString(), right.ToCString());
|
| + OS::Print("Integer_equalToInteger %s == %s\n", left.ToCString(),
|
| + right.ToCString());
|
| }
|
| return Bool::Get(left.CompareWith(right) == 0).raw();
|
| }
|
| @@ -289,8 +291,8 @@ DEFINE_NATIVE_ENTRY(Smi_bitAndFromSmi, 2) {
|
| const Smi& left = Smi::CheckedHandle(arguments->NativeArgAt(0));
|
| GET_NON_NULL_NATIVE_ARGUMENT(Smi, right, arguments->NativeArgAt(1));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Smi_bitAndFromSmi %s & %s\n",
|
| - left.ToCString(), right.ToCString());
|
| + OS::Print("Smi_bitAndFromSmi %s & %s\n", left.ToCString(),
|
| + right.ToCString());
|
| }
|
| const Smi& left_value = Smi::Cast(left);
|
| const Smi& right_value = Smi::Cast(right);
|
| @@ -303,25 +305,24 @@ DEFINE_NATIVE_ENTRY(Smi_shrFromInt, 2) {
|
| GET_NON_NULL_NATIVE_ARGUMENT(Integer, value, arguments->NativeArgAt(1));
|
| ASSERT(CheckInteger(amount));
|
| ASSERT(CheckInteger(value));
|
| - const Integer& result = Integer::Handle(
|
| - ShiftOperationHelper(Token::kSHR, value, amount));
|
| + const Integer& result =
|
| + Integer::Handle(ShiftOperationHelper(Token::kSHR, value, amount));
|
| // A null result indicates that a bigint operation is required.
|
| return result.IsNull() ? result.raw() : result.AsValidInteger();
|
| }
|
|
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(Smi_shlFromInt, 2) {
|
| const Smi& amount = Smi::CheckedHandle(arguments->NativeArgAt(0));
|
| GET_NON_NULL_NATIVE_ARGUMENT(Integer, value, arguments->NativeArgAt(1));
|
| ASSERT(CheckInteger(amount));
|
| ASSERT(CheckInteger(value));
|
| if (FLAG_trace_intrinsified_natives) {
|
| - OS::Print("Smi_shlFromInt: %s << %s\n",
|
| - value.ToCString(), amount.ToCString());
|
| + OS::Print("Smi_shlFromInt: %s << %s\n", value.ToCString(),
|
| + amount.ToCString());
|
| }
|
| - const Integer& result = Integer::Handle(
|
| - ShiftOperationHelper(Token::kSHL, value, amount));
|
| + const Integer& result =
|
| + Integer::Handle(ShiftOperationHelper(Token::kSHL, value, amount));
|
| // A null result indicates that a bigint operation is required.
|
| return result.IsNull() ? result.raw() : result.AsValidInteger();
|
| }
|
|
|