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

Remove InfoVars::frm (bug 5844 part 9, r=ds).

Browse Source
This commit is contained in:
David Anderson 2013-08-12 00:23:54 +01:00
parent a7658f013e
commit 04129a0841
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -608,7 +608,7 @@ Compiler::emitOp(OPCODE op)
case OP_PROC: case OP_PROC:
// Push the old frame onto the stack. // Push the old frame onto the stack.
__ movl(tmp, Operand(info, AMX_INFO_FRAME)); __ movl(tmp, Operand(frmAddr()));
__ movl(Operand(stk, -4), tmp); __ movl(Operand(stk, -4), tmp);
__ subl(stk, 8); // extra unused slot for non-existant CIP __ subl(stk, 8); // extra unused slot for non-existant CIP
@ -616,7 +616,7 @@ Compiler::emitOp(OPCODE op)
__ movl(tmp, stk); __ movl(tmp, stk);
__ movl(frm, stk); __ movl(frm, stk);
__ subl(tmp, dat); __ subl(tmp, dat);
__ movl(Operand(info, AMX_INFO_FRAME), tmp); __ movl(Operand(frmAddr()), tmp);
// Align the stack to 16-bytes (each call adds 4 bytes). // Align the stack to 16-bytes (each call adds 4 bytes).
__ subl(esp, 12); __ subl(esp, 12);
@ -834,7 +834,7 @@ Compiler::emitOp(OPCODE op)
{ {
Register reg = (op == OP_ADDR_PRI) ? pri : alt; Register reg = (op == OP_ADDR_PRI) ? pri : alt;
cell_t offset = readCell(); cell_t offset = readCell();
__ movl(reg, Operand(info, AMX_INFO_FRAME)); __ movl(reg, Operand(frmAddr()));
__ addl(reg, offset); __ addl(reg, offset);
break; break;
} }
@ -988,7 +988,7 @@ Compiler::emitOp(OPCODE op)
// Restore the old frame pointer. // Restore the old frame pointer.
__ movl(frm, Operand(stk, 4)); // get the old frm __ movl(frm, Operand(stk, 4)); // get the old frm
__ addl(stk, 8); // pop stack __ addl(stk, 8); // pop stack
__ movl(Operand(info, AMX_INFO_FRAME), frm); // store back old frm __ movl(Operand(frmAddr()), frm); // store back old frm
__ addl(frm, dat); // relocate __ addl(frm, dat); // relocate
// Remove parameters. // Remove parameters.
@ -1594,13 +1594,11 @@ Compiler::emitNativeCall(OPCODE op)
__ push(stk); __ push(stk);
__ push(native_index); __ push(native_index);
// Relocate all our absolute junk to be dat-relative, and store it all back // Relocate our absolute stk to be dat-relative, and update the context's
// into the context. // view.
__ movl(eax, intptr_t(rt_->GetBaseContext()->GetCtx())); __ movl(eax, intptr_t(rt_->GetBaseContext()->GetCtx()));
__ subl(stk, dat); __ subl(stk, dat);
__ movl(Operand(eax, offsetof(sp_context_t, sp)), stk); __ movl(Operand(eax, offsetof(sp_context_t, sp)), stk);
__ movl(ecx, Operand(info, AMX_INFO_FRAME));
__ movl(Operand(eax, offsetof(sp_context_t, frm)), ecx);
// Push context and make the call. // Push context and make the call.
__ push(eax); __ push(eax);
@ -1777,7 +1775,8 @@ GenerateEntry(void **retp)
__ movl(eax, Operand(ebp, 8 + 4 * 2)); __ movl(eax, Operand(ebp, 8 + 4 * 2));
// Set up run-time registers. // Set up run-time registers.
__ movl(edi, Operand(esi, AMX_INFO_FRAME)); __ movl(ebx, Operand(ebp, 8 + 4 * 3));
__ movl(edi, Operand(ebx, offsetof(sp_context_t, sp)));
__ addl(edi, eax); __ addl(edi, eax);
__ movl(ebp, eax); __ movl(ebp, eax);
__ movl(ebx, edi); __ movl(ebx, edi);
@ -1792,7 +1791,7 @@ GenerateEntry(void **retp)
// Restore stack. // Restore stack.
__ movl(esp, Operand(info, AMX_INFO_NSTACK)); __ movl(esp, Operand(info, AMX_INFO_NSTACK));
// Get input context. // Get input context, store rval.
__ movl(ecx, Operand(esp, 32)); __ movl(ecx, Operand(esp, 32));
__ movl(Operand(ecx, offsetof(sp_context_t, rval)), pri); __ movl(Operand(ecx, offsetof(sp_context_t, rval)), pri);
@ -1804,7 +1803,7 @@ GenerateEntry(void **retp)
Label ret; Label ret;
__ bind(&ret); __ bind(&ret);
__ subl(stk, dat); __ subl(stk, dat);
__ movl(Operand(esi, AMX_INFO_FRAME), stk); __ movl(Operand(ecx, offsetof(sp_context_t, sp)), stk);
// Restore registers and gtfo. // Restore registers and gtfo.
__ pop(ebx); __ pop(ebx);
@ -1817,6 +1816,7 @@ 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(esp, 32)); // ret-path expects ecx = ctx
__ jmp(&ret); __ jmp(&ret);
void *code = LinkCode(masm); void *code = LinkCode(masm);
@ -1976,14 +1976,11 @@ int JITX86::InvokeFunction(BaseRuntime *runtime, JitFunction *fn, cell_t *result
ctx->cip = fn->GetPCodeAddress(); ctx->cip = fn->GetPCodeAddress();
InfoVars vars; InfoVars vars;
vars.frm = ctx->sp;
/* vars.esp will be set in the entry code */ /* vars.esp will be set in the entry code */
JIT_EXECUTE pfn = (JIT_EXECUTE)m_pJitEntry; JIT_EXECUTE pfn = (JIT_EXECUTE)m_pJitEntry;
int err = pfn(&vars, fn->GetEntryAddress(), runtime->plugin()->memory, ctx); int err = pfn(&vars, fn->GetEntryAddress(), runtime->plugin()->memory, ctx);
ctx->sp = vars.frm;
*result = ctx->rval; *result = ctx->rval;
return err; return err;
} }

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

@ -140,6 +140,10 @@ class Compiler
sp_context_t *ctx = rt_->GetBaseContext()->GetCtx(); sp_context_t *ctx = rt_->GetBaseContext()->GetCtx();
return ExternalAddress(&ctx->hp); return ExternalAddress(&ctx->hp);
} }
ExternalAddress frmAddr() {
sp_context_t *ctx = rt_->GetBaseContext()->GetCtx();
return ExternalAddress(&ctx->frm);
}
private: private:
AssemblerX86 masm; AssemblerX86 masm;
@ -205,11 +209,9 @@ const Register info = esi;
const Register frm = ebx; const Register frm = ebx;
struct InfoVars { struct InfoVars {
ucell_t frm;
void *esp; void *esp;
}; };
#define AMX_INFO_FRAME offsetof(InfoVars, frm)
#define AMX_INFO_NSTACK offsetof(InfoVars, esp) #define AMX_INFO_NSTACK offsetof(InfoVars, esp)
extern Knight::KeCodeCache *g_pCodeCache; extern Knight::KeCodeCache *g_pCodeCache;