Author: [EMAIL PROTECTED]
Date: Thu Nov 27 05:54:31 2008
New Revision: 859
Added:
branches/bleeding_edge/src/regexp-macro-assembler-tracer.cc
branches/bleeding_edge/src/regexp-macro-assembler-tracer.h
Modified:
branches/bleeding_edge/src/SConscript
branches/bleeding_edge/src/assembler-ia32.cc
branches/bleeding_edge/src/assembler-ia32.h
branches/bleeding_edge/src/flag-definitions.h
branches/bleeding_edge/src/jsregexp.cc
branches/bleeding_edge/src/regexp-macro-assembler-ia32.cc
branches/bleeding_edge/test/cctest/test-regexp.cc
Log:
Made char comparisons work
Tracer for regexp macro-assembler instructions
Modified: branches/bleeding_edge/src/SConscript
==============================================================================
--- branches/bleeding_edge/src/SConscript (original)
+++ branches/bleeding_edge/src/SConscript Thu Nov 27 05:54:31 2008
@@ -65,7 +65,9 @@
'os:nullos': ['platform-nullos.cc'],
'os:win32': ['platform-win32.cc'],
'mode:release': [],
- 'mode:debug': ['objects-debug.cc', 'prettyprinter.cc']
+ 'mode:debug': [
+ 'objects-debug.cc', 'prettyprinter.cc', 'regexp-macro-assembler-tracer.cc'
+ ]
}
Modified: branches/bleeding_edge/src/assembler-ia32.cc
==============================================================================
--- branches/bleeding_edge/src/assembler-ia32.cc (original)
+++ branches/bleeding_edge/src/assembler-ia32.cc Thu Nov 27 05:54:31 2008
@@ -877,7 +877,7 @@
EMIT(0xA6); // CMPSB
}
-void Assembler::rep_cmpsw() {
+void Assembler::rep_cmpsl() {
EnsureSpace ensure_space(this);
last_pc_ = pc_;
EMIT(0xFC); // CLD to ensure forward operation
Modified: branches/bleeding_edge/src/assembler-ia32.h
==============================================================================
--- branches/bleeding_edge/src/assembler-ia32.h (original)
+++ branches/bleeding_edge/src/assembler-ia32.h Thu Nov 27 05:54:31 2008
@@ -499,7 +499,7 @@
void cmp(const Operand& op, const Immediate& imm);
void rep_cmpsb();
- void rep_cmpsw();
+ void rep_cmpsl();
void dec_b(Register dst);
Modified: branches/bleeding_edge/src/flag-definitions.h
==============================================================================
--- branches/bleeding_edge/src/flag-definitions.h (original)
+++ branches/bleeding_edge/src/flag-definitions.h Thu Nov 27 05:54:31 2008
@@ -202,7 +202,6 @@
// irregexp
DEFINE_bool(irregexp, false, "new regular expression code")
DEFINE_bool(trace_regexps, false, "trace Irregexp execution")
-DEFINE_bool(trace_regexp_bytecodes, false, "trace Irregexp bytecode
execution")
DEFINE_bool(irregexp_native, false, "use native code Irregexp
implementation (IA32 only)")
DEFINE_bool(disable_jscre, false, "abort if JSCRE is used. Only useful
with --irregexp")
@@ -295,6 +294,11 @@
DEFINE_bool(collect_heap_spill_statistics, false,
"report heap spill statistics along with heap_stats "
"(requires heap_stats)")
+
+// irregexp
+DEFINE_bool(trace_regexp_bytecodes, false, "trace Irregexp bytecode
execution")
+DEFINE_bool(trace_regexp_assembler, false,
+ "trace Irregexp macro assembler calls.")
//
// Logging and profiling only flags
Modified: branches/bleeding_edge/src/jsregexp.cc
==============================================================================
--- branches/bleeding_edge/src/jsregexp.cc (original)
+++ branches/bleeding_edge/src/jsregexp.cc Thu Nov 27 05:54:31 2008
@@ -42,6 +42,7 @@
#include "parser.h"
#include "assembler-irregexp.h"
#include "regexp-macro-assembler.h"
+#include "regexp-macro-assembler-tracer.h"
#include "regexp-macro-assembler-irregexp.h"
#ifdef ARM
@@ -945,11 +946,16 @@
RegExpMacroAssembler* macro_assembler,
RegExpNode* start,
int capture_count) {
- macro_assembler_ = macro_assembler;
+#ifdef DEBUG
+ if (FLAG_trace_regexp_assembler)
+ macro_assembler_ = new RegExpMacroAssemblerTracer(macro_assembler);
+ else
+#endif
+ macro_assembler_ = macro_assembler;
List <RegExpNode*> work_list(0);
work_list_ = &work_list;
Label fail;
- macro_assembler->PushBacktrack(&fail);
+ macro_assembler_->PushBacktrack(&fail);
if (!start->GoTo(this)) {
fail.Unuse();
return Handle<FixedArray>::null();
@@ -960,19 +966,24 @@
return Handle<FixedArray>::null();
}
}
- macro_assembler->Bind(&fail);
- macro_assembler->Fail();
+ macro_assembler_->Bind(&fail);
+ macro_assembler_->Fail();
Handle<FixedArray> array =
Factory::NewFixedArray(RegExpImpl::kIrregexpDataLength);
array->set(RegExpImpl::kIrregexpImplementationIndex,
- Smi::FromInt(macro_assembler->Implementation()));
+ Smi::FromInt(macro_assembler_->Implementation()));
array->set(RegExpImpl::kIrregexpNumberOfRegistersIndex,
Smi::FromInt(next_register_));
array->set(RegExpImpl::kIrregexpNumberOfCapturesIndex,
Smi::FromInt(capture_count));
- Handle<Object> code = macro_assembler->GetCode();
+ Handle<Object> code = macro_assembler_->GetCode();
array->set(RegExpImpl::kIrregexpCodeIndex, *code);
work_list_ = NULL;
+#ifdef DEBUG
+ if (FLAG_trace_regexp_assembler) {
+ delete macro_assembler_;
+ }
+#endif
return array;
}
Modified: branches/bleeding_edge/src/regexp-macro-assembler-ia32.cc
==============================================================================
--- branches/bleeding_edge/src/regexp-macro-assembler-ia32.cc (original)
+++ branches/bleeding_edge/src/regexp-macro-assembler-ia32.cc Thu Nov 27
05:54:31 2008
@@ -192,13 +192,8 @@
__ mov(ebx, esi);
__ lea(edi, Operand(esi, edi, times_1, byte_offset));
LoadConstantBufferAddress(esi, &constant_buffer);
- __ mov(ecx, str.length());
- if (mode_ == ASCII) {
- __ rep_cmpsb();
- } else {
- ASSERT(mode_ == UC16);
- __ rep_cmpsw();
- }
+ __ mov(ecx, str.length() * char_size());
+ __ rep_cmpsb();
__ mov(esi, ebx);
__ mov(edi, eax);
BranchOrBacktrack(not_equal, on_failure);
@@ -229,11 +224,11 @@
__ push(esi);
__ add(edi, Operand(esi));
__ add(esi, Operand(eax));
- if (mode_ == ASCII) {
- __ rep_cmpsb();
- } else {
- __ rep_cmpsw();
+ if (char_size() > 0) {
+ ASSERT(char_size() == 2);
+ __ add(ecx, Operand(ecx));
}
+ __ rep_cmpsb();
__ pop(esi);
__ mov(edi, Operand(ebx));
BranchOrBacktrack(not_equal, on_no_match);
@@ -397,8 +392,9 @@
for (int i = 0; i < num_saved_registers_; i++) {
__ mov(eax, register_location(i));
__ add(eax, Operand(ecx)); // Convert to index from start, not end.
- if (char_size() == 2) {
- __ shr(eax);
+ if (char_size() > 1) {
+ ASSERT(char_size() == 2);
+ __ sar(eax, 1); // Convert to character index, not byte.
}
__ mov(Operand(ebx, i * kPointerSize), eax);
}
Added: branches/bleeding_edge/src/regexp-macro-assembler-tracer.cc
==============================================================================
--- (empty file)
+++ branches/bleeding_edge/src/regexp-macro-assembler-tracer.cc Thu Nov 27
05:54:31 2008
@@ -0,0 +1,287 @@
+// Copyright 2008 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "v8.h"
+#include "ast.h"
+#include "regexp-macro-assembler.h"
+#include "regexp-macro-assembler-tracer.h"
+
+namespace v8 { namespace internal {
+
+RegExpMacroAssemblerTracer::RegExpMacroAssemblerTracer(
+ RegExpMacroAssembler* assembler) :
+ assembler_(assembler) {
+ unsigned int type = assembler->Implementation();
+ ASSERT(type < 3);
+ const char* impl_names[3] = {"IA32", "ARM", "Bytecode"};
+ PrintF("RegExpMacroAssembler%s();\n", impl_names[type]);
+}
+
+RegExpMacroAssemblerTracer::~RegExpMacroAssemblerTracer() {
+}
+
+void RegExpMacroAssemblerTracer::Bind(Label* label) {
+ PrintF("label[%08x]: (Bind)\n", label, label);
+ assembler_->Bind(label);
+}
+
+void RegExpMacroAssemblerTracer::EmitOrLink(Label* label) {
+ PrintF(" EmitOrLink(label[%08x]);\n", label);
+ assembler_->EmitOrLink(label);
+}
+
+void RegExpMacroAssemblerTracer::AdvanceCurrentPosition(int by) {
+ PrintF(" AdvanceCurrentPosition(by=%d);\n", by);
+ assembler_->AdvanceCurrentPosition(by);
+}
+
+void RegExpMacroAssemblerTracer::PopCurrentPosition() {
+ PrintF(" PopCurrentPosition();\n");
+ assembler_->PopCurrentPosition();
+}
+
+void RegExpMacroAssemblerTracer::PushCurrentPosition() {
+ PrintF(" PushCurrentPosition();\n");
+ assembler_->PushCurrentPosition();
+}
+
+void RegExpMacroAssemblerTracer::Backtrack() {
+ PrintF(" Backtrack();\n");
+ assembler_->Backtrack();
+}
+
+void RegExpMacroAssemblerTracer::GoTo(Label* label) {
+ PrintF(" GoTo(label[%08x]);\n\n", label);
+ assembler_->GoTo(label);
+}
+
+void RegExpMacroAssemblerTracer::PushBacktrack(Label* label) {
+ PrintF(" PushBacktrack(label[%08x]);\n", label);
+ assembler_->PushBacktrack(label);
+}
+
+void RegExpMacroAssemblerTracer::Succeed() {
+ PrintF(" Succeed();\n");
+ assembler_->Succeed();
+}
+
+void RegExpMacroAssemblerTracer::Fail() {
+ PrintF(" Fail();\n");
+ assembler_->Fail();
+}
+
+void RegExpMacroAssemblerTracer::PopRegister(int register_index) {
+ PrintF(" PopRegister(register=%d);\n", register_index);
+ assembler_->PopRegister(register_index);
+}
+
+void RegExpMacroAssemblerTracer::PushRegister(int register_index) {
+ PrintF(" PushRegister(register=%d);\n", register_index);
+ assembler_->PushRegister(register_index);
+}
+
+void RegExpMacroAssemblerTracer::AdvanceRegister(int reg, int by) {
+ PrintF(" AdvanceRegister(register=%d, by=%d);\n", reg, by);
+ assembler_->AdvanceRegister(reg, by);
+}
+
+void RegExpMacroAssemblerTracer::SetRegister(int register_index, int to) {
+ PrintF(" SetRegister(register=%d, to=%d);\n", register_index, to);
+ assembler_->SetRegister(register_index, to);
+}
+
+void RegExpMacroAssemblerTracer::WriteCurrentPositionToRegister(int reg) {
+ PrintF(" WriteCurrentPositionToRegister(register=%d);\n", reg);
+ assembler_->WriteCurrentPositionToRegister(reg);
+}
+
+void RegExpMacroAssemblerTracer::ReadCurrentPositionFromRegister(int reg) {
+ PrintF(" ReadCurrentPositionFromRegister(register=%d);\n", reg);
+ assembler_->ReadCurrentPositionFromRegister(reg);
+}
+
+void RegExpMacroAssemblerTracer::WriteStackPointerToRegister(int reg) {
+ PrintF(" WriteStackPointerToRegister(register=%d);\n", reg);
+ assembler_->WriteStackPointerToRegister(reg);
+}
+
+void RegExpMacroAssemblerTracer::ReadStackPointerFromRegister(int reg) {
+ PrintF(" ReadStackPointerFromRegister(register=%d);\n", reg);
+ assembler_->ReadStackPointerFromRegister(reg);
+}
+
+void RegExpMacroAssemblerTracer::LoadCurrentCharacter(int cp_offset,
+ Label*
on_end_of_input) {
+ PrintF(" LoadCurrentCharacter(cp_offset=%d, label[%08x]);\n", cp_offset,
+ on_end_of_input);
+ assembler_->LoadCurrentCharacter(cp_offset, on_end_of_input);
+}
+
+void RegExpMacroAssemblerTracer::CheckCharacterLT(uc16 limit, Label*
on_less) {
+ PrintF(" CheckCharacterLT(c='u%04x', label[%08x]);\n", limit, on_less);
+ assembler_->CheckCharacterLT(limit, on_less);
+}
+
+void RegExpMacroAssemblerTracer::CheckCharacterGT(uc16 limit,
+ Label* on_greater) {
+ PrintF(" CheckCharacterGT(c='u%04x', label[%08x]);\n", limit,
on_greater);
+ assembler_->CheckCharacterGT(limit, on_greater);
+}
+
+void RegExpMacroAssemblerTracer::CheckCharacter(uc16 c, Label* on_equal) {
+ PrintF(" CheckCharacter(c='u%04x', label[%08x]);\n", c, on_equal);
+ assembler_->CheckCharacter(c, on_equal);
+}
+
+void RegExpMacroAssemblerTracer::CheckNotCharacter(uc16 c,
+ Label* on_not_equal) {
+ PrintF(" CheckNotCharacter(c='u%04x', label[%08x]);\n", c, on_not_equal);
+ assembler_->CheckNotCharacter(c, on_not_equal);
+}
+
+void RegExpMacroAssemblerTracer::CheckNotCharacterAfterOr(uc16 c, uc16
mask,
+ Label*
on_not_equal) {
+ PrintF(" CheckNotCharacterAfterOr(c='u%04x', mask=0x%04x,
label[%08x]);\n", c,
+ mask, on_not_equal);
+ assembler_->CheckNotCharacterAfterOr(c, mask, on_not_equal);
+}
+
+void RegExpMacroAssemblerTracer::CheckNotCharacterAfterMinusOr(
+ uc16 c,
+ uc16 mask,
+ Label* on_not_equal) {
+ PrintF(" CheckNotCharacterAfterMinusOr(c='u%04x', mask=0x%04x, "
+ "label[%08x]);\n", c, mask, on_not_equal);
+ assembler_->CheckNotCharacterAfterMinusOr(c, mask, on_not_equal);
+}
+
+void RegExpMacroAssemblerTracer::CheckNotBackReference(int start_reg,
+ Label* on_no_match)
{
+ PrintF(" CheckNotBackReference(register=%d, label[%08x]);\n", start_reg,
+ on_no_match);
+ assembler_->CheckNotBackReference(start_reg, on_no_match);
+}
+
+void RegExpMacroAssemblerTracer::CheckNotBackReferenceIgnoreCase(
+ int start_reg,
+ Label* on_no_match) {
+ PrintF(" CheckNotBackReferenceIgnoreCase(register=%d, label[%08x]);\n",
+ start_reg, on_no_match);
+ assembler_->CheckNotBackReferenceIgnoreCase(start_reg, on_no_match);
+}
+
+void RegExpMacroAssemblerTracer::CheckCharacters(Vector<const uc16> str,
+ int cp_offset,
+ Label* on_failure) {
+ PrintF(" CheckCharacters(str=\"");
+ for (int i = 0; i < str.length(); i++) {
+ PrintF("u%04x", str[i]);
+ }
+ PrintF("\", cp_offset=%d, label[%08x])\n", cp_offset, on_failure);
+ assembler_->CheckCharacters(str, cp_offset, on_failure);
+}
+
+void RegExpMacroAssemblerTracer::CheckCurrentPosition(int register_index,
+ Label* on_equal) {
+ PrintF(" CheckCurrentPosition(register=%d, label[%08x]);\n",
register_index,
+ on_equal);
+ assembler_->CheckCurrentPosition(register_index, on_equal);
+}
+
+void RegExpMacroAssemblerTracer::CheckBitmap(uc16 start, Label* bitmap,
+ Label* on_zero) {
+ PrintF(" CheckBitmap(start=u$04x, <bitmap>, label[%08x]);\n", start,
on_zero);
+ assembler_->CheckBitmap(start, bitmap, on_zero);
+}
+
+void RegExpMacroAssemblerTracer::DispatchHalfNibbleMap(
+ uc16 start,
+ Label* half_nibble_map,
+ const Vector<Label*>& destinations) {
+ PrintF(" DispatchHalfNibbleMap(start=u$04x, <half_nibble_map>, [",
start);
+ for (int i = 0; i < destinations.length(); i++) {
+ if (i > 0)
+ PrintF(", ");
+ PrintF("label[%08x]", destinations[i]);
+ }
+ PrintF(");\n");
+ assembler_->DispatchHalfNibbleMap(start, half_nibble_map, destinations);
+}
+
+void RegExpMacroAssemblerTracer::DispatchByteMap(
+ uc16 start,
+ Label* byte_map,
+ const Vector<Label*>& destinations) {
+ PrintF(" DispatchByteMap(start=u$04x, <byte_map>, [", start);
+ for (int i = 0; i < destinations.length(); i++) {
+ if (i > 0)
+ PrintF(", ");
+ PrintF("label[%08x]", destinations[i]);
+ }
+ PrintF(");\n");
+ assembler_->DispatchByteMap(start, byte_map, destinations);
+}
+
+void RegExpMacroAssemblerTracer::DispatchHighByteMap(
+ byte start,
+ Label* byte_map,
+ const Vector<Label*>& destinations) {
+ PrintF(" DispatchHighByteMap(start=u$04x, <byte_map>, [", start);
+ for (int i = 0; i < destinations.length(); i++) {
+ if (i > 0)
+ PrintF(", ");
+ PrintF("label[%08x]", destinations[i]);
+ }
+ PrintF(");\n");
+ assembler_->DispatchHighByteMap(start, byte_map, destinations);
+}
+
+void RegExpMacroAssemblerTracer::IfRegisterLT(int register_index,
+ int comparand, Label* if_lt)
{
+ PrintF(" IfRegisterLT(register=%d, number=%d, label[%08x]);\n",
+ register_index, comparand, if_lt);
+ assembler_->IfRegisterLT(register_index, comparand, if_lt);
+}
+
+void RegExpMacroAssemblerTracer::IfRegisterGE(int register_index,
+ int comparand, Label* if_ge)
{
+ PrintF(" IfRegisterGE(register=%d, number=%d, label[%08x]);\n",
+ register_index, comparand, if_ge);
+ assembler_->IfRegisterGE(register_index, comparand, if_ge);
+}
+
+RegExpMacroAssembler::IrregexpImplementation
+ RegExpMacroAssemblerTracer::Implementation() {
+ return assembler_->Implementation();
+}
+
+Handle<Object> RegExpMacroAssemblerTracer::GetCode() {
+ PrintF(" GetCode();\n");
+ return assembler_->GetCode();
+}
+
+}} // namespace v8::internal
Added: branches/bleeding_edge/src/regexp-macro-assembler-tracer.h
==============================================================================
--- (empty file)
+++ branches/bleeding_edge/src/regexp-macro-assembler-tracer.h Thu Nov 27
05:54:31 2008
@@ -0,0 +1,101 @@
+// Copyright 2008 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef REGEXP_MACRO_ASSEMBLER_TRACER_H_
+#define REGEXP_MACRO_ASSEMBLER_TRACER_H_
+
+namespace v8 { namespace internal {
+
+// Decorator on a RegExpMacroAssembler that write all calls.
+class RegExpMacroAssemblerTracer: public RegExpMacroAssembler {
+ public:
+ explicit RegExpMacroAssemblerTracer(RegExpMacroAssembler* assembler);
+ virtual ~RegExpMacroAssemblerTracer();
+
+ virtual void AdvanceCurrentPosition(int by); // Signed cp change.
+ virtual void AdvanceRegister(int reg, int by); // r[reg] += by.
+ virtual void Backtrack();
+ virtual void Bind(Label* label);
+ virtual void CheckBitmap(uc16 start, Label* bitmap, Label* on_zero);
+ virtual void CheckCharacter(uc16 c, Label* on_equal);
+ virtual void CheckCharacterGT(uc16 limit, Label* on_greater);
+ virtual void CheckCharacterLT(uc16 limit, Label* on_less);
+ virtual void CheckCharacters(
+ Vector<const uc16> str,
+ int cp_offset,
+ Label* on_failure);
+ virtual void CheckCurrentPosition(
+ int register_index,
+ Label* on_equal);
+ virtual void CheckNotBackReference(int start_reg, Label* on_no_match);
+ virtual void CheckNotBackReferenceIgnoreCase(int start_reg,
+ Label* on_no_match);
+ virtual void CheckNotCharacter(uc16 c, Label* on_not_equal);
+ virtual void CheckNotCharacterAfterOr(uc16 c,
+ uc16 or_with,
+ Label* on_not_equal);
+ virtual void CheckNotCharacterAfterMinusOr(uc16 c,
+ uc16 minus_then_or_with,
+ Label* on_not_equal);
+ virtual void DispatchByteMap(
+ uc16 start,
+ Label* byte_map,
+ const Vector<Label*>& destinations);
+ virtual void DispatchHalfNibbleMap(
+ uc16 start,
+ Label* half_nibble_map,
+ const Vector<Label*>& destinations);
+ virtual void DispatchHighByteMap(
+ byte start,
+ Label* byte_map,
+ const Vector<Label*>& destinations);
+ virtual void EmitOrLink(Label* label);
+ virtual void Fail();
+ virtual Handle<Object> GetCode();
+ virtual void GoTo(Label* label);
+ virtual void IfRegisterGE(int reg, int comparand, Label* if_ge);
+ virtual void IfRegisterLT(int reg, int comparand, Label* if_lt);
+ virtual IrregexpImplementation Implementation();
+ virtual void LoadCurrentCharacter(int cp_offset, Label* on_end_of_input);
+ virtual void PopCurrentPosition();
+ virtual void PopRegister(int register_index);
+ virtual void PushBacktrack(Label* label);
+ virtual void PushCurrentPosition();
+ virtual void PushRegister(int register_index);
+ virtual void ReadCurrentPositionFromRegister(int reg);
+ virtual void ReadStackPointerFromRegister(int reg);
+ virtual void SetRegister(int register_index, int to);
+ virtual void Succeed();
+ virtual void WriteCurrentPositionToRegister(int reg);
+ virtual void WriteStackPointerToRegister(int reg);
+ private:
+ RegExpMacroAssembler* assembler_;
+};
+
+}} // namespace v8::internal
+
+#endif // REGEXP_MACRO_ASSEMBLER_TRACER_H_
Modified: branches/bleeding_edge/test/cctest/test-regexp.cc
==============================================================================
--- branches/bleeding_edge/test/cctest/test-regexp.cc (original)
+++ branches/bleeding_edge/test/cctest/test-regexp.cc Thu Nov 27 05:54:31
2008
@@ -811,6 +811,65 @@
}
+TEST(MacroAssemblerIA32SimpleUC16) {
+ typedef bool (*UC16Test) (
+ SeqTwoByteString** base, int start_index, int end_index, int*
captures);
+
+ V8::Initialize(NULL);
+
+ // regexp-macro-assembler-ia32 needs a handle scope to allocate
+ // byte-arrays for constants.
+ v8::HandleScope scope;
+
+ RegExpMacroAssemblerIA32 m(RegExpMacroAssemblerIA32::UC16, 4);
+
+ uc16 foo_chars[3] = {'f', 'o', 'o'};
+ Vector<const uc16> foo(foo_chars, 3);
+
+ Label fail;
+ m.CheckCharacters(foo, 0, &fail);
+ m.WriteCurrentPositionToRegister(0);
+ m.AdvanceCurrentPosition(3);
+ m.WriteCurrentPositionToRegister(1);
+ m.Succeed();
+ m.Bind(&fail);
+ m.Fail();
+
+ Handle<Object> code_object = m.GetCode();
+ Handle<Code> code = Handle<Code>::cast(code_object);
+ UC16Test test = FUNCTION_CAST<UC16Test>(code->entry());
+
+ int captures[4] = {42, 37, 87, 117};
+ const uc16 input_data[6] = {'f', 'o', 'o', 'f', 'o', '\xa0'};
+ Handle<String> input =
+ Factory::NewStringFromTwoByte(Vector<const uc16>(input_data, 6));
+ Handle<SeqTwoByteString> seq_input =
Handle<SeqTwoByteString>::cast(input);
+ Address start_adr = seq_input->GetCharsAddress();
+ int start_offset = start_adr - reinterpret_cast<Address>(*seq_input);
+ int end_offset = start_offset + seq_input->length() * sizeof(uc16);
+
+ bool success =
+ test(seq_input.location(), start_offset, end_offset, captures);
+
+ CHECK(success);
+ CHECK_EQ(0, captures[0]);
+ CHECK_EQ(3, captures[1]);
+ CHECK_EQ(-1, captures[2]);
+ CHECK_EQ(-1, captures[3]);
+
+ const uc16 input_data2[9] =
{'b', 'a', 'r', 'b', 'a', 'r', 'b', 'a', '\xa0'};
+ input = Factory::NewStringFromTwoByte(Vector<const uc16>(input_data2,
9));
+ seq_input = Handle<SeqTwoByteString>::cast(input);
+ start_adr = seq_input->GetCharsAddress();
+ start_offset = start_adr - reinterpret_cast<Address>(*seq_input);
+ end_offset = start_offset + seq_input->length() * sizeof(uc16);
+
+ success = test(seq_input.location(), start_offset, end_offset, captures);
+
+ CHECK(!success);
+}
+
+
TEST(MacroAssemblerIA32Backtrack) {
typedef bool (*AsciiTest) (
SeqAsciiString** base, int start_index, int end_index, int*
captures);
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
