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

Remove InfoVars::ctx (bug 5844 part 5, r=fyren).

Browse Source
This commit is contained in:
David Anderson 2013-08-11 11:33:47 -07:00
parent 5935070dfa
commit 18275ce2c9
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,9 +166,9 @@ GenerateArrayIndirectionVectors(cell_t *arraybase, cell_t dims[], cell_t _dimcou
} }
static int static int
PopTrackerAndSetHeap(sp_plugin_t *plugin, InfoVars &vars) PopTrackerAndSetHeap(BaseRuntime *rt, InfoVars &vars)
{ {
tracker_t *trk = (tracker_t *)(vars.ctx->vm[JITVARS_TRACKER]); tracker_t *trk = (tracker_t *)(rt->GetBaseContext()->GetCtx()->vm[JITVARS_TRACKER]);
assert(trk->pCur > trk->pBase); assert(trk->pCur > trk->pBase);
trk->pCur--; trk->pCur--;
@ -176,7 +176,7 @@ PopTrackerAndSetHeap(sp_plugin_t *plugin, InfoVars &vars)
return SP_ERROR_TRACKER_BOUNDS; return SP_ERROR_TRACKER_BOUNDS;
ucell_t amt = *trk->pCur; ucell_t amt = *trk->pCur;
if (amt > (vars.hp - plugin->data_size)) if (amt > (vars.hp - rt->plugin()->data_size))
return SP_ERROR_HEAPMIN; return SP_ERROR_HEAPMIN;
vars.hp -= amt; vars.hp -= amt;
@ -207,7 +207,7 @@ PushTracker(sp_context_t *ctx, size_t amount)
} }
static int static int
GenerateArray(sp_plugin_t *plugin, InfoVars &vars, uint32_t argc, cell_t *argv, int autozero) GenerateArray(BaseRuntime *rt, InfoVars &vars, uint32_t argc, cell_t *argv, int autozero)
{ {
// Calculate how many cells are needed. // Calculate how many cells are needed.
if (argv[0] <= 0) if (argv[0] <= 0)
@ -236,16 +236,16 @@ GenerateArray(sp_plugin_t *plugin, InfoVars &vars, uint32_t argc, cell_t *argv,
return SP_ERROR_ARRAY_TOO_BIG; return SP_ERROR_ARRAY_TOO_BIG;
uint32_t new_hp = vars.hp + bytes; uint32_t new_hp = vars.hp + bytes;
cell_t *dat_hp = reinterpret_cast<cell_t *>(plugin->memory + new_hp); cell_t *dat_hp = reinterpret_cast<cell_t *>(rt->plugin()->memory + new_hp);
// argv, coincidentally, is STK. // argv, coincidentally, is STK.
if (dat_hp >= argv - STACK_MARGIN) if (dat_hp >= argv - STACK_MARGIN)
return SP_ERROR_HEAPLOW; return SP_ERROR_HEAPLOW;
if (int err = PushTracker(vars.ctx, bytes)) if (int err = PushTracker(rt->GetBaseContext()->GetCtx(), bytes))
return err; return err;
cell_t *base = reinterpret_cast<cell_t *>(plugin->memory + vars.hp); cell_t *base = reinterpret_cast<cell_t *>(rt->plugin()->memory + vars.hp);
cell_t offs = GenerateArrayIndirectionVectors(base, argv, argc, autozero); cell_t offs = GenerateArrayIndirectionVectors(base, argv, argc, autozero);
assert(size_t(offs) == cells); assert(size_t(offs) == cells);
@ -1264,9 +1264,8 @@ Compiler::emitOp(OPCODE op)
__ push(pri); __ push(pri);
__ push(alt); __ push(alt);
__ movl(eax, Operand(info, AMX_INFO_CONTEXT));
__ push(amount * 4); __ push(amount * 4);
__ push(eax); __ push(intptr_t(rt_->GetBaseContext()->GetCtx()));
__ call(ExternalAddress((void *)PushTracker)); __ call(ExternalAddress((void *)PushTracker));
__ addl(esp, 8); __ addl(esp, 8);
__ testl(eax, eax); __ testl(eax, eax);
@ -1285,7 +1284,7 @@ Compiler::emitOp(OPCODE op)
// Get the context pointer and call the sanity checker. // Get the context pointer and call the sanity checker.
__ push(info); __ push(info);
__ push(intptr_t(plugin_)); __ push(intptr_t(rt_));
__ call(ExternalAddress((void *)PopTrackerAndSetHeap)); __ call(ExternalAddress((void *)PopTrackerAndSetHeap));
__ addl(esp, 8); __ addl(esp, 8);
__ testl(eax, eax); __ testl(eax, eax);
@ -1414,7 +1413,7 @@ Compiler::emitGenArray(bool autozero)
__ shll(tmp, 2); __ shll(tmp, 2);
__ push(tmp); __ push(tmp);
__ push(Operand(info, AMX_INFO_CONTEXT)); __ push(intptr_t(rt_->GetBaseContext()->GetCtx()));
__ call(ExternalAddress((void *)PushTracker)); __ call(ExternalAddress((void *)PushTracker));
__ addl(esp, 4); __ addl(esp, 4);
__ pop(tmp); __ pop(tmp);
@ -1442,7 +1441,7 @@ Compiler::emitGenArray(bool autozero)
__ push(stk); __ push(stk);
__ push(val); __ push(val);
__ push(info); __ push(info);
__ push(intptr_t(plugin_)); __ push(intptr_t(rt_));
__ call(ExternalAddress((void *)GenerateArray)); __ call(ExternalAddress((void *)GenerateArray));
__ addl(esp, 5 * sizeof(void *)); __ addl(esp, 5 * sizeof(void *));
@ -1472,7 +1471,7 @@ Compiler::emitCall()
// eax = context // eax = context
// ecx = rp // ecx = rp
__ movl(eax, Operand(info, AMX_INFO_CONTEXT)); __ movl(eax, intptr_t(rt_->GetBaseContext()->GetCtx()));
__ movl(ecx, Operand(eax, offsetof(sp_context_t, rp))); __ movl(ecx, Operand(eax, offsetof(sp_context_t, rp)));
// Check if the return stack is used up. // Check if the return stack is used up.
@ -1505,7 +1504,7 @@ Compiler::emitCall()
__ movl(Operand(info, AMX_INFO_CIP), cip); __ movl(Operand(info, AMX_INFO_CIP), cip);
// Mark us as leaving the last frame. // Mark us as leaving the last frame.
__ movl(tmp, Operand(info, AMX_INFO_CONTEXT)); __ movl(tmp, intptr_t(rt_->GetBaseContext()->GetCtx()));
__ subl(Operand(tmp, offsetof(sp_context_t, rp)), 1); __ subl(Operand(tmp, offsetof(sp_context_t, rp)), 1);
return true; return true;
} }
@ -1595,7 +1594,7 @@ Compiler::emitNativeCall(OPCODE op)
// Relocate all our absolute junk to be dat-relative, and store it all back // Relocate all our absolute junk to be dat-relative, and store it all back
// into the context. // into the context.
__ movl(eax, Operand(info, AMX_INFO_CONTEXT)); __ movl(eax, intptr_t(rt_->GetBaseContext()->GetCtx()));
__ movl(ecx, Operand(info, AMX_INFO_HEAP)); __ movl(ecx, Operand(info, AMX_INFO_HEAP));
__ movl(Operand(eax, offsetof(sp_context_t, hp)), ecx); __ movl(Operand(eax, offsetof(sp_context_t, hp)), ecx);
__ subl(stk, dat); __ subl(stk, dat);
@ -1608,7 +1607,7 @@ Compiler::emitNativeCall(OPCODE op)
__ call(ExternalAddress((void *)NativeCallback)); __ call(ExternalAddress((void *)NativeCallback));
// Check for errors. // Check for errors.
__ movl(ecx, Operand(info, AMX_INFO_CONTEXT)); __ movl(ecx, intptr_t(rt_->GetBaseContext()->GetCtx()));
__ movl(ecx, Operand(ecx, offsetof(sp_context_t, n_err))); __ movl(ecx, Operand(ecx, offsetof(sp_context_t, n_err)));
__ testl(ecx, ecx); __ testl(ecx, ecx);
__ j(not_zero, &extern_error_); __ j(not_zero, &extern_error_);
@ -1750,7 +1749,7 @@ Compiler::emitErrorPaths()
if (extern_error_.used()) { if (extern_error_.used()) {
__ bind(&extern_error_); __ bind(&extern_error_);
__ movl(eax, Operand(info, AMX_INFO_CONTEXT)); __ movl(eax, intptr_t(rt_->GetBaseContext()->GetCtx()));
__ movl(eax, Operand(eax, offsetof(sp_context_t, n_err))); __ movl(eax, Operand(eax, offsetof(sp_context_t, n_err)));
__ jmp(g_Jit.GetUniversalReturn()); __ jmp(g_Jit.GetUniversalReturn());
} }
@ -1774,10 +1773,9 @@ GenerateEntry(void **retp)
__ movl(esi, Operand(ebp, 8 + 4 * 0)); __ movl(esi, Operand(ebp, 8 + 4 * 0));
__ movl(ecx, Operand(ebp, 8 + 4 * 1)); __ movl(ecx, Operand(ebp, 8 + 4 * 1));
__ movl(eax, Operand(ebp, 8 + 4 * 2)); __ movl(eax, Operand(ebp, 8 + 4 * 2));
__ movl(edx, Operand(esi, AMX_INFO_CONTEXT));
// Set up run-time registers. // Set up run-time registers.
__ movl(edi, Operand(edx, offsetof(sp_context_t, sp))); __ movl(edi, Operand(esi, AMX_INFO_FRAME));
__ addl(edi, eax); __ addl(edi, eax);
__ movl(ebp, eax); __ movl(ebp, eax);
__ movl(ebx, edi); __ movl(ebx, edi);
@ -1797,9 +1795,8 @@ GenerateEntry(void **retp)
Label error; Label error;
__ bind(&error); __ bind(&error);
__ movl(esp, Operand(info, AMX_INFO_NSTACK)); __ movl(esp, Operand(info, AMX_INFO_NSTACK));
__ movl(ecx, Operand(info, AMX_INFO_CONTEXT));
__ subl(stk, dat); __ subl(stk, dat);
__ movl(Operand(ecx, offsetof(sp_context_t, sp)), stk); __ movl(Operand(esi, AMX_INFO_FRAME), stk);
__ pop(ebx); __ pop(ebx);
__ pop(edi); __ pop(edi);
@ -1969,13 +1966,13 @@ int JITX86::InvokeFunction(BaseRuntime *runtime, JitFunction *fn, cell_t *result
vars.frm = ctx->sp; vars.frm = ctx->sp;
vars.hp = ctx->hp; vars.hp = ctx->hp;
vars.rval = result; vars.rval = result;
vars.ctx = ctx;
vars.cip = fn->GetPCodeAddress(); vars.cip = fn->GetPCodeAddress();
/* vars.esp will be set in the entry code */ /* vars.esp will be set in the entry code */
pfn = (JIT_EXECUTE)m_pJitEntry; pfn = (JIT_EXECUTE)m_pJitEntry;
err = pfn(&vars, fn->GetEntryAddress(), runtime->plugin()->memory); err = pfn(&vars, fn->GetEntryAddress(), runtime->plugin()->memory);
ctx->sp = vars.frm;
ctx->hp = vars.hp; ctx->hp = vars.hp;
ctx->err_cip = vars.cip; ctx->err_cip = vars.cip;

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

@ -198,7 +198,6 @@ struct InfoVars {
ucell_t frm; ucell_t frm;
ucell_t hp; ucell_t hp;
cell_t *rval; cell_t *rval;
sp_context_t *ctx;
ucell_t cip; ucell_t cip;
void *esp; void *esp;
}; };
@ -206,7 +205,6 @@ struct InfoVars {
#define AMX_INFO_FRAME offsetof(InfoVars, frm) #define AMX_INFO_FRAME offsetof(InfoVars, frm)
#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_CIP offsetof(InfoVars, cip) #define AMX_INFO_CIP offsetof(InfoVars, cip)
#define AMX_INFO_NSTACK offsetof(InfoVars, esp) #define AMX_INFO_NSTACK offsetof(InfoVars, esp)