team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small fixes for more robustness (more for testing). 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1643 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-12-01 01:16:55 +00:00
parent 7d5cacecab
commit 777cbdb6bc
3 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/plugin.c
View File

@ -37,7 +37,7 @@ int (QDECL *plugin_syscall)( int arg, ... );
#define PASSFLOAT(f) *(int*)&(f)
#define ARGNAMES ,funcname
BUILTINR(void*, Plug_GetEngineFunction, (char *funcname));
BUILTINR(funcptr_t, Plug_GetEngineFunction, (char *funcname));
#undef ARGNAMES
#define ARGNAMES ,funcname,expnum
@ -228,17 +228,25 @@ void Sys_Errorf(char *format, ...)
Sys_Error(string);
}
void BadBuiltin(void)
{
Sys_Error("Plugin tried calling a missing builtin\n");
}
void Plug_InitStandardBuiltins(void)
{
//con_print is used if the others don't exist, and MUST come first (for the sake of sanity)
CHECKBUILTIN(Con_Print);
CHECKBUILTIN(Plug_ExportToEngine);
CHECKBUILTIN(Sys_Error);
#ifdef Q3_VM
CHECKBUILTIN(memcpy);
CHECKBUILTIN(memmove);
CHECKBUILTIN(memset);
#endif
CHECKBUILTIN(Plug_ExportToEngine);
CHECKBUILTIN(Con_Print);
CHECKBUILTIN(Sys_Error);
CHECKBUILTIN(Sys_Milliseconds);
//command execution

37
plugins/plugin.h
View File

@ -1,13 +1,24 @@
#ifndef __PLUGIN_H__
#define __PLUGIN_H__
#ifdef Q3_VM
#define TESTBI 1
#ifdef TESTBI
# define EBUILTIN(t, n, args) extern t (*n) args
# define BUILTINR(t, n, args) t (*n) args
# define BUILTIN(t, n, args) t (*n) args
# define BUILTINISVALID(n) (n!=NULL && (funcptr_t)n != (funcptr_t)&BadBuiltin)
# define CHECKBUILTIN(n) n = (funcptr_t)Plug_GetEngineFunction(#n);if (n==NULL) {n = (funcptr_t)&BadBuiltin;Con_Print("Warning: builtin "#n" is not supported by the engine\n");}
#else
//qvms just call the return value, and the engine works out which one it called.
#define EBUILTIN(t, n, args) extern t (*n) args
#define BUILTINR(t, n, args) t (*n) args
#define BUILTIN(t, n, args) t (*n) args
#define CHECKBUILTIN(n) n = (void*)Plug_GetEngineFunction(#n);
#define BUILTINISVALID(n) n!=NULL
# define EBUILTIN(t, n, args) extern t (*n) args
# define BUILTINR(t, n, args) t (*n) args
# define BUILTIN(t, n, args) t (*n) args
# define CHECKBUILTIN(n) n = (funcptr_t)Plug_GetEngineFunction(#n);
# define BUILTINISVALID(n) n!=NULL
#endif
#define double float //all floats are 32bit, qvm stuff
@ -27,6 +38,8 @@ char *strchr(char *str, char sub);
float atof(char *str);
int atoi(char *str);
void BadBuiltin(void);
#else
#include <string.h>
@ -34,8 +47,14 @@ int atoi(char *str);
#include <stdarg.h>
//DLLs need a wrapper to add the extra parameter and call a boring function.
#define EBUILTIN(t, n, args) extern int BUILTIN_##n; t n args
#define BUILTINR(t, n, args) int BUILTIN_##n; t n args {return (t)plugin_syscall(BUILTIN_##n ARGNAMES);}
#define BUILTIN(t, n, args) int BUILTIN_##n; t n args {plugin_syscall(BUILTIN_##n ARGNAMES);}
#define TEST
#ifdef TEST
#define BUILTINR(t, n, args) int BUILTIN_##n; t n args {if (!BUILTINISVALID(n))Sys_Error("Builtin %s is not valid\n", #n);return (t)plugin_syscall(BUILTIN_##n ARGNAMES);}
#define BUILTIN(t, n, args) int BUILTIN_##n; t n args {if (!BUILTINISVALID(n))Sys_Error("Builtin %s is not valid\n", #n);plugin_syscall(BUILTIN_##n ARGNAMES);}
#else
#define BUILTINR(t, n, args) int BUILTIN_##n; t n args {return (t)plugin_syscall(BUILTIN_##n ARGNAMES);}
#define BUILTIN(t, n, args) int BUILTIN_##n; t n args {plugin_syscall(BUILTIN_##n ARGNAMES);}
#endif
#define CHECKBUILTIN(n) BUILTIN_##n = (int)Plug_GetEngineFunction(#n);
#define BUILTINISVALID(n) BUILTIN_##n != 0
#ifdef _WIN32
@ -55,11 +74,12 @@ int snprintf(char *buffer, int maxlen, char *format, ...);
typedef enum {false, true} qboolean;
typedef void *qhandle_t;
typedef float vec3_t[3];
typedef void* funcptr_t;
//Basic builtins:
EBUILTIN(void*, Plug_GetEngineFunction, (char *funcname)); //set up in vmMain, use this to get all other builtins
EBUILTIN(funcptr_t, Plug_GetEngineFunction, (char *funcname)); //set up in vmMain, use this to get all other builtins
EBUILTIN(void, Con_Print, (char *text)); //on to main console.
EBUILTIN(void, Con_SubPrint, (char *subname, char *text)); //on to sub console.
EBUILTIN(void, Con_RenameSub, (char *old, char *new)); //rename a console.
@ -117,6 +137,7 @@ EBUILTIN(void, Net_Close, (int socket));
#ifdef Q3_VM
EBUILTIN(void, memcpy, (void *, void *, int len));
EBUILTIN(void, memmove, (void *, void *, int len));
EBUILTIN(void, memset, (void *, int, int len));
#endif

3
plugins/qvm_api.c
View File

@ -102,6 +102,8 @@ retry:
while(_int)
{
tempbuffer[i] = _int%16 + '0';
if (tempbuffer[i] > '9')
tempbuffer[i] = tempbuffer[i] - ':' + 'a';
_int/=16;
i--;
}
@ -466,6 +468,7 @@ float atof(char *str)
}
if (*str == '.')
{ //each time we find a new digit, decrease the value of the following digits.
str++;
while(1)
{
if (*str >= '0' && *str <= '9')