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

Eliminate InfoVars::rval (bug 5844 part 6, r=ds).

Browse Source
This commit is contained in:
David Anderson 2013-08-12 00:22:41 +01:00
parent 18275ce2c9
commit 87ccd272ee
4 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sourcepawn/jit/jit_shared.h
View File

@ -1,3 +1,4 @@
// vim: set ts=4 sw=4 tw=99 noet:
#ifndef _INCLUDE_SOURCEPAWN_JIT_SHARED_H_ #ifndef _INCLUDE_SOURCEPAWN_JIT_SHARED_H_
#define _INCLUDE_SOURCEPAWN_JIT_SHARED_H_ #define _INCLUDE_SOURCEPAWN_JIT_SHARED_H_
@ -71,6 +72,7 @@ typedef struct sp_context_s
cell_t hp; /**< Heap pointer */ cell_t hp; /**< Heap pointer */
cell_t sp; /**< Stack pointer */ cell_t sp; /**< Stack pointer */
cell_t frm; /**< Frame pointer */ cell_t frm; /**< Frame pointer */
cell_t rval; /**< Return value from InvokeFunction() */
int32_t err_cip; /**< Code pointer last error occurred in */ int32_t err_cip; /**< Code pointer last error occurred in */
int32_t n_err; /**< Error code set by a native */ int32_t n_err; /**< Error code set by a native */
uint32_t n_idx; /**< Current native index being executed */ uint32_t n_idx; /**< Current native index being executed */

2
sourcepawn/jit/opcodes.cpp
View File

@ -70,6 +70,8 @@ SourcePawn::SpewOpcode(const sp_plugin_t *plugin, cell_t *start, cell_t *cip)
case OP_HEAP: case OP_HEAP:
case OP_GENARRAY: case OP_GENARRAY:
case OP_GENARRAY_Z: case OP_GENARRAY_Z:
case OP_CONST_PRI:
case OP_CONST_ALT:
fprintf(stdout, "%d", cip[1]); fprintf(stdout, "%d", cip[1]);
break; break;

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

@ -1304,8 +1304,8 @@ Compiler::emitOp(OPCODE op)
case OP_HALT: case OP_HALT:
__ align(16); __ align(16);
__ movl(tmp, Operand(info, AMX_INFO_RETVAL)); __ movl(tmp, intptr_t(rt_->GetBaseContext()->GetCtx()));
__ movl(Operand(ecx, 0), pri); __ movl(Operand(tmp, offsetof(sp_context_t, rval)), pri);
__ movl(pri, readCell()); __ movl(pri, readCell());
__ jmp(&extern_error_); __ jmp(&extern_error_);
break; break;
@ -1755,13 +1755,15 @@ Compiler::emitErrorPaths()
} }
} }
typedef int (*JIT_EXECUTE)(InfoVars *vars, void *addr, uint8_t *memory, sp_context_t *ctx);
static void * static void *
GenerateEntry(void **retp) GenerateEntry(void **retp)
{ {
AssemblerX86 masm; AssemblerX86 masm;
// Variables we're passed in: // Variables we're passed in:
// InfoVars *vars, void *entry, uint8_t *memory // InfoVars *vars, void *entry, uint8_t *memory, sp_context_t *
__ push(ebp); __ push(ebp);
__ movl(ebp, esp); __ movl(ebp, esp);
@ -1787,23 +1789,36 @@ GenerateEntry(void **retp)
// Call into plugin (align the stack first). // Call into plugin (align the stack first).
__ call(ecx); __ call(ecx);
__ movl(ecx, Operand(info, AMX_INFO_RETVAL)); // Restore stack.
__ movl(Operand(ecx, 0), pri); __ movl(esp, Operand(info, AMX_INFO_NSTACK));
// Get input context.
__ movl(ecx, Operand(esp, 32));
__ movl(Operand(ecx, offsetof(sp_context_t, rval)), pri);
// Set no error.
__ movl(eax, SP_ERROR_NONE); __ movl(eax, SP_ERROR_NONE);
// If stuff goes wrong, it'll jump directly to here. // Store latest stk. If we have an error code, we'll jump directly to here,
Label error; // so eax will already be set.
__ bind(&error); Label ret;
__ movl(esp, Operand(info, AMX_INFO_NSTACK)); __ bind(&ret);
__ subl(stk, dat); __ subl(stk, dat);
__ movl(Operand(esi, AMX_INFO_FRAME), stk); __ movl(Operand(esi, AMX_INFO_FRAME), stk);
// Restore registers and gtfo.
__ pop(ebx); __ pop(ebx);
__ pop(edi); __ pop(edi);
__ pop(esi); __ pop(esi);
__ pop(ebp); __ pop(ebp);
__ ret(); __ ret();
// The universal emergency return will jump to here.
Label error;
__ bind(&error);
__ movl(esp, Operand(info, AMX_INFO_NSTACK));
__ jmp(&ret);
void *code = LinkCode(masm); void *code = LinkCode(masm);
if (!code) if (!code)
return NULL; return NULL;
@ -1953,29 +1968,24 @@ bool CompData::SetOption(const char *key, const char *val)
return false; return false;
} }
typedef int (*JIT_EXECUTE)(InfoVars *vars, void *addr, uint8_t *memory);
int JITX86::InvokeFunction(BaseRuntime *runtime, JitFunction *fn, cell_t *result) int JITX86::InvokeFunction(BaseRuntime *runtime, JitFunction *fn, cell_t *result)
{ {
int err; sp_context_t *ctx = runtime->GetBaseContext()->GetCtx();
JIT_EXECUTE pfn;
sp_context_t *ctx;
InfoVars vars; InfoVars vars;
ctx = runtime->GetBaseContext()->GetCtx();
vars.frm = ctx->sp; vars.frm = ctx->sp;
vars.hp = ctx->hp; vars.hp = ctx->hp;
vars.rval = result;
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; JIT_EXECUTE pfn = (JIT_EXECUTE)m_pJitEntry;
err = pfn(&vars, fn->GetEntryAddress(), runtime->plugin()->memory); int err = pfn(&vars, fn->GetEntryAddress(), runtime->plugin()->memory, ctx);
ctx->sp = vars.frm; ctx->sp = vars.frm;
ctx->hp = vars.hp; ctx->hp = vars.hp;
ctx->err_cip = vars.cip; ctx->err_cip = vars.cip;
*result = ctx->rval;
return err; return err;
} }

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

@ -197,14 +197,12 @@ const Register frm = ebx;
struct InfoVars { struct InfoVars {
ucell_t frm; ucell_t frm;
ucell_t hp; ucell_t hp;
cell_t *rval;
ucell_t cip; ucell_t cip;
void *esp; void *esp;
}; };
#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_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)