AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[cleanup] Add CSA types to SmiMod

Browse Source 
Change-Id: I224ab73120b8e8d9892bc560455aacb2cd9397c9
Reviewed-on: https://chromium-review.googlesource.com/978185
Reviewed-by: Camillo Bruni <cbruni@chromium.org>
Commit-Queue: Peter Marshall <petermarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52204}
This commit is contained in:
Peter Marshall 2018-03-23 16:01:19 +01:00 committed by Commit Bot
parent 9a0ccf4f49
commit 5fed509b9e
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/code-stub-assembler.cc
View File

@ -655,29 +655,30 @@ TNode<IntPtrT> CodeStubAssembler::ConvertToRelativeIndex(
return result.value(); return result.value();
} }
Node* CodeStubAssembler::SmiMod(Node* a, Node* b) { TNode<Number> CodeStubAssembler::SmiMod(SloppyTNode<Smi> a,
VARIABLE(var_result, MachineRepresentation::kTagged); SloppyTNode<Smi> b) {
TVARIABLE(Number, var_result);
Label return_result(this, &var_result), Label return_result(this, &var_result),
return_minuszero(this, Label::kDeferred), return_minuszero(this, Label::kDeferred),
return_nan(this, Label::kDeferred); return_nan(this, Label::kDeferred);
// Untag {a} and {b}. // Untag {a} and {b}.
a = SmiToInt32(a); TNode<Int32T> int_a = SmiToInt32(a);
b = SmiToInt32(b); TNode<Int32T> int_b = SmiToInt32(b);
// Return NaN if {b} is zero. // Return NaN if {b} is zero.
GotoIf(Word32Equal(b, Int32Constant(0)), &return_nan); GotoIf(Word32Equal(int_b, Int32Constant(0)), &return_nan);
// Check if {a} is non-negative. // Check if {a} is non-negative.
Label if_aisnotnegative(this), if_aisnegative(this, Label::kDeferred); Label if_aisnotnegative(this), if_aisnegative(this, Label::kDeferred);
Branch(Int32LessThanOrEqual(Int32Constant(0), a), &if_aisnotnegative, Branch(Int32LessThanOrEqual(Int32Constant(0), int_a), &if_aisnotnegative,
&if_aisnegative); &if_aisnegative);
BIND(&if_aisnotnegative); BIND(&if_aisnotnegative);
{ {
// Fast case, don't need to check any other edge cases. // Fast case, don't need to check any other edge cases.
Node* r = Int32Mod(a, b); TNode<Int32T> r = Int32Mod(int_a, int_b);
var_result.Bind(SmiFromInt32(r)); var_result = SmiFromInt32(r);
Goto(&return_result); Goto(&return_result);
} }
@ -687,14 +688,14 @@ Node* CodeStubAssembler::SmiMod(Node* a, Node* b) {
// Check if {a} is kMinInt and {b} is -1 (only relevant if the // Check if {a} is kMinInt and {b} is -1 (only relevant if the
// kMinInt is actually representable as a Smi). // kMinInt is actually representable as a Smi).
Label join(this); Label join(this);
GotoIfNot(Word32Equal(a, Int32Constant(kMinInt)), &join); GotoIfNot(Word32Equal(int_a, Int32Constant(kMinInt)), &join);
GotoIf(Word32Equal(b, Int32Constant(-1)), &return_minuszero); GotoIf(Word32Equal(int_b, Int32Constant(-1)), &return_minuszero);
Goto(&join); Goto(&join);
BIND(&join); BIND(&join);
} }
// Perform the integer modulus operation. // Perform the integer modulus operation.
Node* r = Int32Mod(a, b); TNode<Int32T> r = Int32Mod(int_a, int_b);
// Check if {r} is zero, and if so return -0, because we have to // Check if {r} is zero, and if so return -0, because we have to
// take the sign of the left hand side {a}, which is negative. // take the sign of the left hand side {a}, which is negative.
@ -702,20 +703,20 @@ Node* CodeStubAssembler::SmiMod(Node* a, Node* b) {
// The remainder {r} can be outside the valid Smi range on 32bit // The remainder {r} can be outside the valid Smi range on 32bit
// architectures, so we cannot just say SmiFromInt32(r) here. // architectures, so we cannot just say SmiFromInt32(r) here.
var_result.Bind(ChangeInt32ToTagged(r)); var_result = ChangeInt32ToTagged(r);
Goto(&return_result); Goto(&return_result);
} }
BIND(&return_minuszero); BIND(&return_minuszero);
var_result.Bind(MinusZeroConstant()); var_result = MinusZeroConstant();
Goto(&return_result); Goto(&return_result);
BIND(&return_nan); BIND(&return_nan);
var_result.Bind(NanConstant()); var_result = NanConstant();
Goto(&return_result); Goto(&return_result);
BIND(&return_result); BIND(&return_result);
return TNode<Object>::UncheckedCast(var_result.value()); return var_result.value();
} }
TNode<Number> CodeStubAssembler::SmiMul(SloppyTNode<Smi> a, TNode<Number> CodeStubAssembler::SmiMul(SloppyTNode<Smi> a,

2
src/code-stub-assembler.h
View File

@ -294,7 +294,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler : public compiler::CodeAssembler {
TNode<Smi> SmiMax(SloppyTNode<Smi> a, SloppyTNode<Smi> b); TNode<Smi> SmiMax(SloppyTNode<Smi> a, SloppyTNode<Smi> b);
TNode<Smi> SmiMin(SloppyTNode<Smi> a, SloppyTNode<Smi> b); TNode<Smi> SmiMin(SloppyTNode<Smi> a, SloppyTNode<Smi> b);
// Computes a % b for Smi inputs a and b; result is not necessarily a Smi. // Computes a % b for Smi inputs a and b; result is not necessarily a Smi.
Node* SmiMod(Node* a, Node* b); TNode<Number> SmiMod(SloppyTNode<Smi> a, SloppyTNode<Smi> b);
// Computes a * b for Smi inputs a and b; result is not necessarily a Smi. // Computes a * b for Smi inputs a and b; result is not necessarily a Smi.
TNode<Number> SmiMul(SloppyTNode<Smi> a, SloppyTNode<Smi> b); TNode<Number> SmiMul(SloppyTNode<Smi> a, SloppyTNode<Smi> b);
// Tries to computes dividend / divisor for Smi inputs; branching to bailout // Tries to computes dividend / divisor for Smi inputs; branching to bailout