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

Move hp from sp_context_t to PluginContext.

Browse Source
This commit is contained in:
David Anderson 2015-02-24 21:18:34 -08:00
parent b2c61a341a
commit 31ab1ced06
7 changed files with 221 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
sourcepawn/jit/interpreter.cpp
View File

@ -73,51 +73,6 @@ JumpTarget(const sp_plugin_t *plugin, sp_context_t *ctx, cell_t *cip, bool cond,
return next; return next;
} }
static inline bool
CheckAddress(const sp_plugin_t *plugin, sp_context_t *ctx, cell_t *stk, cell_t addr)
{
if (uint32_t(addr) >= plugin->mem_size)
return false;
if (addr < ctx->hp)
return true;
if (reinterpret_cast<cell_t *>(plugin->memory + addr) < stk)
return false;
return true;
}
static inline int
GenerateArray(PluginRuntime *rt, sp_context_t *ctx, cell_t dims, cell_t *stk, bool autozero)
{
if (dims == 1) {
uint32_t size = *stk;
if (size == 0 || !ke::IsUint32MultiplySafe(size, 4))
return SP_ERROR_ARRAY_TOO_BIG;
*stk = ctx->hp;
uint32_t bytes = size * 4;
ctx->hp += bytes;
if (uintptr_t(ctx->plugin->memory + ctx->hp) >= uintptr_t(stk))
return SP_ERROR_HEAPLOW;
if (int err = rt->GetBaseContext()->pushTracker(bytes))
return err;
if (autozero)
memset(ctx->plugin->memory + ctx->hp, 0, bytes);
return SP_ERROR_NONE;
}
if (int err = GenerateFullArray(rt, dims, stk, autozero))
return err;
return SP_ERROR_NONE;
}
int int
Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval) Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
{ {
@ -408,7 +363,7 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
} }
case OP_INC_I: case OP_INC_I:
if (!CheckAddress(plugin, ctx, stk, pri)) { if (!cx->checkAddress(stk, pri)) {
err = SP_ERROR_MEMACCESS; err = SP_ERROR_MEMACCESS;
goto error; goto error;
} }
@ -438,7 +393,7 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
} }
case OP_DEC_I: case OP_DEC_I:
if (!CheckAddress(plugin, ctx, stk, pri)) { if (!cx->checkAddress(stk, pri)) {
err = SP_ERROR_MEMACCESS; err = SP_ERROR_MEMACCESS;
goto error; goto error;
} }
@ -545,7 +500,7 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
case OP_LIDX: case OP_LIDX:
pri = alt + pri * 4; pri = alt + pri * 4;
if (!CheckAddress(plugin, ctx, stk, pri)) { if (!cx->checkAddress(stk, pri)) {
err = SP_ERROR_MEMACCESS; err = SP_ERROR_MEMACCESS;
goto error; goto error;
} }
@ -556,7 +511,7 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
{ {
cell_t val = *cip++; cell_t val = *cip++;
pri = alt + (pri << val); pri = alt + (pri << val);
if (!CheckAddress(plugin, ctx, stk, pri)) { if (!cx->checkAddress(stk, pri)) {
err = SP_ERROR_MEMACCESS; err = SP_ERROR_MEMACCESS;
goto error; goto error;
} }
@ -581,7 +536,7 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
} }
case OP_LOAD_I: case OP_LOAD_I:
if (!CheckAddress(plugin, ctx, stk, pri)) { if (!cx->checkAddress(stk, pri)) {
err = SP_ERROR_MEMACCESS; err = SP_ERROR_MEMACCESS;
goto error; goto error;
} }
@ -589,7 +544,7 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
break; break;
case OP_STOR_I: case OP_STOR_I:
if (!CheckAddress(plugin, ctx, stk, alt)) { if (!cx->checkAddress(stk, alt)) {
err = SP_ERROR_MEMACCESS; err = SP_ERROR_MEMACCESS;
goto error; goto error;
} }
@ -617,7 +572,7 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
case OP_LODB_I: case OP_LODB_I:
{ {
cell_t val = *cip++; cell_t val = *cip++;
if (!CheckAddress(plugin, ctx, stk, pri)) { if (!cx->checkAddress(stk, pri)) {
err = SP_ERROR_MEMACCESS; err = SP_ERROR_MEMACCESS;
goto error; goto error;
} }
@ -632,7 +587,7 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
case OP_STRB_I: case OP_STRB_I:
{ {
cell_t val = *cip++; cell_t val = *cip++;
if (!CheckAddress(plugin, ctx, stk, alt)) { if (!cx->checkAddress(stk, alt)) {
err = SP_ERROR_MEMACCESS; err = SP_ERROR_MEMACCESS;
goto error; goto error;
} }
@ -690,7 +645,7 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
goto error; goto error;
} }
} else { } else {
if (uintptr_t(stk) < uintptr_t(plugin->memory + ctx->hp + STACK_MARGIN)) { if (uintptr_t(stk) < uintptr_t(plugin->memory + cx->hp() + STACK_MARGIN)) {
err = SP_ERROR_STACKLOW; err = SP_ERROR_STACKLOW;
goto error; goto error;
} }
@ -702,16 +657,16 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
{ {
cell_t amount = *cip++; cell_t amount = *cip++;
alt = ctx->hp; alt = cx->hp();
ctx->hp += amount; *cx->addressOfHp() += amount;
if (amount > 0) { if (amount > 0) {
if (uintptr_t(plugin->memory + ctx->hp) > uintptr_t(stk)) { if (uintptr_t(plugin->memory + cx->hp()) > uintptr_t(stk)) {
err = SP_ERROR_HEAPLOW; err = SP_ERROR_HEAPLOW;
goto error; goto error;
} }
} else { } else {
if (uint32_t(ctx->hp) < plugin->data_size) { if (uint32_t(cx->hp()) < plugin->data_size) {
err = SP_ERROR_HEAPMIN; err = SP_ERROR_HEAPMIN;
goto error; goto error;
} }
@ -826,7 +781,7 @@ Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval)
case OP_GENARRAY_Z: case OP_GENARRAY_Z:
{ {
cell_t val = *cip++; cell_t val = *cip++;
if ((err = GenerateArray(rt, ctx, val, stk, op == OP_GENARRAY_Z)) != SP_ERROR_NONE) if ((err = cx->generateArray(val, stk, op == OP_GENARRAY_Z)) != SP_ERROR_NONE)
goto error; goto error;
stk += (val - 1) * 4; stk += (val - 1) * 4;

3
sourcepawn/jit/interpreter.h
View File

@ -24,7 +24,4 @@
int Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval); int Interpret(PluginRuntime *rt, uint32_t aCodeStart, cell_t *rval);
int GenerateFullArray(PluginRuntime *rt, uint32_t argc, cell_t *argv, int autozero);
cell_t BoundNativeCallback(sp_context_t *ctx, SPVM_NATIVE_FUNC pfn, cell_t *params);
#endif // _include_sourcepawn_interpreter_h_ #endif // _include_sourcepawn_interpreter_h_

1
sourcepawn/jit/jit_shared.h
View File

@ -72,7 +72,6 @@ class PluginContext;
typedef struct sp_context_s typedef struct sp_context_s
{ {
cell_t hp; /**< Heap pointer */
cell_t rval; /**< Return value from InvokeFunction() */ cell_t rval; /**< Return value from InvokeFunction() */
sp_plugin_t *plugin; sp_plugin_t *plugin;
PluginContext *basecx; PluginContext *basecx;

199
sourcepawn/jit/plugin-context.cpp
View File

@ -51,7 +51,7 @@ PluginContext::PluginContext(PluginRuntime *pRuntime)
m_pNullString = NULL; m_pNullString = NULL;
} }
m_ctx.hp = m_pRuntime->plugin()->data_size; hp_ = m_pRuntime->plugin()->data_size;
sp_ = m_pRuntime->plugin()->mem_size - sizeof(cell_t); sp_ = m_pRuntime->plugin()->mem_size - sizeof(cell_t);
frm_ = sp_; frm_ = sp_;
rp_ = 0; rp_ = 0;
@ -185,21 +185,21 @@ PluginContext::HeapAlloc(unsigned int cells, cell_t *local_addr, cell_t **phys_a
/** /**
* Check if the space between the heap and stack is sufficient. * Check if the space between the heap and stack is sufficient.
*/ */
if ((cell_t)(sp_ - m_ctx.hp - realmem) < STACKMARGIN) if ((cell_t)(sp_ - hp_ - realmem) < STACKMARGIN)
return SP_ERROR_HEAPLOW; return SP_ERROR_HEAPLOW;
addr = (cell_t *)(m_pRuntime->plugin()->memory + m_ctx.hp); addr = (cell_t *)(m_pRuntime->plugin()->memory + hp_);
/* store size of allocation in cells */ /* store size of allocation in cells */
*addr = (cell_t)cells; *addr = (cell_t)cells;
addr++; addr++;
m_ctx.hp += sizeof(cell_t); hp_ += sizeof(cell_t);
*local_addr = m_ctx.hp; *local_addr = hp_;
if (phys_addr) if (phys_addr)
*phys_addr = addr; *phys_addr = addr;
m_ctx.hp += realmem; hp_ += realmem;
return SP_ERROR_NONE; return SP_ERROR_NONE;
} }
@ -218,10 +218,10 @@ PluginContext::HeapPop(cell_t local_addr)
addr = (cell_t *)(m_pRuntime->plugin()->memory + local_addr); addr = (cell_t *)(m_pRuntime->plugin()->memory + local_addr);
cellcount = (*addr) * sizeof(cell_t); cellcount = (*addr) * sizeof(cell_t);
/* check if this memory count looks valid */ /* check if this memory count looks valid */
if ((signed)(m_ctx.hp - cellcount - sizeof(cell_t)) != local_addr) if ((signed)(hp_ - cellcount - sizeof(cell_t)) != local_addr)
return SP_ERROR_INVALID_ADDRESS; return SP_ERROR_INVALID_ADDRESS;
m_ctx.hp = local_addr; hp_ = local_addr;
return SP_ERROR_NONE; return SP_ERROR_NONE;
} }
@ -233,7 +233,7 @@ PluginContext::HeapRelease(cell_t local_addr)
if (local_addr < (cell_t)m_pRuntime->plugin()->data_size) if (local_addr < (cell_t)m_pRuntime->plugin()->data_size)
return SP_ERROR_INVALID_ADDRESS; return SP_ERROR_INVALID_ADDRESS;
m_ctx.hp = local_addr - sizeof(cell_t); hp_ = local_addr - sizeof(cell_t);
return SP_ERROR_NONE; return SP_ERROR_NONE;
} }
@ -325,7 +325,7 @@ PluginContext::BindNativeToAny(SPVM_NATIVE_FUNC native)
int int
PluginContext::LocalToPhysAddr(cell_t local_addr, cell_t **phys_addr) PluginContext::LocalToPhysAddr(cell_t local_addr, cell_t **phys_addr)
{ {
if (((local_addr >= m_ctx.hp) && (local_addr < sp_)) || if (((local_addr >= hp_) && (local_addr < sp_)) ||
(local_addr < 0) || ((ucell_t)local_addr >= m_pRuntime->plugin()->mem_size)) (local_addr < 0) || ((ucell_t)local_addr >= m_pRuntime->plugin()->mem_size))
{ {
return SP_ERROR_INVALID_ADDRESS; return SP_ERROR_INVALID_ADDRESS;
@ -358,7 +358,7 @@ PluginContext::PushCellArray(cell_t *local_addr, cell_t **phys_addr, cell_t arra
int int
PluginContext::LocalToString(cell_t local_addr, char **addr) PluginContext::LocalToString(cell_t local_addr, char **addr)
{ {
if (((local_addr >= m_ctx.hp) && (local_addr < sp_)) || if (((local_addr >= hp_) && (local_addr < sp_)) ||
(local_addr < 0) || ((ucell_t)local_addr >= m_pRuntime->plugin()->mem_size)) (local_addr < 0) || ((ucell_t)local_addr >= m_pRuntime->plugin()->mem_size))
{ {
return SP_ERROR_INVALID_ADDRESS; return SP_ERROR_INVALID_ADDRESS;
@ -380,7 +380,7 @@ PluginContext::StringToLocal(cell_t local_addr, size_t bytes, const char *source
char *dest; char *dest;
size_t len; size_t len;
if (((local_addr >= m_ctx.hp) && (local_addr < sp_)) || if (((local_addr >= hp_) && (local_addr < sp_)) ||
(local_addr < 0) || ((ucell_t)local_addr >= m_pRuntime->plugin()->mem_size)) (local_addr < 0) || ((ucell_t)local_addr >= m_pRuntime->plugin()->mem_size))
{ {
return SP_ERROR_INVALID_ADDRESS; return SP_ERROR_INVALID_ADDRESS;
@ -443,7 +443,7 @@ PluginContext::StringToLocalUTF8(cell_t local_addr, size_t maxbytes, const char
size_t len; size_t len;
bool needtocheck = false; bool needtocheck = false;
if (((local_addr >= m_ctx.hp) && (local_addr < sp_)) || if (((local_addr >= hp_) && (local_addr < sp_)) ||
(local_addr < 0) || (local_addr < 0) ||
((ucell_t)local_addr >= m_pRuntime->plugin()->mem_size)) ((ucell_t)local_addr >= m_pRuntime->plugin()->mem_size))
{ {
@ -548,7 +548,7 @@ PluginContext::Execute2(IPluginFunction *function, const cell_t *params, unsigne
if (m_pRuntime->IsPaused()) if (m_pRuntime->IsPaused())
return SP_ERROR_NOT_RUNNABLE; return SP_ERROR_NOT_RUNNABLE;
if ((cell_t)(m_ctx.hp + 16*sizeof(cell_t)) > (cell_t)(sp_ - (sizeof(cell_t) * (num_params + 1)))) if ((cell_t)(hp_ + 16*sizeof(cell_t)) > (cell_t)(sp_ - (sizeof(cell_t) * (num_params + 1))))
return SP_ERROR_STACKLOW; return SP_ERROR_STACKLOW;
if (result == NULL) if (result == NULL)
@ -579,7 +579,7 @@ PluginContext::Execute2(IPluginFunction *function, const cell_t *params, unsigne
cell_t save_sp, save_hp, save_rp, save_cip; cell_t save_sp, save_hp, save_rp, save_cip;
save_sp = sp_; save_sp = sp_;
save_hp = m_ctx.hp; save_hp = hp_;
save_exec = m_InExec; save_exec = m_InExec;
save_n_idx = last_native_; save_n_idx = last_native_;
save_rp = rp_; save_rp = rp_;
@ -620,10 +620,10 @@ PluginContext::Execute2(IPluginFunction *function, const cell_t *params, unsigne
sp_, sp_,
save_sp); save_sp);
} }
if (m_ctx.hp != save_hp) { if (hp_ != save_hp) {
ir = SP_ERROR_HEAPLEAK; ir = SP_ERROR_HEAPLEAK;
_SetErrorMessage("Heap leak detected: hp:%d should be %d!", _SetErrorMessage("Heap leak detected: hp:%d should be %d!",
m_ctx.hp, hp_,
save_hp); save_hp);
} }
if (rp_ != save_rp) { if (rp_ != save_rp) {
@ -641,7 +641,7 @@ PluginContext::Execute2(IPluginFunction *function, const cell_t *params, unsigne
Environment::get()->ReportError(m_pRuntime, ir, m_MsgCache, save_rp); Environment::get()->ReportError(m_pRuntime, ir, m_MsgCache, save_rp);
sp_ = save_sp; sp_ = save_sp;
m_ctx.hp = save_hp; hp_ = save_hp;
rp_ = save_rp; rp_ = save_rp;
cip_ = save_cip; cip_ = save_cip;
@ -823,10 +823,10 @@ PluginContext::popTrackerAndSetHeap()
return SP_ERROR_TRACKER_BOUNDS; return SP_ERROR_TRACKER_BOUNDS;
ucell_t amt = *tracker_.pCur; ucell_t amt = *tracker_.pCur;
if (amt > (m_ctx.hp - m_pRuntime->plugin()->data_size)) if (amt > (hp_ - m_pRuntime->plugin()->data_size))
return SP_ERROR_HEAPMIN; return SP_ERROR_HEAPMIN;
m_ctx.hp -= amt; hp_ -= amt;
return SP_ERROR_NONE; return SP_ERROR_NONE;
} }
@ -855,7 +855,7 @@ cell_t
PluginContext::invokeNative(ucell_t native_idx, cell_t *params) PluginContext::invokeNative(ucell_t native_idx, cell_t *params)
{ {
cell_t save_sp = sp_; cell_t save_sp = sp_;
cell_t save_hp = m_ctx.hp; cell_t save_hp = hp_;
// Note: Invoke() saves the last native, so we don't need to here. // Note: Invoke() saves the last native, so we don't need to here.
last_native_ = native_idx; last_native_ = native_idx;
@ -876,7 +876,7 @@ PluginContext::invokeNative(ucell_t native_idx, cell_t *params)
native_error_ = SP_ERROR_STACKLEAK; native_error_ = SP_ERROR_STACKLEAK;
return result; return result;
} }
if (save_hp != m_ctx.hp) { if (save_hp != hp_) {
native_error_ = SP_ERROR_HEAPLEAK; native_error_ = SP_ERROR_HEAPLEAK;
return result; return result;
} }
@ -888,7 +888,7 @@ cell_t
PluginContext::invokeBoundNative(SPVM_NATIVE_FUNC pfn, cell_t *params) PluginContext::invokeBoundNative(SPVM_NATIVE_FUNC pfn, cell_t *params)
{ {
cell_t save_sp = sp_; cell_t save_sp = sp_;
cell_t save_hp = m_ctx.hp; cell_t save_hp = hp_;
cell_t result = pfn(this, params); cell_t result = pfn(this, params);
@ -899,10 +899,161 @@ PluginContext::invokeBoundNative(SPVM_NATIVE_FUNC pfn, cell_t *params)
native_error_ = SP_ERROR_STACKLEAK; native_error_ = SP_ERROR_STACKLEAK;
return result; return result;
} }
if (save_hp != m_ctx.hp) { if (save_hp != hp_) {
native_error_ = SP_ERROR_HEAPLEAK; native_error_ = SP_ERROR_HEAPLEAK;
return result; return result;
} }
return result; return result;
} }
struct array_creation_t
{
const cell_t *dim_list; /* Dimension sizes */
cell_t dim_count; /* Number of dimensions */
cell_t *data_offs; /* Current offset AFTER the indirection vectors (data) */
cell_t *base; /* array base */
};
static cell_t
GenerateInnerArrayIndirectionVectors(array_creation_t *ar, int dim, cell_t cur_offs)
{
cell_t write_offs = cur_offs;
cell_t *data_offs = ar->data_offs;
cur_offs += ar->dim_list[dim];
// Dimension n-x where x > 2 will have sub-vectors.
// Otherwise, we just need to reference the data section.
if (ar->dim_count > 2 && dim < ar->dim_count - 2) {
// For each index at this dimension, write offstes to our sub-vectors.
// After we write one sub-vector, we generate its sub-vectors recursively.
// At the end, we're given the next offset we can use.
for (int i = 0; i < ar->dim_list[dim]; i++) {
ar->base[write_offs] = (cur_offs - write_offs) * sizeof(cell_t);
write_offs++;
cur_offs = GenerateInnerArrayIndirectionVectors(ar, dim + 1, cur_offs);
}
} else {
// In this section, there are no sub-vectors, we need to write offsets
// to the data. This is separate so the data stays in one big chunk.
// The data offset will increment by the size of the last dimension,
// because that is where the data is finally computed as.
for (int i = 0; i < ar->dim_list[dim]; i++) {
ar->base[write_offs] = (*data_offs - write_offs) * sizeof(cell_t);
write_offs++;
*data_offs = *data_offs + ar->dim_list[dim + 1];
}
}
return cur_offs;
}
static cell_t
calc_indirection(const array_creation_t *ar, cell_t dim)
{
cell_t size = ar->dim_list[dim];
if (dim < ar->dim_count - 2)
size += ar->dim_list[dim] * calc_indirection(ar, dim + 1);
return size;
}
static cell_t
GenerateArrayIndirectionVectors(cell_t *arraybase, cell_t dims[], cell_t _dimcount, bool autozero)
{
array_creation_t ar;
cell_t data_offs;
/* Reverse the dimensions */
cell_t dim_list[sDIMEN_MAX];
int cur_dim = 0;
for (int i = _dimcount - 1; i >= 0; i--)
dim_list[cur_dim++] = dims[i];
ar.base = arraybase;
ar.dim_list = dim_list;
ar.dim_count = _dimcount;
ar.data_offs = &data_offs;
data_offs = calc_indirection(&ar, 0);
GenerateInnerArrayIndirectionVectors(&ar, 0, 0);
return data_offs;
}
int
PluginContext::generateFullArray(uint32_t argc, cell_t *argv, int autozero)
{
// Calculate how many cells are needed.
if (argv[0] <= 0)
return SP_ERROR_ARRAY_TOO_BIG;
uint32_t cells = argv[0];
for (uint32_t dim = 1; dim < argc; dim++) {
cell_t dimsize = argv[dim];
if (dimsize <= 0)
return SP_ERROR_ARRAY_TOO_BIG;
if (!ke::IsUint32MultiplySafe(cells, dimsize))
return SP_ERROR_ARRAY_TOO_BIG;
cells *= uint32_t(dimsize);
if (!ke::IsUint32AddSafe(cells, dimsize))
return SP_ERROR_ARRAY_TOO_BIG;
cells += uint32_t(dimsize);
}
if (!ke::IsUint32MultiplySafe(cells, 4))
return SP_ERROR_ARRAY_TOO_BIG;
uint32_t bytes = cells * 4;
if (!ke::IsUint32AddSafe(hp_, bytes))
return SP_ERROR_ARRAY_TOO_BIG;
uint32_t new_hp = hp_ + bytes;
cell_t *dat_hp = reinterpret_cast<cell_t *>(m_pRuntime->plugin()->memory + new_hp);
// argv, coincidentally, is STK.
if (dat_hp >= argv - STACK_MARGIN)
return SP_ERROR_HEAPLOW;
if (int err = pushTracker(bytes))
return err;
cell_t *base = reinterpret_cast<cell_t *>(m_pRuntime->plugin()->memory + hp_);
cell_t offs = GenerateArrayIndirectionVectors(base, argv, argc, !!autozero);
assert(size_t(offs) == cells);
argv[argc - 1] = hp_;
hp_ = new_hp;
return SP_ERROR_NONE;
}
int
PluginContext::generateArray(cell_t dims, cell_t *stk, bool autozero)
{
if (dims == 1) {
uint32_t size = *stk;
if (size == 0 || !ke::IsUint32MultiplySafe(size, 4))
return SP_ERROR_ARRAY_TOO_BIG;
*stk = hp_;
uint32_t bytes = size * 4;
hp_ += bytes;
if (uintptr_t(m_pRuntime->plugin()->memory + hp_) >= uintptr_t(stk))
return SP_ERROR_HEAPLOW;
if (int err = pushTracker(bytes))
return err;
if (autozero)
memset(m_pRuntime->plugin()->memory + hp_, 0, bytes);
return SP_ERROR_NONE;
}
if (int err = generateFullArray(dims, stk, autozero))
return err;
return SP_ERROR_NONE;
}

24
sourcepawn/jit/plugin-context.h
View File

@ -119,6 +119,9 @@ class PluginContext : public IPluginContext
cell_t *addressOfFrm() { cell_t *addressOfFrm() {
return &frm_; return &frm_;
} }
cell_t *addressOfHp() {
return &hp_;
}
int32_t cip() const { int32_t cip() const {
return cip_; return cip_;
@ -126,6 +129,9 @@ class PluginContext : public IPluginContext
cell_t frm() const { cell_t frm() const {
return frm_; return frm_;
} }
cell_t hp() const {
return hp_;
}
// Return stack logic. // Return stack logic.
bool pushReturnCip(cell_t cip) { bool pushReturnCip(cell_t cip) {
@ -149,12 +155,27 @@ class PluginContext : public IPluginContext
int popTrackerAndSetHeap(); int popTrackerAndSetHeap();
int pushTracker(uint32_t amount); int pushTracker(uint32_t amount);
int generateArray(cell_t dims, cell_t *stk, bool autozero);
int generateFullArray(uint32_t argc, cell_t *argv, int autozero);
cell_t invokeNative(ucell_t native_idx, cell_t *params); cell_t invokeNative(ucell_t native_idx, cell_t *params);
cell_t invokeBoundNative(SPVM_NATIVE_FUNC pfn, cell_t *params); cell_t invokeBoundNative(SPVM_NATIVE_FUNC pfn, cell_t *params);
int lastNative() const { int lastNative() const {
return last_native_; return last_native_;
} }
inline bool checkAddress(cell_t *stk, cell_t addr) {
if (uint32_t(addr) >= m_pRuntime->plugin()->mem_size)
return false;
if (addr < hp_)
return true;
if (reinterpret_cast<cell_t *>(m_pRuntime->plugin()->memory + addr) < stk)
return false;
return true;
}
private: private:
void SetErrorMessage(const char *msg, va_list ap); void SetErrorMessage(const char *msg, va_list ap);
void _SetErrorMessage(const char *msg, ...); void _SetErrorMessage(const char *msg, ...);
@ -184,8 +205,9 @@ class PluginContext : public IPluginContext
// Most recent CIP. // Most recent CIP.
int32_t cip_; int32_t cip_;
// Stack and frame pointer. // Stack, heap, and frame pointer.
cell_t sp_; cell_t sp_;
cell_t hp_;
cell_t frm_; cell_t frm_;
}; };

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

@ -77,128 +77,6 @@ OpToCondition(OPCODE op)
} }
} }
struct array_creation_t
{
const cell_t *dim_list; /* Dimension sizes */
cell_t dim_count; /* Number of dimensions */
cell_t *data_offs; /* Current offset AFTER the indirection vectors (data) */
cell_t *base; /* array base */
};
static cell_t
GenerateInnerArrayIndirectionVectors(array_creation_t *ar, int dim, cell_t cur_offs)
{
cell_t write_offs = cur_offs;
cell_t *data_offs = ar->data_offs;
cur_offs += ar->dim_list[dim];
// Dimension n-x where x > 2 will have sub-vectors.
// Otherwise, we just need to reference the data section.
if (ar->dim_count > 2 && dim < ar->dim_count - 2) {
// For each index at this dimension, write offstes to our sub-vectors.
// After we write one sub-vector, we generate its sub-vectors recursively.
// At the end, we're given the next offset we can use.
for (int i = 0; i < ar->dim_list[dim]; i++) {
ar->base[write_offs] = (cur_offs - write_offs) * sizeof(cell_t);
write_offs++;
cur_offs = GenerateInnerArrayIndirectionVectors(ar, dim + 1, cur_offs);
}
} else {
// In this section, there are no sub-vectors, we need to write offsets
// to the data. This is separate so the data stays in one big chunk.
// The data offset will increment by the size of the last dimension,
// because that is where the data is finally computed as.
for (int i = 0; i < ar->dim_list[dim]; i++) {
ar->base[write_offs] = (*data_offs - write_offs) * sizeof(cell_t);
write_offs++;
*data_offs = *data_offs + ar->dim_list[dim + 1];
}
}
return cur_offs;
}
static cell_t
calc_indirection(const array_creation_t *ar, cell_t dim)
{
cell_t size = ar->dim_list[dim];
if (dim < ar->dim_count - 2)
size += ar->dim_list[dim] * calc_indirection(ar, dim + 1);
return size;
}
static cell_t
GenerateArrayIndirectionVectors(cell_t *arraybase, cell_t dims[], cell_t _dimcount, bool autozero)
{
array_creation_t ar;
cell_t data_offs;
/* Reverse the dimensions */
cell_t dim_list[sDIMEN_MAX];
int cur_dim = 0;
for (int i = _dimcount - 1; i >= 0; i--)
dim_list[cur_dim++] = dims[i];
ar.base = arraybase;
ar.dim_list = dim_list;
ar.dim_count = _dimcount;
ar.data_offs = &data_offs;
data_offs = calc_indirection(&ar, 0);
GenerateInnerArrayIndirectionVectors(&ar, 0, 0);
return data_offs;
}
int
GenerateFullArray(PluginRuntime *rt, uint32_t argc, cell_t *argv, int autozero)
{
sp_context_t *ctx = rt->GetBaseContext()->GetCtx();
// Calculate how many cells are needed.
if (argv[0] <= 0)
return SP_ERROR_ARRAY_TOO_BIG;
uint32_t cells = argv[0];
for (uint32_t dim = 1; dim < argc; dim++) {
cell_t dimsize = argv[dim];
if (dimsize <= 0)
return SP_ERROR_ARRAY_TOO_BIG;
if (!ke::IsUint32MultiplySafe(cells, dimsize))
return SP_ERROR_ARRAY_TOO_BIG;
cells *= uint32_t(dimsize);
if (!ke::IsUint32AddSafe(cells, dimsize))
return SP_ERROR_ARRAY_TOO_BIG;
cells += uint32_t(dimsize);
}
if (!ke::IsUint32MultiplySafe(cells, 4))
return SP_ERROR_ARRAY_TOO_BIG;
uint32_t bytes = cells * 4;
if (!ke::IsUint32AddSafe(ctx->hp, bytes))
return SP_ERROR_ARRAY_TOO_BIG;
uint32_t new_hp = ctx->hp + bytes;
cell_t *dat_hp = reinterpret_cast<cell_t *>(rt->plugin()->memory + new_hp);
// argv, coincidentally, is STK.
if (dat_hp >= argv - STACK_MARGIN)
return SP_ERROR_HEAPLOW;
if (int err = rt->GetBaseContext()->pushTracker(bytes))
return err;
cell_t *base = reinterpret_cast<cell_t *>(rt->plugin()->memory + ctx->hp);
cell_t offs = GenerateArrayIndirectionVectors(base, argv, argc, !!autozero);
assert(size_t(offs) == cells);
argv[argc - 1] = ctx->hp;
ctx->hp = new_hp;
return SP_ERROR_NONE;
}
#if !defined NDEBUG #if !defined NDEBUG
static const char * static const char *
GetFunctionName(const sp_plugin_t *plugin, uint32_t offs) GetFunctionName(const sp_plugin_t *plugin, uint32_t offs)
@ -410,6 +288,12 @@ InvokeBoundNativeHelper(PluginContext *cx, SPVM_NATIVE_FUNC fn, cell_t *params)
return cx->invokeBoundNative(fn, params); return cx->invokeBoundNative(fn, params);
} }
static int
InvokeGenerateFullArray(PluginContext *cx, uint32_t argc, cell_t *argv, int autozero)
{
return cx->generateFullArray(argc, argv, autozero);
}
bool bool
Compiler::emitOp(OPCODE op) Compiler::emitOp(OPCODE op)
{ {
@ -1458,8 +1342,8 @@ Compiler::emitGenArray(bool autozero)
__ push(autozero ? 1 : 0); __ push(autozero ? 1 : 0);
__ push(stk); __ push(stk);
__ push(val); __ push(val);
__ push(intptr_t(rt_)); __ push(intptr_t(context_));
__ call(ExternalAddress((void *)GenerateFullArray)); __ call(ExternalAddress((void *)InvokeGenerateFullArray));
__ addl(esp, 4 * sizeof(void *)); __ addl(esp, 4 * sizeof(void *));
// restore pri to tmp // restore pri to tmp

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

@ -94,8 +94,7 @@ class Compiler
return ExternalAddress(context_->addressOfCip()); return ExternalAddress(context_->addressOfCip());
} }
ExternalAddress hpAddr() { ExternalAddress hpAddr() {
sp_context_t *ctx = rt_->GetBaseContext()->GetCtx(); return ExternalAddress(context_->addressOfHp());
return ExternalAddress(&ctx->hp);
} }
ExternalAddress frmAddr() { ExternalAddress frmAddr() {
return ExternalAddress(context_->addressOfFrm()); return ExternalAddress(context_->addressOfFrm());