Commit 23e84069 authored by lrn@chromium.org's avatar lrn@chromium.org

RegExp: Remove unnecessary function from ARM specific code and convert condition to assertion.

Review URL: http://codereview.chromium.org/178034


git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@2807 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 4339205d
...@@ -132,15 +132,6 @@ int RegExpMacroAssemblerARM::stack_limit_slack() { ...@@ -132,15 +132,6 @@ int RegExpMacroAssemblerARM::stack_limit_slack() {
} }
bool RegExpMacroAssemblerARM::CanReadUnaligned() {
#if V8_TARGET_CAN_READ_UNALIGNED
return true;
#else
return false;
#endif
}
void RegExpMacroAssemblerARM::AdvanceCurrentPosition(int by) { void RegExpMacroAssemblerARM::AdvanceCurrentPosition(int by) {
if (by != 0) { if (by != 0) {
Label inside_string; Label inside_string;
......
...@@ -45,7 +45,6 @@ class RegExpMacroAssemblerARM: public NativeRegExpMacroAssembler { ...@@ -45,7 +45,6 @@ class RegExpMacroAssemblerARM: public NativeRegExpMacroAssembler {
RegExpMacroAssemblerARM(Mode mode, int registers_to_save); RegExpMacroAssemblerARM(Mode mode, int registers_to_save);
virtual ~RegExpMacroAssemblerARM(); virtual ~RegExpMacroAssemblerARM();
virtual int stack_limit_slack(); virtual int stack_limit_slack();
virtual bool CanReadUnaligned();
virtual void AdvanceCurrentPosition(int by); virtual void AdvanceCurrentPosition(int by);
virtual void AdvanceRegister(int reg, int by); virtual void AdvanceRegister(int reg, int by);
virtual void Backtrack(); virtual void Backtrack();
......
...@@ -1723,8 +1723,8 @@ bool RegExpNode::EmitQuickCheck(RegExpCompiler* compiler, ...@@ -1723,8 +1723,8 @@ bool RegExpNode::EmitQuickCheck(RegExpCompiler* compiler,
GetQuickCheckDetails(details, compiler, 0, trace->at_start() == Trace::FALSE); GetQuickCheckDetails(details, compiler, 0, trace->at_start() == Trace::FALSE);
if (details->cannot_match()) return false; if (details->cannot_match()) return false;
if (!details->Rationalize(compiler->ascii())) return false; if (!details->Rationalize(compiler->ascii())) return false;
if (details->characters() > 1 && ASSERT(details->characters() == 1 ||
!compiler->macro_assembler()->CanReadUnaligned()) return false; compiler->macro_assembler()->CanReadUnaligned());
uint32_t mask = details->mask(); uint32_t mask = details->mask();
uint32_t value = details->value(); uint32_t value = details->value();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment