UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove InfoVars::stp (bug 5844 part 3, r=fyren).

Browse Source
This commit is contained in:
David Anderson 2013-08-11 11:31:55 -07:00
parent 4255ee105f
commit 8391c83121
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sourcepawn/jit/x86/jit_x86.cpp
View File

@ -1190,7 +1190,7 @@ Compiler::emitOp(OPCODE op)
if (amount > 0) { if (amount > 0) {
// Check if the stack went beyond the stack top - usually a compiler error. // 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_); __ j(not_below, &error_stack_min_);
} else { } else {
// Check if the stack is going to collide with the heap. // 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.hp = ctx->hp;
vars.rval = result; vars.rval = result;
vars.ctx = ctx; vars.ctx = ctx;
vars.stp = runtime->plugin()->memory + runtime->plugin()->mem_size;
vars.cip = fn->GetPCodeAddress(); vars.cip = fn->GetPCodeAddress();
vars.memory = runtime->plugin()->memory; vars.memory = runtime->plugin()->memory;
/* vars.esp will be set in the entry code */ /* vars.esp will be set in the entry code */

2
sourcepawn/jit/x86/jit_x86.h
View File

@ -199,7 +199,6 @@ struct InfoVars {
ucell_t hp; ucell_t hp;
cell_t *rval; cell_t *rval;
sp_context_t *ctx; sp_context_t *ctx;
uint8_t *stp;
ucell_t cip; ucell_t cip;
uint8_t *memory; uint8_t *memory;
void *esp; void *esp;
@ -209,7 +208,6 @@ struct InfoVars {
#define AMX_INFO_HEAP offsetof(InfoVars, hp) #define AMX_INFO_HEAP offsetof(InfoVars, hp)
#define AMX_INFO_RETVAL offsetof(InfoVars, rval) #define AMX_INFO_RETVAL offsetof(InfoVars, rval)
#define AMX_INFO_CONTEXT offsetof(InfoVars, ctx) #define AMX_INFO_CONTEXT offsetof(InfoVars, ctx)
#define AMX_INFO_STACKTOP offsetof(InfoVars, stp)
#define AMX_INFO_CIP offsetof(InfoVars, cip) #define AMX_INFO_CIP offsetof(InfoVars, cip)
#define AMX_INFO_MEMORY offsetof(InfoVars, memory) #define AMX_INFO_MEMORY offsetof(InfoVars, memory)
#define AMX_INFO_NSTACK offsetof(InfoVars, esp) #define AMX_INFO_NSTACK offsetof(InfoVars, esp)