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

updated all api to use new function id system

Browse Source 
fixed a codegen bug in function ids
removed extra native status, simplified native binding

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40169
This commit is contained in:
David Anderson
2006-11-08 08:41:18 +00:00
parent 2892ee1fa9
commit e060af14b4
7 changed files with 77 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sourcepawn/jit/x86/jit_x86.cpp
+14 -5
View File
@@ -1747,15 +1747,22 @@ cell_t NativeCallback(sp_context_t *ctx, ucell_t native_idx, cell_t *params)
sp_native_t *native = &ctx->natives[native_idx];
/* Technically both aren't needed, I guess */
if (native->status == SP_NATIVE_NONE)
if (native->status == SP_NATIVE_UNBOUND)
{
ctx->err = SP_ERROR_NATIVE_PENDING;
ctx->err = SP_ERROR_INVALID_NATIVE;
return 0;
}
return native->pfn(ctx, params);
}
cell_t InvalidNative(sp_context_t *ctx, cell_t *params)
{
ctx->err = SP_ERROR_INVALID_NATIVE;
return 0;
}
cell_t NativeCallback_Debug(sp_context_t *ctx, ucell_t native_idx, cell_t *params)
{
cell_t save_sp = ctx->sp;
@@ -2002,7 +2009,9 @@ jit_rewind:
for (iter=0; iter<max; iter++)
{
ctx->publics[iter].name = strbase + plugin->info.publics[iter].name;
ctx->publics[iter].offs = RelocLookup(jit, plugin->info.publics[iter].address, false);
ctx->publics[iter].code_offs = RelocLookup(jit, plugin->info.publics[iter].address, false);
/* Encode the ID as a straight code offset */
ctx->publics[iter].funcid = (ctx->publics[iter].code_offs << 1);
}
}
@@ -2025,8 +2034,8 @@ jit_rewind:
for (iter=0; iter<max; iter++)
{
ctx->natives[iter].name = strbase + plugin->info.natives[iter].name;
ctx->natives[iter].pfn = NULL;
ctx->natives[iter].status = SP_NATIVE_NONE;
ctx->natives[iter].pfn = &InvalidNative;
ctx->natives[iter].status = SP_NATIVE_UNBOUND;
}
}
sourcepawn/jit/x86/msvc8/jit-x86.vcproj
+4 -8
View File
@@ -247,23 +247,19 @@
>
</File>
<File
RelativePath="..\..\..\..\include\sp_file_headers.h"
RelativePath="..\..\..\include\sp_file_headers.h"
>
</File>
<File
RelativePath="..\..\..\..\include\sp_vm_api.h"
RelativePath="..\..\..\include\sp_vm_api.h"
>
</File>
<File
RelativePath="..\..\..\..\include\sp_vm_base.h"
RelativePath="..\..\..\include\sp_vm_base.h"
>
</File>
<File
RelativePath="..\..\..\..\include\sp_vm_context.h"
>
</File>
<File
RelativePath="..\..\..\..\include\sp_vm_types.h"
RelativePath="..\..\..\include\sp_vm_types.h"
>
</File>
</Filter>