diff --git a/sourcepawn/jit/x86/jit_x86.cpp b/sourcepawn/jit/x86/jit_x86.cpp index 6d2ffdc7..ab9d0bd9 100644 --- a/sourcepawn/jit/x86/jit_x86.cpp +++ b/sourcepawn/jit/x86/jit_x86.cpp @@ -1190,7 +1190,7 @@ Compiler::emitOp(OPCODE op) if (amount > 0) { // Check if the stack went beyond the stack top - usually a compiler error. - __ cmpl(stk, Operand(info, AMX_INFO_STACKTOP)); + __ cmpl(stk, intptr_t(plugin_->memory + plugin_->mem_size)); __ j(not_below, &error_stack_min_); } else { // Check if the stack is going to collide with the heap. @@ -1970,7 +1970,6 @@ int JITX86::InvokeFunction(BaseRuntime *runtime, JitFunction *fn, cell_t *result vars.hp = ctx->hp; vars.rval = result; vars.ctx = ctx; - vars.stp = runtime->plugin()->memory + runtime->plugin()->mem_size; vars.cip = fn->GetPCodeAddress(); vars.memory = runtime->plugin()->memory; /* vars.esp will be set in the entry code */ diff --git a/sourcepawn/jit/x86/jit_x86.h b/sourcepawn/jit/x86/jit_x86.h index a3754561..de30401c 100644 --- a/sourcepawn/jit/x86/jit_x86.h +++ b/sourcepawn/jit/x86/jit_x86.h @@ -199,7 +199,6 @@ struct InfoVars { ucell_t hp; cell_t *rval; sp_context_t *ctx; - uint8_t *stp; ucell_t cip; uint8_t *memory; void *esp; @@ -209,7 +208,6 @@ struct InfoVars { #define AMX_INFO_HEAP offsetof(InfoVars, hp) #define AMX_INFO_RETVAL offsetof(InfoVars, rval) #define AMX_INFO_CONTEXT offsetof(InfoVars, ctx) -#define AMX_INFO_STACKTOP offsetof(InfoVars, stp) #define AMX_INFO_CIP offsetof(InfoVars, cip) #define AMX_INFO_MEMORY offsetof(InfoVars, memory) #define AMX_INFO_NSTACK offsetof(InfoVars, esp)