From 34bd773eb6e28b3c3ee2cccac3f16d1f7b86df55 Mon Sep 17 00:00:00 2001 From: bbudge Date: Tue, 4 Aug 2015 07:36:53 -0700 Subject: [PATCH] Rename IsSimdObject assembly intrinsic. Change IS_SIMD_OBJECT to IS_SIMD_VALUE, and IsSimdObject to IsSimdValue. R=rossberg LOG=N BUG=v8:4124 Review URL: https://codereview.chromium.org/1253103006 Cr-Commit-Position: refs/heads/master@{#30004} --- src/full-codegen/arm/full-codegen-arm.cc | 2 +- src/full-codegen/arm64/full-codegen-arm64.cc | 2 +- src/full-codegen/full-codegen.h | 2 +- src/full-codegen/ia32/full-codegen-ia32.cc | 2 +- src/full-codegen/mips/full-codegen-mips.cc | 2 +- src/full-codegen/mips64/full-codegen-mips64.cc | 2 +- src/full-codegen/ppc/full-codegen-ppc.cc | 2 +- src/full-codegen/x64/full-codegen-x64.cc | 2 +- src/full-codegen/x87/full-codegen-x87.cc | 2 +- src/macros.py | 2 +- src/messages.js | 2 +- src/runtime.js | 20 ++++++++++---------- src/runtime/runtime-simd.cc | 2 +- src/runtime/runtime.h | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/full-codegen/arm/full-codegen-arm.cc b/src/full-codegen/arm/full-codegen-arm.cc index e0bd5e9..4d9e794 100644 --- a/src/full-codegen/arm/full-codegen-arm.cc +++ b/src/full-codegen/arm/full-codegen-arm.cc @@ -3431,7 +3431,7 @@ void FullCodeGenerator::EmitIsSpecObject(CallRuntime* expr) { } -void FullCodeGenerator::EmitIsSimdObject(CallRuntime* expr) { +void FullCodeGenerator::EmitIsSimdValue(CallRuntime* expr) { ZoneList* args = expr->arguments(); DCHECK(args->length() == 1); diff --git a/src/full-codegen/arm64/full-codegen-arm64.cc b/src/full-codegen/arm64/full-codegen-arm64.cc index c8ef7d6..655790a 100644 --- a/src/full-codegen/arm64/full-codegen-arm64.cc +++ b/src/full-codegen/arm64/full-codegen-arm64.cc @@ -3121,7 +3121,7 @@ void FullCodeGenerator::EmitIsSpecObject(CallRuntime* expr) { } -void FullCodeGenerator::EmitIsSimdObject(CallRuntime* expr) { +void FullCodeGenerator::EmitIsSimdValue(CallRuntime* expr) { ZoneList* args = expr->arguments(); DCHECK(args->length() == 1); diff --git a/src/full-codegen/full-codegen.h b/src/full-codegen/full-codegen.h index 5d53019..6761bda 100644 --- a/src/full-codegen/full-codegen.h +++ b/src/full-codegen/full-codegen.h @@ -513,7 +513,7 @@ class FullCodeGenerator: public AstVisitor { F(IsFunction) \ F(IsUndetectableObject) \ F(IsSpecObject) \ - F(IsSimdObject) \ + F(IsSimdValue) \ F(IsStringWrapperSafeForDefaultValueOf) \ F(MathPow) \ F(IsMinusZero) \ diff --git a/src/full-codegen/ia32/full-codegen-ia32.cc b/src/full-codegen/ia32/full-codegen-ia32.cc index 749e83e..80fb965 100644 --- a/src/full-codegen/ia32/full-codegen-ia32.cc +++ b/src/full-codegen/ia32/full-codegen-ia32.cc @@ -3322,7 +3322,7 @@ void FullCodeGenerator::EmitIsSpecObject(CallRuntime* expr) { } -void FullCodeGenerator::EmitIsSimdObject(CallRuntime* expr) { +void FullCodeGenerator::EmitIsSimdValue(CallRuntime* expr) { ZoneList* args = expr->arguments(); DCHECK(args->length() == 1); diff --git a/src/full-codegen/mips/full-codegen-mips.cc b/src/full-codegen/mips/full-codegen-mips.cc index 4fa18d5..977a71d 100644 --- a/src/full-codegen/mips/full-codegen-mips.cc +++ b/src/full-codegen/mips/full-codegen-mips.cc @@ -3421,7 +3421,7 @@ void FullCodeGenerator::EmitIsSpecObject(CallRuntime* expr) { } -void FullCodeGenerator::EmitIsSimdObject(CallRuntime* expr) { +void FullCodeGenerator::EmitIsSimdValue(CallRuntime* expr) { ZoneList* args = expr->arguments(); DCHECK(args->length() == 1); diff --git a/src/full-codegen/mips64/full-codegen-mips64.cc b/src/full-codegen/mips64/full-codegen-mips64.cc index 6c43654..6014347 100644 --- a/src/full-codegen/mips64/full-codegen-mips64.cc +++ b/src/full-codegen/mips64/full-codegen-mips64.cc @@ -3422,7 +3422,7 @@ void FullCodeGenerator::EmitIsSpecObject(CallRuntime* expr) { } -void FullCodeGenerator::EmitIsSimdObject(CallRuntime* expr) { +void FullCodeGenerator::EmitIsSimdValue(CallRuntime* expr) { ZoneList* args = expr->arguments(); DCHECK(args->length() == 1); diff --git a/src/full-codegen/ppc/full-codegen-ppc.cc b/src/full-codegen/ppc/full-codegen-ppc.cc index 35cb051..6ddf6c6 100644 --- a/src/full-codegen/ppc/full-codegen-ppc.cc +++ b/src/full-codegen/ppc/full-codegen-ppc.cc @@ -3423,7 +3423,7 @@ void FullCodeGenerator::EmitIsSpecObject(CallRuntime* expr) { } -void FullCodeGenerator::EmitIsSimdObject(CallRuntime* expr) { +void FullCodeGenerator::EmitIsSimdValue(CallRuntime* expr) { ZoneList* args = expr->arguments(); DCHECK(args->length() == 1); diff --git a/src/full-codegen/x64/full-codegen-x64.cc b/src/full-codegen/x64/full-codegen-x64.cc index 34d614a..1eae31d 100644 --- a/src/full-codegen/x64/full-codegen-x64.cc +++ b/src/full-codegen/x64/full-codegen-x64.cc @@ -3315,7 +3315,7 @@ void FullCodeGenerator::EmitIsSpecObject(CallRuntime* expr) { } -void FullCodeGenerator::EmitIsSimdObject(CallRuntime* expr) { +void FullCodeGenerator::EmitIsSimdValue(CallRuntime* expr) { ZoneList* args = expr->arguments(); DCHECK(args->length() == 1); diff --git a/src/full-codegen/x87/full-codegen-x87.cc b/src/full-codegen/x87/full-codegen-x87.cc index 177914c..12d24c0 100644 --- a/src/full-codegen/x87/full-codegen-x87.cc +++ b/src/full-codegen/x87/full-codegen-x87.cc @@ -3313,7 +3313,7 @@ void FullCodeGenerator::EmitIsSpecObject(CallRuntime* expr) { } -void FullCodeGenerator::EmitIsSimdObject(CallRuntime* expr) { +void FullCodeGenerator::EmitIsSimdValue(CallRuntime* expr) { ZoneList* args = expr->arguments(); DCHECK(args->length() == 1); diff --git a/src/macros.py b/src/macros.py index 757d59f..97a1fa8 100644 --- a/src/macros.py +++ b/src/macros.py @@ -98,7 +98,7 @@ macro IS_ARRAY(arg) = (%_IsArray(arg)); macro IS_DATE(arg) = (%_IsDate(arg)); macro IS_FUNCTION(arg) = (%_IsFunction(arg)); macro IS_REGEXP(arg) = (%_IsRegExp(arg)); -macro IS_SIMD_OBJECT(arg) = (%_IsSimdObject(arg)); +macro IS_SIMD_VALUE(arg) = (%_IsSimdValue(arg)); macro IS_SET(arg) = (%_ClassOf(arg) === 'Set'); macro IS_MAP(arg) = (%_ClassOf(arg) === 'Map'); macro IS_WEAKMAP(arg) = (%_ClassOf(arg) === 'WeakMap'); diff --git a/src/messages.js b/src/messages.js index 2101f79..29fa978 100644 --- a/src/messages.js +++ b/src/messages.js @@ -86,7 +86,7 @@ function NoSideEffectToString(obj) { return str; } if (IS_SYMBOL(obj)) return %_CallFunction(obj, $symbolToString); - if (IS_SIMD_OBJECT(obj)) { + if (IS_SIMD_VALUE(obj)) { switch (typeof(obj)) { case 'float32x4': return %_CallFunction(obj, $float32x4ToString); case 'int32x4': return %_CallFunction(obj, $int32x4ToString); diff --git a/src/runtime.js b/src/runtime.js index b4bec8a..5e37e26 100644 --- a/src/runtime.js +++ b/src/runtime.js @@ -102,7 +102,7 @@ EQUALS = function EQUALS(y) { if (IS_NUMBER(y)) return %NumberEquals(x, y); if (IS_NULL_OR_UNDEFINED(y)) return 1; // not equal if (!IS_SPEC_OBJECT(y)) { - if (IS_SYMBOL(y) || IS_SIMD_OBJECT(y)) return 1; // not equal + if (IS_SYMBOL(y) || IS_SIMD_VALUE(y)) return 1; // not equal // String or boolean. return %NumberEquals(x, %$toNumber(y)); } @@ -114,7 +114,7 @@ EQUALS = function EQUALS(y) { if (IS_NUMBER(y)) return %NumberEquals(%$toNumber(x), y); if (IS_BOOLEAN(y)) return %NumberEquals(%$toNumber(x), %$toNumber(y)); if (IS_NULL_OR_UNDEFINED(y)) return 1; // not equal - if (IS_SYMBOL(y) || IS_SIMD_OBJECT(y)) return 1; // not equal + if (IS_SYMBOL(y) || IS_SIMD_VALUE(y)) return 1; // not equal y = %$toPrimitive(y, NO_HINT); } } else if (IS_SYMBOL(x)) { @@ -125,13 +125,13 @@ EQUALS = function EQUALS(y) { if (IS_NULL_OR_UNDEFINED(y)) return 1; if (IS_NUMBER(y)) return %NumberEquals(%$toNumber(x), y); if (IS_STRING(y)) return %NumberEquals(%$toNumber(x), %$toNumber(y)); - if (IS_SYMBOL(y) || IS_SIMD_OBJECT(y)) return 1; // not equal + if (IS_SYMBOL(y) || IS_SIMD_VALUE(y)) return 1; // not equal // y is object. x = %$toNumber(x); y = %$toPrimitive(y, NO_HINT); } else if (IS_NULL_OR_UNDEFINED(x)) { return IS_NULL_OR_UNDEFINED(y) ? 0 : 1; - } else if (IS_SIMD_OBJECT(x)) { + } else if (IS_SIMD_VALUE(x)) { return %SimdEquals(x, y); } else { // x is an object. @@ -139,7 +139,7 @@ EQUALS = function EQUALS(y) { if (IS_NULL_OR_UNDEFINED(y)) return 1; // not equal if (IS_BOOLEAN(y)) { y = %$toNumber(y); - } else if (IS_SYMBOL(y) || IS_SIMD_OBJECT(y)) { + } else if (IS_SYMBOL(y) || IS_SIMD_VALUE(y)) { return 1; // not equal } x = %$toPrimitive(x, NO_HINT); @@ -159,7 +159,7 @@ STRICT_EQUALS = function STRICT_EQUALS(x) { return %NumberEquals(this, x); } - if (IS_SIMD_OBJECT(this)) return %SimdEquals(this, x); + if (IS_SIMD_VALUE(this)) return %SimdEquals(this, x); // If anything else gets here, we just do simple identity check. // Objects (including functions), null, undefined and booleans were @@ -756,7 +756,7 @@ function ToPrimitive(x, hint) { if (IS_STRING(x)) return x; // Normal behavior. if (!IS_SPEC_OBJECT(x)) return x; - if (IS_SIMD_OBJECT(x)) return x; + if (IS_SIMD_VALUE(x)) return x; if (hint == NO_HINT) hint = (IS_DATE(x)) ? STRING_HINT : NUMBER_HINT; return (hint == NUMBER_HINT) ? DefaultNumber(x) : DefaultString(x); } @@ -862,7 +862,7 @@ function SameValue(x, y) { return false; } } - if (IS_SIMD_OBJECT(x)) return %SimdSameValue(x, y); + if (IS_SIMD_VALUE(x)) return %SimdSameValue(x, y); return x === y; } @@ -873,7 +873,7 @@ function SameValueZero(x, y) { if (IS_NUMBER(x)) { if (NUMBER_IS_NAN(x) && NUMBER_IS_NAN(y)) return true; } - if (IS_SIMD_OBJECT(x)) return %SimdSameValueZero(x, y); + if (IS_SIMD_VALUE(x)) return %SimdSameValueZero(x, y); return x === y; } @@ -917,7 +917,7 @@ function DefaultNumber(x) { if (IS_SPEC_FUNCTION(valueOf)) { var v = %_CallFunction(x, valueOf); if (IS_SYMBOL(v)) throw MakeTypeError(kSymbolToNumber); - if (IS_SIMD_OBJECT(x)) throw MakeTypeError(kSimdToNumber); + if (IS_SIMD_VALUE(x)) throw MakeTypeError(kSimdToNumber); if (IsPrimitive(v)) return v; } var toString = x.toString; diff --git a/src/runtime/runtime-simd.cc b/src/runtime/runtime-simd.cc index ffb29c0..4c184aa 100644 --- a/src/runtime/runtime-simd.cc +++ b/src/runtime/runtime-simd.cc @@ -137,7 +137,7 @@ bool Equals(Float32x4* a, Float32x4* b) { } // namespace -RUNTIME_FUNCTION(Runtime_IsSimdObject) { +RUNTIME_FUNCTION(Runtime_IsSimdValue) { HandleScope scope(isolate); DCHECK(args.length() == 1); return isolate->heap()->ToBoolean(args[0]->IsSimd128Value()); diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h index 6977cb6..39656fa 100644 --- a/src/runtime/runtime.h +++ b/src/runtime/runtime.h @@ -568,7 +568,7 @@ namespace internal { #define FOR_EACH_INTRINSIC_SIMD(F) \ - F(IsSimdObject, 1, 1) \ + F(IsSimdValue, 1, 1) \ F(SimdToObject, 1, 1) \ F(SimdEquals, 2, 1) \ F(SimdSameValue, 2, 1) \ -- 2.7.4