Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(994)

Unified Diff: runtime/vm/intermediate_language.cc

Issue 744853003: Integrate the Irregexp Regular Expression Engine. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: fix clang and win build Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/intermediate_language.h ('k') | runtime/vm/intermediate_language_arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language.cc
diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc
index 8040c5063a46b9262cd8add0ce2a1a652060a4d3..9ac5c3f17b0cb244839ec07a06e0bcb5c7d45b5c 100644
--- a/runtime/vm/intermediate_language.cc
+++ b/runtime/vm/intermediate_language.cc
@@ -17,6 +17,7 @@
#include "vm/object.h"
#include "vm/object_store.h"
#include "vm/os.h"
+#include "vm/regexp_assembler.h"
#include "vm/resolver.h"
#include "vm/scopes.h"
#include "vm/stub_code.h"
@@ -451,6 +452,7 @@ GraphEntryInstr::GraphEntryInstr(const ParsedFunction* parsed_function,
parsed_function_(parsed_function),
normal_entry_(normal_entry),
catch_entries_(),
+ indirect_entries_(),
initial_definitions_(),
osr_id_(osr_id),
entry_count_(0),
@@ -2549,6 +2551,52 @@ void TargetEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
}
+void IndirectGotoInstr::ComputeOffsetTable(Isolate* isolate) {
+ if (GetBlock()->offset() < 0) {
+ // Don't generate a table when contained in an unreachable block.
+ return;
+ }
+ ASSERT(SuccessorCount() == offsets_.Capacity());
+ offsets_.SetLength(SuccessorCount());
+ for (intptr_t i = 0; i < SuccessorCount(); i++) {
+ TargetEntryInstr* target = SuccessorAt(i);
+ intptr_t offset = target->offset();
+
+ // The intermediate block might be compacted, if so, use the indirect entry.
+ if (offset < 0) {
+ // Optimizations might have modified the immediate target block, but it
+ // must end with a goto to the indirect entry. Also, we can't use
+ // last_instruction because 'target' is compacted/unreachable.
+ Instruction* last = target->next();
+ while (last != NULL && !last->IsGoto()) {
+ last = last->next();
+ }
+ ASSERT(last);
+ IndirectEntryInstr* ientry =
+ last->AsGoto()->successor()->AsIndirectEntry();
+ ASSERT(ientry != NULL);
+ ASSERT(ientry->indirect_id() == i);
+ offset = ientry->offset();
+ }
+
+ ASSERT(offset > 0);
+ offset -= Assembler::EntryPointToPcMarkerOffset();
+ offsets_.SetAt(i, Smi::ZoneHandle(isolate, Smi::New(offset)));
+ }
+}
+
+
+LocationSummary* IndirectEntryInstr::MakeLocationSummary(
+ Isolate* isolate, bool optimizing) const {
+ return JoinEntryInstr::MakeLocationSummary(isolate, optimizing);
+}
+
+
+void IndirectEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
+ JoinEntryInstr::EmitNativeCode(compiler);
+}
+
+
LocationSummary* PhiInstr::MakeLocationSummary(Isolate* isolate,
bool optimizing) const {
UNREACHABLE();
@@ -3339,6 +3387,23 @@ const char* MathUnaryInstr::KindToCString(MathUnaryKind kind) {
return "";
}
+typedef RawBool* (*CaseInsensitiveCompareUC16Function) (
+ RawString* string_raw,
+ RawSmi* lhs_index_raw,
+ RawSmi* rhs_index_raw,
+ RawSmi* length_raw);
+
+
+extern const RuntimeEntry kCaseInsensitiveCompareUC16RuntimeEntry(
+ "CaseInsensitiveCompareUC16", reinterpret_cast<RuntimeFunction>(
+ static_cast<CaseInsensitiveCompareUC16Function>(
+ &IRRegExpMacroAssembler::CaseInsensitiveCompareUC16)), 4, true, false);
+
+
+const RuntimeEntry& CaseInsensitiveCompareUC16Instr::TargetFunction() const {
+ return kCaseInsensitiveCompareUC16RuntimeEntry;
+}
+
MergedMathInstr::MergedMathInstr(ZoneGrowableArray<Value*>* inputs,
intptr_t deopt_id,
« no previous file with comments | « runtime/vm/intermediate_language.h ('k') | runtime/vm/intermediate_language_arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698