Remove InfoVars::stp (bug 5844 part 3, r=fyren).
1.1 --- a/sourcepawn/jit/x86/jit_x86.cpp Sun Aug 11 11:31:24 2013 -0700
1.2 +++ b/sourcepawn/jit/x86/jit_x86.cpp Sun Aug 11 11:31:55 2013 -0700
1.3 @@ -1190,7 +1190,7 @@
1.4
1.5 if (amount > 0) {
1.6 // Check if the stack went beyond the stack top - usually a compiler error.
1.7 - __ cmpl(stk, Operand(info, AMX_INFO_STACKTOP));
1.8 + __ cmpl(stk, intptr_t(plugin_->memory + plugin_->mem_size));
1.9 __ j(not_below, &error_stack_min_);
1.10 } else {
1.11 // Check if the stack is going to collide with the heap.
1.12 @@ -1970,7 +1970,6 @@
1.13 vars.hp = ctx->hp;
1.14 vars.rval = result;
1.15 vars.ctx = ctx;
1.16 - vars.stp = runtime->plugin()->memory + runtime->plugin()->mem_size;
1.17 vars.cip = fn->GetPCodeAddress();
1.18 vars.memory = runtime->plugin()->memory;
1.19 /* vars.esp will be set in the entry code */
2.1 --- a/sourcepawn/jit/x86/jit_x86.h Sun Aug 11 11:31:24 2013 -0700
2.2 +++ b/sourcepawn/jit/x86/jit_x86.h Sun Aug 11 11:31:55 2013 -0700
2.3 @@ -199,7 +199,6 @@
2.4 ucell_t hp;
2.5 cell_t *rval;
2.6 sp_context_t *ctx;
2.7 - uint8_t *stp;
2.8 ucell_t cip;
2.9 uint8_t *memory;
2.10 void *esp;
2.11 @@ -209,7 +208,6 @@
2.12 #define AMX_INFO_HEAP offsetof(InfoVars, hp)
2.13 #define AMX_INFO_RETVAL offsetof(InfoVars, rval)
2.14 #define AMX_INFO_CONTEXT offsetof(InfoVars, ctx)
2.15 -#define AMX_INFO_STACKTOP offsetof(InfoVars, stp)
2.16 #define AMX_INFO_CIP offsetof(InfoVars, cip)
2.17 #define AMX_INFO_MEMORY offsetof(InfoVars, memory)
2.18 #define AMX_INFO_NSTACK offsetof(InfoVars, esp)