Upgrade V8 to version 4.9.385.28
https://chromium.googlesource.com/v8/v8/+/4.9.385.28
FPIIM-449
Change-Id: I4b2e74289d4bf3667f2f3dc8aa2e541f63e26eb4
diff --git a/src/compiler/raw-machine-assembler.h b/src/compiler/raw-machine-assembler.h
index 5455814..5c232ed 100644
--- a/src/compiler/raw-machine-assembler.h
+++ b/src/compiler/raw-machine-assembler.h
@@ -5,63 +5,66 @@
#ifndef V8_COMPILER_RAW_MACHINE_ASSEMBLER_H_
#define V8_COMPILER_RAW_MACHINE_ASSEMBLER_H_
-#include "src/v8.h"
-
+#include "src/assembler.h"
#include "src/compiler/common-operator.h"
-#include "src/compiler/graph-builder.h"
+#include "src/compiler/graph.h"
#include "src/compiler/linkage.h"
#include "src/compiler/machine-operator.h"
#include "src/compiler/node.h"
#include "src/compiler/operator.h"
-
+#include "src/factory.h"
namespace v8 {
namespace internal {
namespace compiler {
class BasicBlock;
+class RawMachineLabel;
class Schedule;
-class RawMachineAssembler : public GraphBuilder {
+// The RawMachineAssembler produces a low-level IR graph. All nodes are wired
+// into a graph and also placed into a schedule immediately, hence subsequent
+// code generation can happen without the need for scheduling.
+//
+// In order to create a schedule on-the-fly, the assembler keeps track of basic
+// blocks by having one current basic block being populated and by referencing
+// other basic blocks through the use of labels.
+//
+// Also note that the generated graph is only valid together with the generated
+// schedule, using one without the other is invalid as the graph is inherently
+// non-schedulable due to missing control and effect dependencies.
+class RawMachineAssembler {
public:
- class Label {
- public:
- Label() : block_(NULL), used_(false), bound_(false) {}
- ~Label() { DCHECK(bound_ || !used_); }
+ RawMachineAssembler(
+ Isolate* isolate, Graph* graph, CallDescriptor* call_descriptor,
+ MachineRepresentation word = MachineType::PointerRepresentation(),
+ MachineOperatorBuilder::Flags flags =
+ MachineOperatorBuilder::Flag::kNoFlags);
+ ~RawMachineAssembler() {}
- BasicBlock* block() { return block_; }
-
- private:
- // Private constructor for exit label.
- explicit Label(BasicBlock* block)
- : block_(block), used_(false), bound_(false) {}
-
- BasicBlock* block_;
- bool used_;
- bool bound_;
- friend class RawMachineAssembler;
- DISALLOW_COPY_AND_ASSIGN(Label);
- };
-
- RawMachineAssembler(Graph* graph, MachineSignature* machine_sig,
- MachineType word = kMachPtr,
- MachineOperatorBuilder::Flags flags =
- MachineOperatorBuilder::Flag::kNoFlags);
- ~RawMachineAssembler() OVERRIDE {}
-
- Isolate* isolate() const { return zone()->isolate(); }
+ Isolate* isolate() const { return isolate_; }
+ Graph* graph() const { return graph_; }
Zone* zone() const { return graph()->zone(); }
MachineOperatorBuilder* machine() { return &machine_; }
CommonOperatorBuilder* common() { return &common_; }
CallDescriptor* call_descriptor() const { return call_descriptor_; }
- size_t parameter_count() const { return machine_sig_->parameter_count(); }
- MachineSignature* machine_sig() const { return machine_sig_; }
+
+ // Finalizes the schedule and exports it to be used for code generation. Note
+ // that this RawMachineAssembler becomes invalid after export.
+ Schedule* Export();
+
+ // ===========================================================================
+ // The following utility methods create new nodes with specific operators and
+ // place them into the current basic block. They don't perform control flow,
+ // hence will not switch the current basic block.
+
+ Node* NullConstant() {
+ return HeapConstant(isolate()->factory()->null_value());
+ }
Node* UndefinedConstant() {
- Unique<HeapObject> unique = Unique<HeapObject>::CreateImmovable(
- isolate()->factory()->undefined_value());
- return NewNode(common()->HeapConstant(unique));
+ return HeapConstant(isolate()->factory()->undefined_value());
}
// Constants.
@@ -74,66 +77,74 @@
: Int32Constant(static_cast<int>(value));
}
Node* Int32Constant(int32_t value) {
- return NewNode(common()->Int32Constant(value));
+ return AddNode(common()->Int32Constant(value));
}
Node* Int64Constant(int64_t value) {
- return NewNode(common()->Int64Constant(value));
+ return AddNode(common()->Int64Constant(value));
}
Node* NumberConstant(double value) {
- return NewNode(common()->NumberConstant(value));
+ return AddNode(common()->NumberConstant(value));
}
Node* Float32Constant(float value) {
- return NewNode(common()->Float32Constant(value));
+ return AddNode(common()->Float32Constant(value));
}
Node* Float64Constant(double value) {
- return NewNode(common()->Float64Constant(value));
+ return AddNode(common()->Float64Constant(value));
}
Node* HeapConstant(Handle<HeapObject> object) {
- Unique<HeapObject> val = Unique<HeapObject>::CreateUninitialized(object);
- return NewNode(common()->HeapConstant(val));
+ return AddNode(common()->HeapConstant(object));
+ }
+ Node* BooleanConstant(bool value) {
+ Handle<Object> object = isolate()->factory()->ToBoolean(value);
+ return HeapConstant(Handle<HeapObject>::cast(object));
+ }
+ Node* ExternalConstant(ExternalReference address) {
+ return AddNode(common()->ExternalConstant(address));
}
Node* Projection(int index, Node* a) {
- return NewNode(common()->Projection(index), a);
+ return AddNode(common()->Projection(index), a);
}
// Memory Operations.
Node* Load(MachineType rep, Node* base) {
- return Load(rep, base, Int32Constant(0));
+ return Load(rep, base, IntPtrConstant(0));
}
Node* Load(MachineType rep, Node* base, Node* index) {
- return NewNode(machine()->Load(rep), base, index, graph()->start(),
- graph()->start());
+ return AddNode(machine()->Load(rep), base, index);
}
- void Store(MachineType rep, Node* base, Node* value) {
- Store(rep, base, Int32Constant(0), value);
+ Node* Store(MachineRepresentation rep, Node* base, Node* value,
+ WriteBarrierKind write_barrier) {
+ return Store(rep, base, IntPtrConstant(0), value, write_barrier);
}
- void Store(MachineType rep, Node* base, Node* index, Node* value) {
- NewNode(machine()->Store(StoreRepresentation(rep, kNoWriteBarrier)), base,
- index, value, graph()->start(), graph()->start());
+ Node* Store(MachineRepresentation rep, Node* base, Node* index, Node* value,
+ WriteBarrierKind write_barrier) {
+ return AddNode(machine()->Store(StoreRepresentation(rep, write_barrier)),
+ base, index, value);
}
+
// Arithmetic Operations.
Node* WordAnd(Node* a, Node* b) {
- return NewNode(machine()->WordAnd(), a, b);
+ return AddNode(machine()->WordAnd(), a, b);
}
- Node* WordOr(Node* a, Node* b) { return NewNode(machine()->WordOr(), a, b); }
+ Node* WordOr(Node* a, Node* b) { return AddNode(machine()->WordOr(), a, b); }
Node* WordXor(Node* a, Node* b) {
- return NewNode(machine()->WordXor(), a, b);
+ return AddNode(machine()->WordXor(), a, b);
}
Node* WordShl(Node* a, Node* b) {
- return NewNode(machine()->WordShl(), a, b);
+ return AddNode(machine()->WordShl(), a, b);
}
Node* WordShr(Node* a, Node* b) {
- return NewNode(machine()->WordShr(), a, b);
+ return AddNode(machine()->WordShr(), a, b);
}
Node* WordSar(Node* a, Node* b) {
- return NewNode(machine()->WordSar(), a, b);
+ return AddNode(machine()->WordSar(), a, b);
}
Node* WordRor(Node* a, Node* b) {
- return NewNode(machine()->WordRor(), a, b);
+ return AddNode(machine()->WordRor(), a, b);
}
Node* WordEqual(Node* a, Node* b) {
- return NewNode(machine()->WordEqual(), a, b);
+ return AddNode(machine()->WordEqual(), a, b);
}
Node* WordNotEqual(Node* a, Node* b) {
return WordBinaryNot(WordEqual(a, b));
@@ -154,28 +165,29 @@
}
Node* Word32And(Node* a, Node* b) {
- return NewNode(machine()->Word32And(), a, b);
+ return AddNode(machine()->Word32And(), a, b);
}
Node* Word32Or(Node* a, Node* b) {
- return NewNode(machine()->Word32Or(), a, b);
+ return AddNode(machine()->Word32Or(), a, b);
}
Node* Word32Xor(Node* a, Node* b) {
- return NewNode(machine()->Word32Xor(), a, b);
+ return AddNode(machine()->Word32Xor(), a, b);
}
Node* Word32Shl(Node* a, Node* b) {
- return NewNode(machine()->Word32Shl(), a, b);
+ return AddNode(machine()->Word32Shl(), a, b);
}
Node* Word32Shr(Node* a, Node* b) {
- return NewNode(machine()->Word32Shr(), a, b);
+ return AddNode(machine()->Word32Shr(), a, b);
}
Node* Word32Sar(Node* a, Node* b) {
- return NewNode(machine()->Word32Sar(), a, b);
+ return AddNode(machine()->Word32Sar(), a, b);
}
Node* Word32Ror(Node* a, Node* b) {
- return NewNode(machine()->Word32Ror(), a, b);
+ return AddNode(machine()->Word32Ror(), a, b);
}
+ Node* Word32Clz(Node* a) { return AddNode(machine()->Word32Clz(), a); }
Node* Word32Equal(Node* a, Node* b) {
- return NewNode(machine()->Word32Equal(), a, b);
+ return AddNode(machine()->Word32Equal(), a, b);
}
Node* Word32NotEqual(Node* a, Node* b) {
return Word32BinaryNot(Word32Equal(a, b));
@@ -184,28 +196,29 @@
Node* Word32BinaryNot(Node* a) { return Word32Equal(a, Int32Constant(0)); }
Node* Word64And(Node* a, Node* b) {
- return NewNode(machine()->Word64And(), a, b);
+ return AddNode(machine()->Word64And(), a, b);
}
Node* Word64Or(Node* a, Node* b) {
- return NewNode(machine()->Word64Or(), a, b);
+ return AddNode(machine()->Word64Or(), a, b);
}
Node* Word64Xor(Node* a, Node* b) {
- return NewNode(machine()->Word64Xor(), a, b);
+ return AddNode(machine()->Word64Xor(), a, b);
}
Node* Word64Shl(Node* a, Node* b) {
- return NewNode(machine()->Word64Shl(), a, b);
+ return AddNode(machine()->Word64Shl(), a, b);
}
Node* Word64Shr(Node* a, Node* b) {
- return NewNode(machine()->Word64Shr(), a, b);
+ return AddNode(machine()->Word64Shr(), a, b);
}
Node* Word64Sar(Node* a, Node* b) {
- return NewNode(machine()->Word64Sar(), a, b);
+ return AddNode(machine()->Word64Sar(), a, b);
}
Node* Word64Ror(Node* a, Node* b) {
- return NewNode(machine()->Word64Ror(), a, b);
+ return AddNode(machine()->Word64Ror(), a, b);
}
+ Node* Word64Clz(Node* a) { return AddNode(machine()->Word64Clz(), a); }
Node* Word64Equal(Node* a, Node* b) {
- return NewNode(machine()->Word64Equal(), a, b);
+ return AddNode(machine()->Word64Equal(), a, b);
}
Node* Word64NotEqual(Node* a, Node* b) {
return Word64BinaryNot(Word64Equal(a, b));
@@ -214,49 +227,49 @@
Node* Word64BinaryNot(Node* a) { return Word64Equal(a, Int64Constant(0)); }
Node* Int32Add(Node* a, Node* b) {
- return NewNode(machine()->Int32Add(), a, b);
+ return AddNode(machine()->Int32Add(), a, b);
}
Node* Int32AddWithOverflow(Node* a, Node* b) {
- return NewNode(machine()->Int32AddWithOverflow(), a, b);
+ return AddNode(machine()->Int32AddWithOverflow(), a, b);
}
Node* Int32Sub(Node* a, Node* b) {
- return NewNode(machine()->Int32Sub(), a, b);
+ return AddNode(machine()->Int32Sub(), a, b);
}
Node* Int32SubWithOverflow(Node* a, Node* b) {
- return NewNode(machine()->Int32SubWithOverflow(), a, b);
+ return AddNode(machine()->Int32SubWithOverflow(), a, b);
}
Node* Int32Mul(Node* a, Node* b) {
- return NewNode(machine()->Int32Mul(), a, b);
+ return AddNode(machine()->Int32Mul(), a, b);
}
Node* Int32MulHigh(Node* a, Node* b) {
- return NewNode(machine()->Int32MulHigh(), a, b);
+ return AddNode(machine()->Int32MulHigh(), a, b);
}
Node* Int32Div(Node* a, Node* b) {
- return NewNode(machine()->Int32Div(), a, b, graph()->start());
+ return AddNode(machine()->Int32Div(), a, b);
}
Node* Int32Mod(Node* a, Node* b) {
- return NewNode(machine()->Int32Mod(), a, b, graph()->start());
+ return AddNode(machine()->Int32Mod(), a, b);
}
Node* Int32LessThan(Node* a, Node* b) {
- return NewNode(machine()->Int32LessThan(), a, b);
+ return AddNode(machine()->Int32LessThan(), a, b);
}
Node* Int32LessThanOrEqual(Node* a, Node* b) {
- return NewNode(machine()->Int32LessThanOrEqual(), a, b);
+ return AddNode(machine()->Int32LessThanOrEqual(), a, b);
}
Node* Uint32Div(Node* a, Node* b) {
- return NewNode(machine()->Uint32Div(), a, b, graph()->start());
+ return AddNode(machine()->Uint32Div(), a, b);
}
Node* Uint32LessThan(Node* a, Node* b) {
- return NewNode(machine()->Uint32LessThan(), a, b);
+ return AddNode(machine()->Uint32LessThan(), a, b);
}
Node* Uint32LessThanOrEqual(Node* a, Node* b) {
- return NewNode(machine()->Uint32LessThanOrEqual(), a, b);
+ return AddNode(machine()->Uint32LessThanOrEqual(), a, b);
}
Node* Uint32Mod(Node* a, Node* b) {
- return NewNode(machine()->Uint32Mod(), a, b, graph()->start());
+ return AddNode(machine()->Uint32Mod(), a, b);
}
Node* Uint32MulHigh(Node* a, Node* b) {
- return NewNode(machine()->Uint32MulHigh(), a, b);
+ return AddNode(machine()->Uint32MulHigh(), a, b);
}
Node* Int32GreaterThan(Node* a, Node* b) { return Int32LessThan(b, a); }
Node* Int32GreaterThanOrEqual(Node* a, Node* b) {
@@ -265,45 +278,48 @@
Node* Int32Neg(Node* a) { return Int32Sub(Int32Constant(0), a); }
Node* Int64Add(Node* a, Node* b) {
- return NewNode(machine()->Int64Add(), a, b);
+ return AddNode(machine()->Int64Add(), a, b);
+ }
+ Node* Int64AddWithOverflow(Node* a, Node* b) {
+ return AddNode(machine()->Int64AddWithOverflow(), a, b);
}
Node* Int64Sub(Node* a, Node* b) {
- return NewNode(machine()->Int64Sub(), a, b);
+ return AddNode(machine()->Int64Sub(), a, b);
+ }
+ Node* Int64SubWithOverflow(Node* a, Node* b) {
+ return AddNode(machine()->Int64SubWithOverflow(), a, b);
}
Node* Int64Mul(Node* a, Node* b) {
- return NewNode(machine()->Int64Mul(), a, b);
+ return AddNode(machine()->Int64Mul(), a, b);
}
Node* Int64Div(Node* a, Node* b) {
- return NewNode(machine()->Int64Div(), a, b);
+ return AddNode(machine()->Int64Div(), a, b);
}
Node* Int64Mod(Node* a, Node* b) {
- return NewNode(machine()->Int64Mod(), a, b);
+ return AddNode(machine()->Int64Mod(), a, b);
}
Node* Int64Neg(Node* a) { return Int64Sub(Int64Constant(0), a); }
Node* Int64LessThan(Node* a, Node* b) {
- return NewNode(machine()->Int64LessThan(), a, b);
+ return AddNode(machine()->Int64LessThan(), a, b);
}
Node* Int64LessThanOrEqual(Node* a, Node* b) {
- return NewNode(machine()->Int64LessThanOrEqual(), a, b);
+ return AddNode(machine()->Int64LessThanOrEqual(), a, b);
+ }
+ Node* Uint64LessThan(Node* a, Node* b) {
+ return AddNode(machine()->Uint64LessThan(), a, b);
+ }
+ Node* Uint64LessThanOrEqual(Node* a, Node* b) {
+ return AddNode(machine()->Uint64LessThanOrEqual(), a, b);
}
Node* Int64GreaterThan(Node* a, Node* b) { return Int64LessThan(b, a); }
Node* Int64GreaterThanOrEqual(Node* a, Node* b) {
return Int64LessThanOrEqual(b, a);
}
Node* Uint64Div(Node* a, Node* b) {
- return NewNode(machine()->Uint64Div(), a, b);
+ return AddNode(machine()->Uint64Div(), a, b);
}
Node* Uint64Mod(Node* a, Node* b) {
- return NewNode(machine()->Uint64Mod(), a, b);
- }
-
- // TODO(turbofan): What is this used for?
- Node* ConvertIntPtrToInt32(Node* a) {
- return kPointerSize == 8 ? NewNode(machine()->TruncateInt64ToInt32(), a)
- : a;
- }
- Node* ConvertInt32ToIntPtr(Node* a) {
- return kPointerSize == 8 ? NewNode(machine()->ChangeInt32ToInt64(), a) : a;
+ return AddNode(machine()->Uint64Mod(), a, b);
}
#define INTPTR_BINOP(prefix, name) \
@@ -323,32 +339,77 @@
#undef INTPTR_BINOP
+ Node* Float32Add(Node* a, Node* b) {
+ return AddNode(machine()->Float32Add(), a, b);
+ }
+ Node* Float32Sub(Node* a, Node* b) {
+ return AddNode(machine()->Float32Sub(), a, b);
+ }
+ Node* Float32Mul(Node* a, Node* b) {
+ return AddNode(machine()->Float32Mul(), a, b);
+ }
+ Node* Float32Div(Node* a, Node* b) {
+ return AddNode(machine()->Float32Div(), a, b);
+ }
+ Node* Float32Max(Node* a, Node* b) {
+ return AddNode(machine()->Float32Max().op(), a, b);
+ }
+ Node* Float32Min(Node* a, Node* b) {
+ return AddNode(machine()->Float32Min().op(), a, b);
+ }
+ Node* Float32Abs(Node* a) { return AddNode(machine()->Float32Abs(), a); }
+ Node* Float32Sqrt(Node* a) { return AddNode(machine()->Float32Sqrt(), a); }
+ Node* Float32Equal(Node* a, Node* b) {
+ return AddNode(machine()->Float32Equal(), a, b);
+ }
+ Node* Float32NotEqual(Node* a, Node* b) {
+ return WordBinaryNot(Float32Equal(a, b));
+ }
+ Node* Float32LessThan(Node* a, Node* b) {
+ return AddNode(machine()->Float32LessThan(), a, b);
+ }
+ Node* Float32LessThanOrEqual(Node* a, Node* b) {
+ return AddNode(machine()->Float32LessThanOrEqual(), a, b);
+ }
+ Node* Float32GreaterThan(Node* a, Node* b) { return Float32LessThan(b, a); }
+ Node* Float32GreaterThanOrEqual(Node* a, Node* b) {
+ return Float32LessThanOrEqual(b, a);
+ }
+
Node* Float64Add(Node* a, Node* b) {
- return NewNode(machine()->Float64Add(), a, b);
+ return AddNode(machine()->Float64Add(), a, b);
}
Node* Float64Sub(Node* a, Node* b) {
- return NewNode(machine()->Float64Sub(), a, b);
+ return AddNode(machine()->Float64Sub(), a, b);
}
Node* Float64Mul(Node* a, Node* b) {
- return NewNode(machine()->Float64Mul(), a, b);
+ return AddNode(machine()->Float64Mul(), a, b);
}
Node* Float64Div(Node* a, Node* b) {
- return NewNode(machine()->Float64Div(), a, b);
+ return AddNode(machine()->Float64Div(), a, b);
}
Node* Float64Mod(Node* a, Node* b) {
- return NewNode(machine()->Float64Mod(), a, b);
+ return AddNode(machine()->Float64Mod(), a, b);
}
+ Node* Float64Max(Node* a, Node* b) {
+ return AddNode(machine()->Float64Max().op(), a, b);
+ }
+ Node* Float64Min(Node* a, Node* b) {
+ return AddNode(machine()->Float64Min().op(), a, b);
+ }
+ Node* Float64Abs(Node* a) { return AddNode(machine()->Float64Abs(), a); }
+ Node* Float64Sqrt(Node* a) { return AddNode(machine()->Float64Sqrt(), a); }
Node* Float64Equal(Node* a, Node* b) {
- return NewNode(machine()->Float64Equal(), a, b);
+ return AddNode(machine()->Float64Equal(), a, b);
}
Node* Float64NotEqual(Node* a, Node* b) {
return WordBinaryNot(Float64Equal(a, b));
}
Node* Float64LessThan(Node* a, Node* b) {
- return NewNode(machine()->Float64LessThan(), a, b);
+ return AddNode(machine()->Float64LessThan(), a, b);
}
Node* Float64LessThanOrEqual(Node* a, Node* b) {
- return NewNode(machine()->Float64LessThanOrEqual(), a, b);
+ return AddNode(machine()->Float64LessThanOrEqual(), a, b);
}
Node* Float64GreaterThan(Node* a, Node* b) { return Float64LessThan(b, a); }
Node* Float64GreaterThanOrEqual(Node* a, Node* b) {
@@ -357,106 +418,274 @@
// Conversions.
Node* ChangeFloat32ToFloat64(Node* a) {
- return NewNode(machine()->ChangeFloat32ToFloat64(), a);
+ return AddNode(machine()->ChangeFloat32ToFloat64(), a);
}
Node* ChangeInt32ToFloat64(Node* a) {
- return NewNode(machine()->ChangeInt32ToFloat64(), a);
+ return AddNode(machine()->ChangeInt32ToFloat64(), a);
}
Node* ChangeUint32ToFloat64(Node* a) {
- return NewNode(machine()->ChangeUint32ToFloat64(), a);
+ return AddNode(machine()->ChangeUint32ToFloat64(), a);
}
Node* ChangeFloat64ToInt32(Node* a) {
- return NewNode(machine()->ChangeFloat64ToInt32(), a);
+ return AddNode(machine()->ChangeFloat64ToInt32(), a);
}
Node* ChangeFloat64ToUint32(Node* a) {
- return NewNode(machine()->ChangeFloat64ToUint32(), a);
+ return AddNode(machine()->ChangeFloat64ToUint32(), a);
+ }
+ Node* TruncateFloat32ToInt64(Node* a) {
+ // TODO(ahaas): Remove this function as soon as it is not used anymore in
+ // WebAssembly.
+ return AddNode(machine()->TryTruncateFloat32ToInt64(), a);
+ }
+ Node* TryTruncateFloat32ToInt64(Node* a) {
+ return AddNode(machine()->TryTruncateFloat32ToInt64(), a);
+ }
+ Node* TruncateFloat64ToInt64(Node* a) {
+ // TODO(ahaas): Remove this function as soon as it is not used anymore in
+ // WebAssembly.
+ return AddNode(machine()->TryTruncateFloat64ToInt64(), a);
+ }
+ Node* TryTruncateFloat64ToInt64(Node* a) {
+ return AddNode(machine()->TryTruncateFloat64ToInt64(), a);
+ }
+ Node* TruncateFloat32ToUint64(Node* a) {
+ // TODO(ahaas): Remove this function as soon as it is not used anymore in
+ // WebAssembly.
+ return AddNode(machine()->TryTruncateFloat32ToUint64(), a);
+ }
+ Node* TryTruncateFloat32ToUint64(Node* a) {
+ return AddNode(machine()->TryTruncateFloat32ToUint64(), a);
+ }
+ Node* TruncateFloat64ToUint64(Node* a) {
+ // TODO(ahaas): Remove this function as soon as it is not used anymore in
+ // WebAssembly.
+ return AddNode(machine()->TryTruncateFloat64ToUint64(), a);
+ }
+ Node* TryTruncateFloat64ToUint64(Node* a) {
+ return AddNode(machine()->TryTruncateFloat64ToUint64(), a);
}
Node* ChangeInt32ToInt64(Node* a) {
- return NewNode(machine()->ChangeInt32ToInt64(), a);
+ return AddNode(machine()->ChangeInt32ToInt64(), a);
}
Node* ChangeUint32ToUint64(Node* a) {
- return NewNode(machine()->ChangeUint32ToUint64(), a);
+ return AddNode(machine()->ChangeUint32ToUint64(), a);
}
Node* TruncateFloat64ToFloat32(Node* a) {
- return NewNode(machine()->TruncateFloat64ToFloat32(), a);
+ return AddNode(machine()->TruncateFloat64ToFloat32(), a);
}
- Node* TruncateFloat64ToInt32(Node* a) {
- return NewNode(machine()->TruncateFloat64ToInt32(), a);
+ Node* TruncateFloat64ToInt32(TruncationMode mode, Node* a) {
+ return AddNode(machine()->TruncateFloat64ToInt32(mode), a);
}
Node* TruncateInt64ToInt32(Node* a) {
- return NewNode(machine()->TruncateInt64ToInt32(), a);
+ return AddNode(machine()->TruncateInt64ToInt32(), a);
}
- Node* Float64Floor(Node* a) { return NewNode(machine()->Float64Floor(), a); }
- Node* Float64Ceil(Node* a) { return NewNode(machine()->Float64Ceil(), a); }
+ Node* RoundInt64ToFloat32(Node* a) {
+ return AddNode(machine()->RoundInt64ToFloat32(), a);
+ }
+ Node* RoundInt64ToFloat64(Node* a) {
+ return AddNode(machine()->RoundInt64ToFloat64(), a);
+ }
+ Node* RoundUint64ToFloat32(Node* a) {
+ return AddNode(machine()->RoundUint64ToFloat32(), a);
+ }
+ Node* RoundUint64ToFloat64(Node* a) {
+ return AddNode(machine()->RoundUint64ToFloat64(), a);
+ }
+ Node* BitcastFloat32ToInt32(Node* a) {
+ return AddNode(machine()->BitcastFloat32ToInt32(), a);
+ }
+ Node* BitcastFloat64ToInt64(Node* a) {
+ return AddNode(machine()->BitcastFloat64ToInt64(), a);
+ }
+ Node* BitcastInt32ToFloat32(Node* a) {
+ return AddNode(machine()->BitcastInt32ToFloat32(), a);
+ }
+ Node* BitcastInt64ToFloat64(Node* a) {
+ return AddNode(machine()->BitcastInt64ToFloat64(), a);
+ }
+ Node* Float32RoundDown(Node* a) {
+ return AddNode(machine()->Float32RoundDown().op(), a);
+ }
+ Node* Float64RoundDown(Node* a) {
+ return AddNode(machine()->Float64RoundDown().op(), a);
+ }
+ Node* Float32RoundUp(Node* a) {
+ return AddNode(machine()->Float32RoundUp().op(), a);
+ }
+ Node* Float64RoundUp(Node* a) {
+ return AddNode(machine()->Float64RoundUp().op(), a);
+ }
+ Node* Float32RoundTruncate(Node* a) {
+ return AddNode(machine()->Float32RoundTruncate().op(), a);
+ }
Node* Float64RoundTruncate(Node* a) {
- return NewNode(machine()->Float64RoundTruncate(), a);
+ return AddNode(machine()->Float64RoundTruncate().op(), a);
}
Node* Float64RoundTiesAway(Node* a) {
- return NewNode(machine()->Float64RoundTiesAway(), a);
+ return AddNode(machine()->Float64RoundTiesAway().op(), a);
}
+ Node* Float32RoundTiesEven(Node* a) {
+ return AddNode(machine()->Float32RoundTiesEven().op(), a);
+ }
+ Node* Float64RoundTiesEven(Node* a) {
+ return AddNode(machine()->Float64RoundTiesEven().op(), a);
+ }
+
+ // Float64 bit operations.
+ Node* Float64ExtractLowWord32(Node* a) {
+ return AddNode(machine()->Float64ExtractLowWord32(), a);
+ }
+ Node* Float64ExtractHighWord32(Node* a) {
+ return AddNode(machine()->Float64ExtractHighWord32(), a);
+ }
+ Node* Float64InsertLowWord32(Node* a, Node* b) {
+ return AddNode(machine()->Float64InsertLowWord32(), a, b);
+ }
+ Node* Float64InsertHighWord32(Node* a, Node* b) {
+ return AddNode(machine()->Float64InsertHighWord32(), a, b);
+ }
+
+ // Stack operations.
+ Node* LoadStackPointer() { return AddNode(machine()->LoadStackPointer()); }
+ Node* LoadFramePointer() { return AddNode(machine()->LoadFramePointer()); }
// Parameters.
Node* Parameter(size_t index);
+ // Pointer utilities.
+ Node* LoadFromPointer(void* address, MachineType rep, int32_t offset = 0) {
+ return Load(rep, PointerConstant(address), Int32Constant(offset));
+ }
+ Node* StoreToPointer(void* address, MachineRepresentation rep, Node* node) {
+ return Store(rep, PointerConstant(address), node, kNoWriteBarrier);
+ }
+ Node* StringConstant(const char* string) {
+ return HeapConstant(isolate()->factory()->InternalizeUtf8String(string));
+ }
+
+ // Call a given call descriptor and the given arguments.
+ Node* CallN(CallDescriptor* desc, Node* function, Node** args);
+ // Call a given call descriptor and the given arguments and frame-state.
+ Node* CallNWithFrameState(CallDescriptor* desc, Node* function, Node** args,
+ Node* frame_state);
+ // Call to a runtime function with one arguments.
+ Node* CallRuntime1(Runtime::FunctionId function, Node* arg0, Node* context);
+ // Call to a runtime function with two arguments.
+ Node* CallRuntime2(Runtime::FunctionId function, Node* arg1, Node* arg2,
+ Node* context);
+ // Call to a runtime function with four arguments.
+ Node* CallRuntime4(Runtime::FunctionId function, Node* arg1, Node* arg2,
+ Node* arg3, Node* arg4, Node* context);
+ // Call to a C function with zero arguments.
+ Node* CallCFunction0(MachineType return_type, Node* function);
+ // Call to a C function with one parameter.
+ Node* CallCFunction1(MachineType return_type, MachineType arg0_type,
+ Node* function, Node* arg0);
+ // Call to a C function with two arguments.
+ Node* CallCFunction2(MachineType return_type, MachineType arg0_type,
+ MachineType arg1_type, Node* function, Node* arg0,
+ Node* arg1);
+ // Call to a C function with eight arguments.
+ Node* CallCFunction8(MachineType return_type, MachineType arg0_type,
+ MachineType arg1_type, MachineType arg2_type,
+ MachineType arg3_type, MachineType arg4_type,
+ MachineType arg5_type, MachineType arg6_type,
+ MachineType arg7_type, Node* function, Node* arg0,
+ Node* arg1, Node* arg2, Node* arg3, Node* arg4,
+ Node* arg5, Node* arg6, Node* arg7);
+
+ // Tail call the given call descriptor and the given arguments.
+ Node* TailCallN(CallDescriptor* call_descriptor, Node* function, Node** args);
+ // Tail call to a runtime function with one argument.
+ Node* TailCallRuntime1(Runtime::FunctionId function, Node* arg0,
+ Node* context);
+ // Tail call to a runtime function with two arguments.
+ Node* TailCallRuntime2(Runtime::FunctionId function, Node* arg1, Node* arg2,
+ Node* context);
+
+
+ // ===========================================================================
+ // The following utility methods deal with control flow, hence might switch
+ // the current basic block or create new basic blocks for labels.
+
// Control flow.
- Label* Exit();
- void Goto(Label* label);
- void Branch(Node* condition, Label* true_val, Label* false_val);
- // Call through CallFunctionStub with lazy deopt and frame-state.
- Node* CallFunctionStub0(Node* function, Node* receiver, Node* context,
- Node* frame_state, CallFunctionFlags flags);
- // Call to a JS function with zero parameters.
- Node* CallJS0(Node* function, Node* receiver, Node* context,
- Node* frame_state);
- // Call to a runtime function with zero parameters.
- Node* CallRuntime1(Runtime::FunctionId function, Node* arg0, Node* context,
- Node* frame_state);
+ void Goto(RawMachineLabel* label);
+ void Branch(Node* condition, RawMachineLabel* true_val,
+ RawMachineLabel* false_val);
+ void Switch(Node* index, RawMachineLabel* default_label, int32_t* case_values,
+ RawMachineLabel** case_labels, size_t case_count);
void Return(Node* value);
- void Bind(Label* label);
+ void Return(Node* v1, Node* v2);
+ void Return(Node* v1, Node* v2, Node* v3);
+ void Bind(RawMachineLabel* label);
void Deoptimize(Node* state);
// Variables.
- Node* Phi(MachineType type, Node* n1, Node* n2) {
- return NewNode(common()->Phi(type, 2), n1, n2);
+ Node* Phi(MachineRepresentation rep, Node* n1, Node* n2) {
+ return AddNode(common()->Phi(rep, 2), n1, n2);
}
- Node* Phi(MachineType type, Node* n1, Node* n2, Node* n3) {
- return NewNode(common()->Phi(type, 3), n1, n2, n3);
+ Node* Phi(MachineRepresentation rep, Node* n1, Node* n2, Node* n3) {
+ return AddNode(common()->Phi(rep, 3), n1, n2, n3);
}
- Node* Phi(MachineType type, Node* n1, Node* n2, Node* n3, Node* n4) {
- return NewNode(common()->Phi(type, 4), n1, n2, n3, n4);
+ Node* Phi(MachineRepresentation rep, Node* n1, Node* n2, Node* n3, Node* n4) {
+ return AddNode(common()->Phi(rep, 4), n1, n2, n3, n4);
}
- // MachineAssembler is invalid after export.
- Schedule* Export();
+ // ===========================================================================
+ // The following generic node creation methods can be used for operators that
+ // are not covered by the above utility methods. There should rarely be a need
+ // to do that outside of testing though.
- protected:
- Node* MakeNode(const Operator* op, int input_count, Node** inputs,
- bool incomplete) FINAL;
+ Node* AddNode(const Operator* op, int input_count, Node** inputs);
- bool ScheduleValid() { return schedule_ != NULL; }
+ Node* AddNode(const Operator* op) {
+ return AddNode(op, 0, static_cast<Node**>(nullptr));
+ }
- Schedule* schedule() {
- DCHECK(ScheduleValid());
- return schedule_;
+ template <class... TArgs>
+ Node* AddNode(const Operator* op, Node* n1, TArgs... args) {
+ Node* buffer[] = {n1, args...};
+ return AddNode(op, sizeof...(args) + 1, buffer);
}
private:
- BasicBlock* Use(Label* label);
- BasicBlock* EnsureBlock(Label* label);
+ Node* MakeNode(const Operator* op, int input_count, Node** inputs);
+ BasicBlock* Use(RawMachineLabel* label);
+ BasicBlock* EnsureBlock(RawMachineLabel* label);
BasicBlock* CurrentBlock();
+ Schedule* schedule() { return schedule_; }
+ size_t parameter_count() const { return machine_sig()->parameter_count(); }
+ const MachineSignature* machine_sig() const {
+ return call_descriptor_->GetMachineSignature();
+ }
+
+ Isolate* isolate_;
+ Graph* graph_;
Schedule* schedule_;
MachineOperatorBuilder machine_;
CommonOperatorBuilder common_;
- MachineSignature* machine_sig_;
CallDescriptor* call_descriptor_;
- Node** parameters_;
- Label exit_label_;
+ NodeVector parameters_;
BasicBlock* current_block_;
DISALLOW_COPY_AND_ASSIGN(RawMachineAssembler);
};
+
+class RawMachineLabel final {
+ public:
+ RawMachineLabel();
+ ~RawMachineLabel();
+
+ private:
+ BasicBlock* block_;
+ bool used_;
+ bool bound_;
+ friend class RawMachineAssembler;
+ DISALLOW_COPY_AND_ASSIGN(RawMachineLabel);
+};
+
} // namespace compiler
} // namespace internal
} // namespace v8