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/include/sp_vm_api.h
+19 -9
View File
@@ -8,6 +8,9 @@ namespace SourcePawn
{
class IVirtualMachine;
/**
* @brief Interface to managing a debug context at runtime.
*/
class IPluginDebugInfo
{
public:
@@ -36,6 +39,9 @@ namespace SourcePawn
virtual int LookupLine(ucell_t addr, uint32_t *line) =0;
};
/**
* @brief Interface to managing a context at runtime.
*/
class IPluginContext
{
public:
@@ -260,7 +266,6 @@ namespace SourcePawn
/**
* Binds a list of native names and their function pointers to a context.
* If num is 0, the list is read until an entry with a NULL name is reached.
* All natives are assigned a status of SP_NATIVE_OKAY by default.
* If overwrite is non-zero, already registered natives will be overwritten.
*
* @param natives Array of natives.
@@ -272,29 +277,31 @@ namespace SourcePawn
/**
* Binds a single native. Overwrites any existing bind.
* If the context does not contain the native that will be binded the function will return
* with a SP_ERROR_OT_FOUND error.
* with a SP_ERROR_NOT_FOUND error.
*
* @param native Pointer to native.
* @param status Status value to set (should be SP_NATIVE_OKAY).
*/
virtual int BindNative(sp_nativeinfo_t *native, uint32_t status) =0;
virtual int BindNative(sp_nativeinfo_t *native) =0;
/**
* Binds a single native to any non-registered or pending native.
* Status is automatically set to pending.
* Binds a single native to any non-registered native.
*
* @param native Native to bind.
*/
virtual int BindNativeToAny(SPVM_NATIVE_FUNC native) =0;
/**
* Executes a public function.
* Executes a function ID located in this context.
*
* @param funcid Function id to execute.
* @param result Pointer to store the return value (required).
* @return Error code (if any) from the VM.
*/
virtual int Execute(uint32_t public_func, cell_t *result) =0;
virtual int Execute(uint32_t funcid, cell_t *result) =0;
};
/**
* Contains helper functions used by VMs and the host app
* @brief Contains helper functions used by VMs and the host app
*/
class ISourcePawnEngine
{
@@ -379,6 +386,9 @@ namespace SourcePawn
virtual ~ICompilation() { };
};
/**
* @brief Outlines the interface a Virtual Machine (JIT) must expose
*/
class IVirtualMachine
{
public:
sourcepawn/include/sp_vm_types.h
+19 -18
View File
@@ -5,6 +5,7 @@
typedef uint32_t ucell_t;
typedef int32_t cell_t;
typedef uint32_t funcid_t;
/**
* Error codes
@@ -17,20 +18,20 @@ typedef int32_t cell_t;
#define SP_ERROR_INVALID_ADDRESS 5 /* A memory address was not valid */
#define SP_ERROR_NOT_FOUND 6 /* The object in question was not found */
#define SP_ERROR_INDEX 7 /* Invalid index parameter */
#define SP_ERROR_NATIVE_PENDING 8 /* A script tried to exec an unbound native */
#define SP_ERROR_STACKLOW 9 /* Nnot enough space left on the stack */
#define SP_ERROR_NOTDEBUGGING 10 /* Debug mode was not on or debug section not found */
#define SP_ERROR_INVALID_INSTRUCTION 11 /* Invalid instruction was encountered */
#define SP_ERROR_MEMACCESS 12 /* Invalid memory access */
#define SP_ERROR_STACKMIN 13 /* Stack went beyond its minimum value */
#define SP_ERROR_HEAPMIN 14 /* Heap went beyond its minimum value */
#define SP_ERROR_DIVIDE_BY_ZERO 15 /* Division by zero */
#define SP_ERROR_ARRAY_BOUNDS 16 /* Array index is out of bounds */
#define SP_ERROR_INSTRUCTION_PARAM 17 /* Instruction had an invalid parameter */
#define SP_ERROR_STACKLEAK 18 /* A native leaked an item on the stack */
#define SP_ERROR_HEAPLEAK 19 /* A native leaked an item on the heap */
#define SP_ERROR_ARRAY_TOO_BIG 20 /* A dynamic array is too big */
#define SP_ERROR_TRACKER_BOUNDS 21 /* Tracker stack is out of bounds */
#define SP_ERROR_STACKLOW 8 /* Nnot enough space left on the stack */
#define SP_ERROR_NOTDEBUGGING 9 /* Debug mode was not on or debug section not found */
#define SP_ERROR_INVALID_INSTRUCTION 10 /* Invalid instruction was encountered */
#define SP_ERROR_MEMACCESS 11 /* Invalid memory access */
#define SP_ERROR_STACKMIN 12 /* Stack went beyond its minimum value */
#define SP_ERROR_HEAPMIN 13 /* Heap went beyond its minimum value */
#define SP_ERROR_DIVIDE_BY_ZERO 14 /* Division by zero */
#define SP_ERROR_ARRAY_BOUNDS 15 /* Array index is out of bounds */
#define SP_ERROR_INSTRUCTION_PARAM 16 /* Instruction had an invalid parameter */
#define SP_ERROR_STACKLEAK 17 /* A native leaked an item on the stack */
#define SP_ERROR_HEAPLEAK 18 /* A native leaked an item on the heap */
#define SP_ERROR_ARRAY_TOO_BIG 19 /* A dynamic array is too big */
#define SP_ERROR_TRACKER_BOUNDS 20 /* Tracker stack is out of bounds */
#define SP_ERROR_INVALID_NATIVE 21 /* Native was pending or invalid */
/**********************************************
*** The following structures are reference structures.
@@ -117,7 +118,8 @@ typedef cell_t (*SPVM_NATIVE_FUNC)(struct sp_context_s *, cell_t *);
*/
typedef struct sp_public_s
{
uint32_t offs; /* code offset */
funcid_t funcid; /* encoded function id */
uint32_t code_offs; /* code offset */
const char *name; /* name */
} sp_public_t;
@@ -132,9 +134,8 @@ typedef struct sp_pubvar_s
const char *name; /* name */
} sp_pubvar_t;
#define SP_NATIVE_NONE (0) /* Native is not yet found */
#define SP_NATIVE_OKAY (1) /* Native has been added */
#define SP_NATIVE_PENDING (2) /* Native is marked as usable but replaceable */
#define SP_NATIVE_UNBOUND (0) /* Native is undefined */
#define SP_NATIVE_BOUND (1) /* Native is bound */
/**
* Native lookup table, by default names