Index: src/x64/regexp-macro-assembler-x64.h |
=================================================================== |
--- src/x64/regexp-macro-assembler-x64.h (revision 3701) |
+++ src/x64/regexp-macro-assembler-x64.h (working copy) |
@@ -138,9 +138,7 @@ |
static const int kInputStart = kStartIndex + kPointerSize; |
static const int kInputEnd = kInputStart + kPointerSize; |
static const int kRegisterOutput = kInputEnd + kPointerSize; |
- // AtStart is passed as 32 bit int (values 0 or 1). |
- static const int kAtStart = kRegisterOutput + kPointerSize; |
- static const int kStackHighEnd = kAtStart + kPointerSize; |
+ static const int kStackHighEnd = kRegisterOutput + kPointerSize; |
// DirectCall is passed as 32 bit int (values 0 or 1). |
static const int kDirectCall = kStackHighEnd + kPointerSize; |
#else |
@@ -152,9 +150,8 @@ |
static const int kInputStart = kStartIndex - kPointerSize; |
static const int kInputEnd = kInputStart - kPointerSize; |
static const int kRegisterOutput = kInputEnd - kPointerSize; |
- static const int kAtStart = kRegisterOutput - kPointerSize; |
- static const int kStackHighEnd = kFrameAlign; |
- static const int kDirectCall = kStackHighEnd + kPointerSize; |
+ static const int kStackHighEnd = kRegisterOutput - kPointerSize; |
+ static const int kDirectCall = kFrameAlign; |
#endif |
#ifdef _WIN64 |
@@ -168,7 +165,7 @@ |
// AMD64 Calling Convention has only one callee-save register that |
// we use. We push this after the frame pointer (and after the |
// parameters). |
- static const int kBackup_rbx = kAtStart - kPointerSize; |
+ static const int kBackup_rbx = kStackHighEnd - kPointerSize; |
static const int kLastCalleeSaveRegister = kBackup_rbx; |
#endif |
@@ -176,9 +173,10 @@ |
// the frame in GetCode. |
static const int kInputStartMinusOne = |
kLastCalleeSaveRegister - kPointerSize; |
+ static const int kAtStart = kInputStartMinusOne - kPointerSize; |
// First register address. Following registers are below it on the stack. |
- static const int kRegisterZero = kInputStartMinusOne - kPointerSize; |
+ static const int kRegisterZero = kAtStart - kPointerSize; |
// Initial size of code buffer. |
static const size_t kRegExpCodeSize = 1024; |