| Index: src/regexp-macro-assembler-irregexp.cc
|
| ===================================================================
|
| --- src/regexp-macro-assembler-irregexp.cc (revision 825)
|
| +++ src/regexp-macro-assembler-irregexp.cc (working copy)
|
| @@ -27,120 +27,121 @@
|
|
|
| #include "v8.h"
|
| #include "ast.h"
|
| -#include "bytecodes-re2k.h"
|
| -#include "assembler-re2k.h"
|
| -#include "assembler-re2k-inl.h"
|
| +#include "bytecodes-irregexp.h"
|
| +#include "assembler-irregexp.h"
|
| +#include "assembler-irregexp-inl.h"
|
| #include "regexp-macro-assembler.h"
|
| -#include "regexp-macro-assembler-re2k.h"
|
| +#include "regexp-macro-assembler-irregexp.h"
|
|
|
|
|
| namespace v8 { namespace internal {
|
|
|
|
|
| -RegExpMacroAssemblerRe2k::~RegExpMacroAssemblerRe2k() {
|
| +RegExpMacroAssemblerIrregexp::~RegExpMacroAssemblerIrregexp() {
|
| }
|
|
|
|
|
| -RegExpMacroAssemblerRe2k::Re2kImplementation
|
| -RegExpMacroAssemblerRe2k::Implementation() {
|
| +RegExpMacroAssemblerIrregexp::IrregexpImplementation
|
| +RegExpMacroAssemblerIrregexp::Implementation() {
|
| return kBytecodeImplementation;
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::Bind(Label* l) {
|
| +void RegExpMacroAssemblerIrregexp::Bind(Label* l) {
|
| assembler_->Bind(l);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::EmitOrLink(Label* l) {
|
| +void RegExpMacroAssemblerIrregexp::EmitOrLink(Label* l) {
|
| assembler_->EmitOrLink(l);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::PopRegister(int register_index) {
|
| +void RegExpMacroAssemblerIrregexp::PopRegister(int register_index) {
|
| assembler_->PopRegister(register_index);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::PushRegister(int register_index) {
|
| +void RegExpMacroAssemblerIrregexp::PushRegister(int register_index) {
|
| assembler_->PushRegister(register_index);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::WriteCurrentPositionToRegister(
|
| +void RegExpMacroAssemblerIrregexp::WriteCurrentPositionToRegister(
|
| int register_index) {
|
| assembler_->WriteCurrentPositionToRegister(register_index);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::ReadCurrentPositionFromRegister(
|
| +void RegExpMacroAssemblerIrregexp::ReadCurrentPositionFromRegister(
|
| int register_index) {
|
| assembler_->ReadCurrentPositionFromRegister(register_index);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::WriteStackPointerToRegister(int register_index) {
|
| +void RegExpMacroAssemblerIrregexp::WriteStackPointerToRegister(
|
| + int register_index) {
|
| assembler_->WriteStackPointerToRegister(register_index);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::ReadStackPointerFromRegister(
|
| +void RegExpMacroAssemblerIrregexp::ReadStackPointerFromRegister(
|
| int register_index) {
|
| assembler_->ReadStackPointerFromRegister(register_index);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::SetRegister(int register_index, int to) {
|
| +void RegExpMacroAssemblerIrregexp::SetRegister(int register_index, int to) {
|
| assembler_->SetRegister(register_index, to);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::AdvanceRegister(int register_index, int by) {
|
| +void RegExpMacroAssemblerIrregexp::AdvanceRegister(int register_index, int by) {
|
| assembler_->AdvanceRegister(register_index, by);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::PopCurrentPosition() {
|
| +void RegExpMacroAssemblerIrregexp::PopCurrentPosition() {
|
| assembler_->PopCurrentPosition();
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::PushCurrentPosition() {
|
| +void RegExpMacroAssemblerIrregexp::PushCurrentPosition() {
|
| assembler_->PushCurrentPosition();
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::Backtrack() {
|
| +void RegExpMacroAssemblerIrregexp::Backtrack() {
|
| assembler_->PopBacktrack();
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::GoTo(Label* l) {
|
| +void RegExpMacroAssemblerIrregexp::GoTo(Label* l) {
|
| assembler_->GoTo(l);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::PushBacktrack(Label* l) {
|
| +void RegExpMacroAssemblerIrregexp::PushBacktrack(Label* l) {
|
| assembler_->PushBacktrack(l);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::Succeed() {
|
| +void RegExpMacroAssemblerIrregexp::Succeed() {
|
| assembler_->Succeed();
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::Fail() {
|
| +void RegExpMacroAssemblerIrregexp::Fail() {
|
| assembler_->Fail();
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::AdvanceCurrentPosition(int by) {
|
| +void RegExpMacroAssemblerIrregexp::AdvanceCurrentPosition(int by) {
|
| assembler_->AdvanceCP(by);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::CheckCurrentPosition(
|
| +void RegExpMacroAssemblerIrregexp::CheckCurrentPosition(
|
| int register_index,
|
| Label* on_equal) {
|
| // TODO(erikcorry): Implement.
|
| @@ -148,40 +149,43 @@
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::LoadCurrentCharacter(int cp_offset,
|
| - Label* on_failure) {
|
| +void RegExpMacroAssemblerIrregexp::LoadCurrentCharacter(int cp_offset,
|
| + Label* on_failure) {
|
| assembler_->LoadCurrentChar(cp_offset, on_failure);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::CheckCharacterLT(uc16 limit, Label* on_less) {
|
| +void RegExpMacroAssemblerIrregexp::CheckCharacterLT(uc16 limit,
|
| + Label* on_less) {
|
| assembler_->CheckCharacterLT(limit, on_less);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::CheckCharacterGT(uc16 limit, Label* on_greater) {
|
| +void RegExpMacroAssemblerIrregexp::CheckCharacterGT(uc16 limit,
|
| + Label* on_greater) {
|
| assembler_->CheckCharacterGT(limit, on_greater);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::CheckCharacter(uc16 c, Label* on_equal) {
|
| +void RegExpMacroAssemblerIrregexp::CheckCharacter(uc16 c, Label* on_equal) {
|
| assembler_->CheckCharacter(c, on_equal);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::CheckNotCharacter(uc16 c, Label* on_not_equal) {
|
| +void RegExpMacroAssemblerIrregexp::CheckNotCharacter(uc16 c,
|
| + Label* on_not_equal) {
|
| assembler_->CheckNotCharacter(c, on_not_equal);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::CheckNotCharacterAfterOr(uc16 c,
|
| +void RegExpMacroAssemblerIrregexp::CheckNotCharacterAfterOr(uc16 c,
|
| uc16 mask,
|
| Label* on_not_equal) {
|
| assembler_->OrThenCheckNotCharacter(c, mask, on_not_equal);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::CheckNotCharacterAfterMinusOr(
|
| +void RegExpMacroAssemblerIrregexp::CheckNotCharacterAfterMinusOr(
|
| uc16 c,
|
| uc16 mask,
|
| Label* on_not_equal) {
|
| @@ -189,20 +193,20 @@
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::CheckNotBackReference(int start_reg,
|
| +void RegExpMacroAssemblerIrregexp::CheckNotBackReference(int start_reg,
|
| Label* on_not_equal) {
|
| assembler_->CheckNotBackReference(start_reg, on_not_equal);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::CheckBitmap(uc16 start,
|
| +void RegExpMacroAssemblerIrregexp::CheckBitmap(uc16 start,
|
| Label* bitmap,
|
| Label* on_zero) {
|
| assembler_->LookupMap1(start, bitmap, on_zero);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::DispatchHalfNibbleMap(
|
| +void RegExpMacroAssemblerIrregexp::DispatchHalfNibbleMap(
|
| uc16 start,
|
| Label* half_nibble_map,
|
| const Vector<Label*>& table) {
|
| @@ -210,14 +214,15 @@
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::DispatchByteMap(uc16 start,
|
| - Label* byte_map,
|
| - const Vector<Label*>& table) {
|
| +void RegExpMacroAssemblerIrregexp::DispatchByteMap(
|
| + uc16 start,
|
| + Label* byte_map,
|
| + const Vector<Label*>& table) {
|
| assembler_->LookupMap8(start, byte_map, table);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::DispatchHighByteMap(
|
| +void RegExpMacroAssemblerIrregexp::DispatchHighByteMap(
|
| byte start,
|
| Label* byte_map,
|
| const Vector<Label*>& table) {
|
| @@ -225,7 +230,7 @@
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::CheckCharacters(
|
| +void RegExpMacroAssemblerIrregexp::CheckCharacters(
|
| Vector<const uc16> str,
|
| int cp_offset,
|
| Label* on_failure) {
|
| @@ -236,23 +241,23 @@
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::IfRegisterLT(int register_index,
|
| - int comparand,
|
| - Label* if_less_than) {
|
| +void RegExpMacroAssemblerIrregexp::IfRegisterLT(int register_index,
|
| + int comparand,
|
| + Label* if_less_than) {
|
| ASSERT(comparand >= 0 && comparand <= 65535);
|
| assembler_->CheckRegisterLT(register_index, comparand, if_less_than);
|
| }
|
|
|
|
|
| -void RegExpMacroAssemblerRe2k::IfRegisterGE(int register_index,
|
| - int comparand,
|
| - Label* if_greater_or_equal) {
|
| +void RegExpMacroAssemblerIrregexp::IfRegisterGE(int register_index,
|
| + int comparand,
|
| + Label* if_greater_or_equal) {
|
| ASSERT(comparand >= 0 && comparand <= 65535);
|
| assembler_->CheckRegisterGE(register_index, comparand, if_greater_or_equal);
|
| }
|
|
|
|
|
| -Handle<Object> RegExpMacroAssemblerRe2k::GetCode() {
|
| +Handle<Object> RegExpMacroAssemblerIrregexp::GetCode() {
|
| Handle<ByteArray> array = Factory::NewByteArray(assembler_->length());
|
| assembler_->Copy(array->GetDataStartAddress());
|
| return array;
|
|
|