| Index: src/x64/codegen-x64.cc
|
| ===================================================================
|
| --- src/x64/codegen-x64.cc (revision 4367)
|
| +++ src/x64/codegen-x64.cc (working copy)
|
| @@ -6944,9 +6944,9 @@
|
| // Just jump directly to runtime if native RegExp is not selected at compile
|
| // time or if regexp entry in generated code is turned off runtime switch or
|
| // at compilation.
|
| -#ifndef V8_NATIVE_REGEXP
|
| +#ifdef V8_INTERPRETED_REGEXP
|
| __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
|
| -#else // V8_NATIVE_REGEXP
|
| +#else // V8_INTERPRETED_REGEXP
|
| if (!FLAG_regexp_entry_native) {
|
| __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
|
| return;
|
| @@ -7287,7 +7287,7 @@
|
| // Do the runtime call to execute the regexp.
|
| __ bind(&runtime);
|
| __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
|
| -#endif // V8_NATIVE_REGEXP
|
| +#endif // V8_INTERPRETED_REGEXP
|
| }
|
|
|
|
|
| @@ -7881,7 +7881,7 @@
|
| // Pass failure code returned from last attempt as first argument to GC.
|
| #ifdef _WIN64
|
| __ movq(rcx, rax);
|
| -#else // ! defined(_WIN64)
|
| +#else // _WIN64
|
| __ movq(rdi, rax);
|
| #endif
|
| __ movq(kScratchRegister,
|
| @@ -7915,7 +7915,7 @@
|
| __ lea(rdx, Operand(rsp, 4 * kPointerSize));
|
| }
|
|
|
| -#else // ! defined(_WIN64)
|
| +#else // _WIN64
|
| // GCC passes arguments in rdi, rsi, rdx, rcx, r8, r9.
|
| __ movq(rdi, r14); // argc.
|
| __ movq(rsi, r15); // argv.
|
|
|