S390: Initial impl of regexp
R=danno@chromium.org,jkummerow@chromium.org,jochen@chromium.org,joransiu@ca.ibm.com,michael_dawson@ca.ibm.com,mbrandy@us.ibm.com BUG= Review URL: https://codereview.chromium.org/1768383002 Cr-Commit-Position: refs/heads/master@{#34592}
This commit is contained in:
parent
8f506ac6a6
commit
be33a9d89d
8
BUILD.gn
8
BUILD.gn
@ -1657,14 +1657,16 @@ source_set("v8_base") {
|
||||
"src/ic/s390/ic-compiler-s390.cc",
|
||||
"src/ic/s390/ic-s390.cc",
|
||||
"src/ic/s390/stub-cache-s390.cc",
|
||||
"src/s390/assembler-s390-inl.h",
|
||||
"src/regexp/s390/regexp-macro-assembler-s390.cc",
|
||||
"src/regexp/s390/regexp-macro-assembler-s390.h",
|
||||
"src/s390/assembler-s390.cc",
|
||||
"src/s390/assembler-s390.h",
|
||||
"src/s390/assembler-s390-inl.h",
|
||||
"src/s390/builtins-s390.cc",
|
||||
"src/s390/code-stubs-s390.cc",
|
||||
"src/s390/code-stubs-s390.h",
|
||||
"src/s390/codegen-s390.cc",
|
||||
"src/s390/codegen-s390.h",
|
||||
"src/s390/code-stubs-s390.cc",
|
||||
"src/s390/code-stubs-s390.h",
|
||||
"src/s390/constants-s390.cc",
|
||||
"src/s390/constants-s390.h",
|
||||
"src/s390/cpu-s390.cc",
|
||||
|
@ -41,6 +41,8 @@
|
||||
#include "src/regexp/arm/regexp-macro-assembler-arm.h"
|
||||
#elif V8_TARGET_ARCH_PPC
|
||||
#include "src/regexp/ppc/regexp-macro-assembler-ppc.h"
|
||||
#elif V8_TARGET_ARCH_S390
|
||||
#include "src/regexp/s390/regexp-macro-assembler-s390.h"
|
||||
#elif V8_TARGET_ARCH_MIPS
|
||||
#include "src/regexp/mips/regexp-macro-assembler-mips.h"
|
||||
#elif V8_TARGET_ARCH_MIPS64
|
||||
@ -6703,6 +6705,9 @@ RegExpEngine::CompilationResult RegExpEngine::Compile(
|
||||
#elif V8_TARGET_ARCH_ARM64
|
||||
RegExpMacroAssemblerARM64 macro_assembler(isolate, zone, mode,
|
||||
(data->capture_count + 1) * 2);
|
||||
#elif V8_TARGET_ARCH_S390
|
||||
RegExpMacroAssemblerS390 macro_assembler(isolate, zone, mode,
|
||||
(data->capture_count + 1) * 2);
|
||||
#elif V8_TARGET_ARCH_PPC
|
||||
RegExpMacroAssemblerPPC macro_assembler(isolate, zone, mode,
|
||||
(data->capture_count + 1) * 2);
|
||||
|
@ -40,6 +40,7 @@ class RegExpMacroAssembler {
|
||||
kARMImplementation,
|
||||
kARM64Implementation,
|
||||
kMIPSImplementation,
|
||||
kS390Implementation,
|
||||
kPPCImplementation,
|
||||
kX64Implementation,
|
||||
kX87Implementation,
|
||||
|
1256
src/regexp/s390/regexp-macro-assembler-s390.cc
Normal file
1256
src/regexp/s390/regexp-macro-assembler-s390.cc
Normal file
File diff suppressed because it is too large
Load Diff
216
src/regexp/s390/regexp-macro-assembler-s390.h
Normal file
216
src/regexp/s390/regexp-macro-assembler-s390.h
Normal file
@ -0,0 +1,216 @@
|
||||
// Copyright 2015 the V8 project authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef V8_S390_REGEXP_MACRO_ASSEMBLER_S390_H_
|
||||
#define V8_S390_REGEXP_MACRO_ASSEMBLER_S390_H_
|
||||
|
||||
#include "src/macro-assembler.h"
|
||||
#include "src/regexp/regexp-macro-assembler.h"
|
||||
#include "src/s390/assembler-s390.h"
|
||||
#include "src/s390/frames-s390.h"
|
||||
|
||||
namespace v8 {
|
||||
namespace internal {
|
||||
|
||||
#ifndef V8_INTERPRETED_REGEXP
|
||||
class RegExpMacroAssemblerS390 : public NativeRegExpMacroAssembler {
|
||||
public:
|
||||
RegExpMacroAssemblerS390(Isolate* isolate, Zone* zone, Mode mode,
|
||||
int registers_to_save);
|
||||
virtual ~RegExpMacroAssemblerS390();
|
||||
virtual int stack_limit_slack();
|
||||
virtual void AdvanceCurrentPosition(int by);
|
||||
virtual void AdvanceRegister(int reg, int by);
|
||||
virtual void Backtrack();
|
||||
virtual void Bind(Label* label);
|
||||
virtual void CheckAtStart(Label* on_at_start);
|
||||
virtual void CheckCharacter(unsigned c, Label* on_equal);
|
||||
virtual void CheckCharacterAfterAnd(unsigned c, unsigned mask,
|
||||
Label* on_equal);
|
||||
virtual void CheckCharacterGT(uc16 limit, Label* on_greater);
|
||||
virtual void CheckCharacterLT(uc16 limit, Label* on_less);
|
||||
// A "greedy loop" is a loop that is both greedy and with a simple
|
||||
// body. It has a particularly simple implementation.
|
||||
virtual void CheckGreedyLoop(Label* on_tos_equals_current_position);
|
||||
virtual void CheckNotAtStart(int cp_offset, Label* on_not_at_start);
|
||||
virtual void CheckNotBackReference(int start_reg, bool read_backward,
|
||||
Label* on_no_match);
|
||||
virtual void CheckNotBackReferenceIgnoreCase(int start_reg,
|
||||
bool read_backward, bool unicode,
|
||||
Label* on_no_match);
|
||||
virtual void CheckNotCharacter(unsigned c, Label* on_not_equal);
|
||||
virtual void CheckNotCharacterAfterAnd(unsigned c, unsigned mask,
|
||||
Label* on_not_equal);
|
||||
virtual void CheckNotCharacterAfterMinusAnd(uc16 c, uc16 minus, uc16 mask,
|
||||
Label* on_not_equal);
|
||||
virtual void CheckCharacterInRange(uc16 from, uc16 to, Label* on_in_range);
|
||||
virtual void CheckCharacterNotInRange(uc16 from, uc16 to,
|
||||
Label* on_not_in_range);
|
||||
virtual void CheckBitInTable(Handle<ByteArray> table, Label* on_bit_set);
|
||||
|
||||
// Checks whether the given offset from the current position is before
|
||||
// the end of the string.
|
||||
virtual void CheckPosition(int cp_offset, Label* on_outside_input);
|
||||
virtual bool CheckSpecialCharacterClass(uc16 type, Label* on_no_match);
|
||||
virtual void Fail();
|
||||
virtual Handle<HeapObject> GetCode(Handle<String> source);
|
||||
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 void IfRegisterEqPos(int reg, Label* if_eq);
|
||||
virtual IrregexpImplementation Implementation();
|
||||
virtual void LoadCurrentCharacter(int cp_offset, Label* on_end_of_input,
|
||||
bool check_bounds = true,
|
||||
int characters = 1);
|
||||
virtual void PopCurrentPosition();
|
||||
virtual void PopRegister(int register_index);
|
||||
virtual void PushBacktrack(Label* label);
|
||||
virtual void PushCurrentPosition();
|
||||
virtual void PushRegister(int register_index,
|
||||
StackCheckFlag check_stack_limit);
|
||||
virtual void ReadCurrentPositionFromRegister(int reg);
|
||||
virtual void ReadStackPointerFromRegister(int reg);
|
||||
virtual void SetCurrentPositionFromEnd(int by);
|
||||
virtual void SetRegister(int register_index, int to);
|
||||
virtual bool Succeed();
|
||||
virtual void WriteCurrentPositionToRegister(int reg, int cp_offset);
|
||||
virtual void ClearRegisters(int reg_from, int reg_to);
|
||||
virtual void WriteStackPointerToRegister(int reg);
|
||||
virtual bool CanReadUnaligned();
|
||||
|
||||
// Called from RegExp if the stack-guard is triggered.
|
||||
// If the code object is relocated, the return address is fixed before
|
||||
// returning.
|
||||
static int CheckStackGuardState(Address* return_address, Code* re_code,
|
||||
Address re_frame);
|
||||
|
||||
private:
|
||||
// Offsets from frame_pointer() of function parameters and stored registers.
|
||||
static const int kFramePointer = 0;
|
||||
|
||||
// Above the frame pointer - Stored registers and stack passed parameters.
|
||||
// Register 6-15(sp)
|
||||
static const int kStoredRegisters = kFramePointer;
|
||||
static const int kCallerFrame =
|
||||
kStoredRegisters + kCalleeRegisterSaveAreaSize;
|
||||
// Stack parameters placed by caller.
|
||||
static const int kCaptureArraySize = kCallerFrame;
|
||||
static const int kStackAreaBase = kCallerFrame + kPointerSize;
|
||||
// kDirectCall again
|
||||
static const int kSecondaryReturnAddress = kStackAreaBase + 2 * kPointerSize;
|
||||
static const int kIsolate = kSecondaryReturnAddress + kPointerSize;
|
||||
|
||||
// Below the frame pointer.
|
||||
// Register parameters stored by setup code.
|
||||
static const int kDirectCall = kFramePointer - kPointerSize;
|
||||
static const int kStackHighEnd = kDirectCall - kPointerSize;
|
||||
static const int kNumOutputRegisters = kStackHighEnd - kPointerSize;
|
||||
static const int kRegisterOutput = kNumOutputRegisters - kPointerSize;
|
||||
static const int kInputEnd = kRegisterOutput - kPointerSize;
|
||||
static const int kInputStart = kInputEnd - kPointerSize;
|
||||
static const int kStartIndex = kInputStart - kPointerSize;
|
||||
static const int kInputString = kStartIndex - kPointerSize;
|
||||
// When adding local variables remember to push space for them in
|
||||
// the frame in GetCode.
|
||||
static const int kSuccessfulCaptures = kInputString - kPointerSize;
|
||||
static const int kStringStartMinusOne = kSuccessfulCaptures - kPointerSize;
|
||||
// First register address. Following registers are below it on the stack.
|
||||
static const int kRegisterZero = kStringStartMinusOne - kPointerSize;
|
||||
|
||||
// Initial size of code buffer.
|
||||
static const size_t kRegExpCodeSize = 1024;
|
||||
|
||||
// Load a number of characters at the given offset from the
|
||||
// current position, into the current-character register.
|
||||
void LoadCurrentCharacterUnchecked(int cp_offset, int character_count);
|
||||
|
||||
// Check whether preemption has been requested.
|
||||
void CheckPreemption();
|
||||
|
||||
// Check whether we are exceeding the stack limit on the backtrack stack.
|
||||
void CheckStackLimit();
|
||||
void CallCFunctionUsingStub(ExternalReference function, int num_arguments);
|
||||
|
||||
// Generate a call to CheckStackGuardState.
|
||||
void CallCheckStackGuardState(Register scratch);
|
||||
|
||||
// The ebp-relative location of a regexp register.
|
||||
MemOperand register_location(int register_index);
|
||||
|
||||
// Register holding the current input position as negative offset from
|
||||
// the end of the string.
|
||||
inline Register current_input_offset() { return r8; }
|
||||
|
||||
// The register containing the current character after LoadCurrentCharacter.
|
||||
inline Register current_character() { return r9; }
|
||||
|
||||
// Register holding address of the end of the input string.
|
||||
inline Register end_of_input_address() { return r10; }
|
||||
|
||||
// Register holding the frame address. Local variables, parameters and
|
||||
// regexp registers are addressed relative to this.
|
||||
inline Register frame_pointer() { return fp; }
|
||||
|
||||
// The register containing the backtrack stack top. Provides a meaningful
|
||||
// name to the register.
|
||||
inline Register backtrack_stackpointer() { return r13; }
|
||||
|
||||
// Register holding pointer to the current code object.
|
||||
inline Register code_pointer() { return r7; }
|
||||
|
||||
// Byte size of chars in the string to match (decided by the Mode argument)
|
||||
inline int char_size() { return static_cast<int>(mode_); }
|
||||
|
||||
// Equivalent to a conditional branch to the label, unless the label
|
||||
// is NULL, in which case it is a conditional Backtrack.
|
||||
void BranchOrBacktrack(Condition condition, Label* to, CRegister cr = cr7);
|
||||
|
||||
// Call and return internally in the generated code in a way that
|
||||
// is GC-safe (i.e., doesn't leave absolute code addresses on the stack)
|
||||
inline void SafeCall(Label* to, Condition cond = al, CRegister cr = cr7);
|
||||
inline void SafeReturn();
|
||||
inline void SafeCallTarget(Label* name);
|
||||
|
||||
// Pushes the value of a register on the backtrack stack. Decrements the
|
||||
// stack pointer by a word size and stores the register's value there.
|
||||
inline void Push(Register source);
|
||||
|
||||
// Pops a value from the backtrack stack. Reads the word at the stack pointer
|
||||
// and increments it by a word size.
|
||||
inline void Pop(Register target);
|
||||
|
||||
Isolate* isolate() const { return masm_->isolate(); }
|
||||
|
||||
MacroAssembler* masm_;
|
||||
|
||||
// Which mode to generate code for (Latin1 or UC16).
|
||||
Mode mode_;
|
||||
|
||||
// One greater than maximal register index actually used.
|
||||
int num_registers_;
|
||||
|
||||
// Number of registers to output at the end (the saved registers
|
||||
// are always 0..num_saved_registers_-1)
|
||||
int num_saved_registers_;
|
||||
|
||||
// Labels used internally.
|
||||
Label entry_label_;
|
||||
Label start_label_;
|
||||
Label success_label_;
|
||||
Label backtrack_label_;
|
||||
Label exit_label_;
|
||||
Label check_preempt_label_;
|
||||
Label stack_overflow_label_;
|
||||
Label internal_failure_label_;
|
||||
};
|
||||
|
||||
// Set of non-volatile registers saved/restored by generated regexp code.
|
||||
const RegList kRegExpCalleeSaved =
|
||||
1 << 6 | 1 << 7 | 1 << 8 | 1 << 9 | 1 << 10 | 1 << 11 | 1 << 13;
|
||||
|
||||
#endif // V8_INTERPRETED_REGEXP
|
||||
} // namespace internal
|
||||
} // namespace v8
|
||||
|
||||
#endif // V8_S390_REGEXP_MACRO_ASSEMBLER_S390_H_
|
@ -1577,16 +1577,18 @@
|
||||
'../../src/ic/s390/ic-compiler-s390.cc',
|
||||
'../../src/ic/s390/ic-s390.cc',
|
||||
'../../src/ic/s390/stub-cache-s390.cc',
|
||||
'../../src/s390/assembler-s390-inl.h',
|
||||
'../../src/regexp/s390/regexp-macro-assembler-s390.cc',
|
||||
'../../src/regexp/s390/regexp-macro-assembler-s390.h',
|
||||
'../../src/s390/assembler-s390.cc',
|
||||
'../../src/s390/assembler-s390.h',
|
||||
'../../src/s390/assembler-s390-inl.h',
|
||||
'../../src/s390/builtins-s390.cc',
|
||||
'../../src/s390/code-stubs-s390.cc',
|
||||
'../../src/s390/code-stubs-s390.h',
|
||||
'../../src/s390/codegen-s390.cc',
|
||||
'../../src/s390/codegen-s390.h',
|
||||
'../../src/s390/constants-s390.h',
|
||||
'../../src/s390/code-stubs-s390.cc',
|
||||
'../../src/s390/code-stubs-s390.h',
|
||||
'../../src/s390/constants-s390.cc',
|
||||
'../../src/s390/constants-s390.h',
|
||||
'../../src/s390/cpu-s390.cc',
|
||||
'../../src/s390/deoptimizer-s390.cc',
|
||||
'../../src/s390/disasm-s390.cc',
|
||||
|
Loading…
Reference in New Issue
Block a user