Auios/BlockLua
1
0
Fork 0
forked from redo/BlockLua
Code Pull Requests Activity

.clang-format updates

Browse Source
This commit is contained in:
Connor O'Connor
2025-10-06 17:00:12 -04:00
parent 5718ba8e6b
commit ed5c254480
15 changed files with 617 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
.clang-format
View File

@@ -1,4 +1,6 @@
BasedOnStyle: LLVM BasedOnStyle: LLVM
# Include sorting and grouping
SortIncludes: CaseSensitive SortIncludes: CaseSensitive
IncludeBlocks: Preserve IncludeBlocks: Preserve
IncludeCategories: IncludeCategories:
@@ -12,3 +14,29 @@ IncludeCategories:
Priority: 4 Priority: 4
- Regex: ".*" - Regex: ".*"
Priority: 5 Priority: 5
# Indentation settings
IndentWidth: 2
UseTab: Never
IndentAccessModifiers: false
AccessModifierOffset: 0
NamespaceIndentation: All
# Line breaking and wrapping
ColumnLimit: 120
BreakBeforeTernaryOperators: false
BreakBeforeBinaryOperators: None
AlwaysBreakAfterReturnType: None
AlwaysBreakAfterDefinitionReturnType: None
# Alignment
AlignOperands: DontAlign
AlignAfterOpenBracket: AlwaysBreak
PointerAlignment: Left
# Parameter formatting
BinPackParameters: false
AllowAllParametersOfDeclarationOnNextLine: false
# Code organization
SeparateDefinitionBlocks: Always

122
inc/lua/lauxlib.h
View File

@@ -16,76 +16,63 @@
#define LUA_ERRFILE (LUA_ERRERR + 1) #define LUA_ERRFILE (LUA_ERRERR + 1)
typedef struct luaL_Reg { typedef struct luaL_Reg {
const char *name; const char* name;
lua_CFunction func; lua_CFunction func;
} luaL_Reg; } luaL_Reg;
LUALIB_API void(luaL_openlib)(lua_State *L, const char *libname, LUALIB_API void(luaL_openlib)(lua_State* L, const char* libname, const luaL_Reg* l, int nup);
const luaL_Reg *l, int nup); LUALIB_API void(luaL_register)(lua_State* L, const char* libname, const luaL_Reg* l);
LUALIB_API void(luaL_register)(lua_State *L, const char *libname, LUALIB_API int(luaL_getmetafield)(lua_State* L, int obj, const char* e);
const luaL_Reg *l); LUALIB_API int(luaL_callmeta)(lua_State* L, int obj, const char* e);
LUALIB_API int(luaL_getmetafield)(lua_State *L, int obj, const char *e); LUALIB_API int(luaL_typerror)(lua_State* L, int narg, const char* tname);
LUALIB_API int(luaL_callmeta)(lua_State *L, int obj, const char *e); LUALIB_API int(luaL_argerror)(lua_State* L, int numarg, const char* extramsg);
LUALIB_API int(luaL_typerror)(lua_State *L, int narg, const char *tname); LUALIB_API const char*(luaL_checklstring)(lua_State * L, int numArg, size_t* l);
LUALIB_API int(luaL_argerror)(lua_State *L, int numarg, const char *extramsg); LUALIB_API const char*(luaL_optlstring)(lua_State * L, int numArg, const char* def, size_t* l);
LUALIB_API const char *(luaL_checklstring)(lua_State * L, int numArg, LUALIB_API lua_Number(luaL_checknumber)(lua_State* L, int numArg);
size_t *l); LUALIB_API lua_Number(luaL_optnumber)(lua_State* L, int nArg, lua_Number def);
LUALIB_API const char *(luaL_optlstring)(lua_State * L, int numArg,
const char *def, size_t *l);
LUALIB_API lua_Number(luaL_checknumber)(lua_State *L, int numArg);
LUALIB_API lua_Number(luaL_optnumber)(lua_State *L, int nArg, lua_Number def);
LUALIB_API lua_Integer(luaL_checkinteger)(lua_State *L, int numArg); LUALIB_API lua_Integer(luaL_checkinteger)(lua_State* L, int numArg);
LUALIB_API lua_Integer(luaL_optinteger)(lua_State *L, int nArg, LUALIB_API lua_Integer(luaL_optinteger)(lua_State* L, int nArg, lua_Integer def);
lua_Integer def);
LUALIB_API void(luaL_checkstack)(lua_State *L, int sz, const char *msg); LUALIB_API void(luaL_checkstack)(lua_State* L, int sz, const char* msg);
LUALIB_API void(luaL_checktype)(lua_State *L, int narg, int t); LUALIB_API void(luaL_checktype)(lua_State* L, int narg, int t);
LUALIB_API void(luaL_checkany)(lua_State *L, int narg); LUALIB_API void(luaL_checkany)(lua_State* L, int narg);
LUALIB_API int(luaL_newmetatable)(lua_State *L, const char *tname); LUALIB_API int(luaL_newmetatable)(lua_State* L, const char* tname);
LUALIB_API void *(luaL_checkudata)(lua_State * L, int ud, const char *tname); LUALIB_API void*(luaL_checkudata)(lua_State * L, int ud, const char* tname);
LUALIB_API void(luaL_where)(lua_State *L, int lvl); LUALIB_API void(luaL_where)(lua_State* L, int lvl);
LUALIB_API int(luaL_error)(lua_State *L, const char *fmt, ...); LUALIB_API int(luaL_error)(lua_State* L, const char* fmt, ...);
LUALIB_API int(luaL_checkoption)(lua_State *L, int narg, const char *def, LUALIB_API int(luaL_checkoption)(lua_State* L, int narg, const char* def, const char* const lst[]);
const char *const lst[]);
/* pre-defined references */ /* pre-defined references */
#define LUA_NOREF (-2) #define LUA_NOREF (-2)
#define LUA_REFNIL (-1) #define LUA_REFNIL (-1)
LUALIB_API int(luaL_ref)(lua_State *L, int t); LUALIB_API int(luaL_ref)(lua_State* L, int t);
LUALIB_API void(luaL_unref)(lua_State *L, int t, int ref); LUALIB_API void(luaL_unref)(lua_State* L, int t, int ref);
LUALIB_API int(luaL_loadfile)(lua_State *L, const char *filename); LUALIB_API int(luaL_loadfile)(lua_State* L, const char* filename);
LUALIB_API int(luaL_loadbuffer)(lua_State *L, const char *buff, size_t sz, LUALIB_API int(luaL_loadbuffer)(lua_State* L, const char* buff, size_t sz, const char* name);
const char *name); LUALIB_API int(luaL_loadstring)(lua_State* L, const char* s);
LUALIB_API int(luaL_loadstring)(lua_State *L, const char *s);
LUALIB_API lua_State *(luaL_newstate)(void); LUALIB_API lua_State*(luaL_newstate)(void);
LUALIB_API const char *(luaL_gsub)(lua_State * L, const char *s, const char *p, LUALIB_API const char*(luaL_gsub)(lua_State * L, const char* s, const char* p, const char* r);
const char *r);
LUALIB_API const char *(luaL_findtable)(lua_State * L, int idx, LUALIB_API const char*(luaL_findtable)(lua_State * L, int idx, const char* fname, int szhint);
const char *fname, int szhint);
/* From Lua 5.2. */ /* From Lua 5.2. */
LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname); LUALIB_API int luaL_fileresult(lua_State* L, int stat, const char* fname);
LUALIB_API int luaL_execresult(lua_State *L, int stat); LUALIB_API int luaL_execresult(lua_State* L, int stat);
LUALIB_API int(luaL_loadfilex)(lua_State *L, const char *filename, LUALIB_API int(luaL_loadfilex)(lua_State* L, const char* filename, const char* mode);
const char *mode); LUALIB_API int(luaL_loadbufferx)(lua_State* L, const char* buff, size_t sz, const char* name, const char* mode);
LUALIB_API int(luaL_loadbufferx)(lua_State *L, const char *buff, size_t sz, LUALIB_API void luaL_traceback(lua_State* L, lua_State* L1, const char* msg, int level);
const char *name, const char *mode); LUALIB_API void(luaL_setfuncs)(lua_State* L, const luaL_Reg* l, int nup);
LUALIB_API void luaL_traceback(lua_State *L, lua_State *L1, const char *msg, LUALIB_API void(luaL_pushmodule)(lua_State* L, const char* modname, int sizehint);
int level); LUALIB_API void*(luaL_testudata)(lua_State * L, int ud, const char* tname);
LUALIB_API void(luaL_setfuncs)(lua_State *L, const luaL_Reg *l, int nup); LUALIB_API void(luaL_setmetatable)(lua_State* L, const char* tname);
LUALIB_API void(luaL_pushmodule)(lua_State *L, const char *modname,
int sizehint);
LUALIB_API void *(luaL_testudata)(lua_State * L, int ud, const char *tname);
LUALIB_API void(luaL_setmetatable)(lua_State *L, const char *tname);
/* /*
** =============================================================== ** ===============================================================
@@ -93,8 +80,7 @@ LUALIB_API void(luaL_setmetatable)(lua_State *L, const char *tname);
** =============================================================== ** ===============================================================
*/ */
#define luaL_argcheck(L, cond, numarg, extramsg) \ #define luaL_argcheck(L, cond, numarg, extramsg) ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
#define luaL_checkstring(L, n) (luaL_checklstring(L, (n), NULL)) #define luaL_checkstring(L, n) (luaL_checklstring(L, (n), NULL))
#define luaL_optstring(L, n, d) (luaL_optlstring(L, (n), (d), NULL)) #define luaL_optstring(L, n, d) (luaL_optlstring(L, (n), (d), NULL))
#define luaL_checkint(L, n) ((int)luaL_checkinteger(L, (n))) #define luaL_checkint(L, n) ((int)luaL_checkinteger(L, (n)))
@@ -104,19 +90,16 @@ LUALIB_API void(luaL_setmetatable)(lua_State *L, const char *tname);
#define luaL_typename(L, i) lua_typename(L, lua_type(L, (i))) #define luaL_typename(L, i) lua_typename(L, lua_type(L, (i)))
#define luaL_dofile(L, fn) \ #define luaL_dofile(L, fn) (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
#define luaL_dostring(L, s) \ #define luaL_dostring(L, s) (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
#define luaL_getmetatable(L, n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) #define luaL_getmetatable(L, n) (lua_getfield(L, LUA_REGISTRYINDEX, (n)))
#define luaL_opt(L, f, n, d) (lua_isnoneornil(L, (n)) ? (d) : f(L, (n))) #define luaL_opt(L, f, n, d) (lua_isnoneornil(L, (n)) ? (d) : f(L, (n)))
/* From Lua 5.2. */ /* From Lua 5.2. */
#define luaL_newlibtable(L, l) \ #define luaL_newlibtable(L, l) lua_createtable(L, 0, sizeof(l) / sizeof((l)[0]) - 1)
lua_createtable(L, 0, sizeof(l) / sizeof((l)[0]) - 1)
#define luaL_newlib(L, l) (luaL_newlibtable(L, l), luaL_setfuncs(L, l, 0)) #define luaL_newlib(L, l) (luaL_newlibtable(L, l), luaL_setfuncs(L, l, 0))
/* /*
@@ -126,27 +109,26 @@ LUALIB_API void(luaL_setmetatable)(lua_State *L, const char *tname);
*/ */
typedef struct luaL_Buffer { typedef struct luaL_Buffer {
char *p; /* current position in buffer */ char* p; /* current position in buffer */
int lvl; /* number of strings in the stack (level) */ int lvl; /* number of strings in the stack (level) */
lua_State *L; lua_State* L;
char buffer[LUAL_BUFFERSIZE]; char buffer[LUAL_BUFFERSIZE];
} luaL_Buffer; } luaL_Buffer;
#define luaL_addchar(B, c) \ #define luaL_addchar(B, c) \
((void)((B)->p < ((B)->buffer + LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), \ ((void)((B)->p < ((B)->buffer + LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), (*(B)->p++ = (char)(c)))
(*(B)->p++ = (char)(c)))
/* compatibility only */ /* compatibility only */
#define luaL_putchar(B, c) luaL_addchar(B, c) #define luaL_putchar(B, c) luaL_addchar(B, c)
#define luaL_addsize(B, n) ((B)->p += (n)) #define luaL_addsize(B, n) ((B)->p += (n))
LUALIB_API void(luaL_buffinit)(lua_State *L, luaL_Buffer *B); LUALIB_API void(luaL_buffinit)(lua_State* L, luaL_Buffer* B);
LUALIB_API char *(luaL_prepbuffer)(luaL_Buffer * B); LUALIB_API char*(luaL_prepbuffer)(luaL_Buffer * B);
LUALIB_API void(luaL_addlstring)(luaL_Buffer *B, const char *s, size_t l); LUALIB_API void(luaL_addlstring)(luaL_Buffer* B, const char* s, size_t l);
LUALIB_API void(luaL_addstring)(luaL_Buffer *B, const char *s); LUALIB_API void(luaL_addstring)(luaL_Buffer* B, const char* s);
LUALIB_API void(luaL_addvalue)(luaL_Buffer *B); LUALIB_API void(luaL_addvalue)(luaL_Buffer* B);
LUALIB_API void(luaL_pushresult)(luaL_Buffer *B); LUALIB_API void(luaL_pushresult)(luaL_Buffer* B);
/* }====================================================== */ /* }====================================================== */

200
inc/lua/lua.h
View File

@@ -43,19 +43,19 @@
typedef struct lua_State lua_State; typedef struct lua_State lua_State;
typedef int (*lua_CFunction)(lua_State *L); typedef int (*lua_CFunction)(lua_State* L);
/* /*
** functions that read/write blocks when loading/dumping Lua chunks ** functions that read/write blocks when loading/dumping Lua chunks
*/ */
typedef const char *(*lua_Reader)(lua_State *L, void *ud, size_t *sz); typedef const char* (*lua_Reader)(lua_State* L, void* ud, size_t* sz);
typedef int (*lua_Writer)(lua_State *L, const void *p, size_t sz, void *ud); typedef int (*lua_Writer)(lua_State* L, const void* p, size_t sz, void* ud);
/* /*
** prototype for memory-allocation functions ** prototype for memory-allocation functions
*/ */
typedef void *(*lua_Alloc)(void *ud, void *ptr, size_t osize, size_t nsize); typedef void* (*lua_Alloc)(void* ud, void* ptr, size_t osize, size_t nsize);
/* /*
** basic types ** basic types
@@ -91,105 +91,103 @@ typedef LUA_INTEGER lua_Integer;
/* /*
** state manipulation ** state manipulation
*/ */
LUA_API lua_State *(lua_newstate)(lua_Alloc f, void *ud); LUA_API lua_State*(lua_newstate)(lua_Alloc f, void* ud);
LUA_API void(lua_close)(lua_State *L); LUA_API void(lua_close)(lua_State* L);
LUA_API lua_State *(lua_newthread)(lua_State * L); LUA_API lua_State*(lua_newthread)(lua_State * L);
LUA_API lua_CFunction(lua_atpanic)(lua_State *L, lua_CFunction panicf); LUA_API lua_CFunction(lua_atpanic)(lua_State* L, lua_CFunction panicf);
/* /*
** basic stack manipulation ** basic stack manipulation
*/ */
LUA_API int(lua_gettop)(lua_State *L); LUA_API int(lua_gettop)(lua_State* L);
LUA_API void(lua_settop)(lua_State *L, int idx); LUA_API void(lua_settop)(lua_State* L, int idx);
LUA_API void(lua_pushvalue)(lua_State *L, int idx); LUA_API void(lua_pushvalue)(lua_State* L, int idx);
LUA_API void(lua_remove)(lua_State *L, int idx); LUA_API void(lua_remove)(lua_State* L, int idx);
LUA_API void(lua_insert)(lua_State *L, int idx); LUA_API void(lua_insert)(lua_State* L, int idx);
LUA_API void(lua_replace)(lua_State *L, int idx); LUA_API void(lua_replace)(lua_State* L, int idx);
LUA_API int(lua_checkstack)(lua_State *L, int sz); LUA_API int(lua_checkstack)(lua_State* L, int sz);
LUA_API void(lua_xmove)(lua_State *from, lua_State *to, int n); LUA_API void(lua_xmove)(lua_State* from, lua_State* to, int n);
/* /*
** access functions (stack -> C) ** access functions (stack -> C)
*/ */
LUA_API int(lua_isnumber)(lua_State *L, int idx); LUA_API int(lua_isnumber)(lua_State* L, int idx);
LUA_API int(lua_isstring)(lua_State *L, int idx); LUA_API int(lua_isstring)(lua_State* L, int idx);
LUA_API int(lua_iscfunction)(lua_State *L, int idx); LUA_API int(lua_iscfunction)(lua_State* L, int idx);
LUA_API int(lua_isuserdata)(lua_State *L, int idx); LUA_API int(lua_isuserdata)(lua_State* L, int idx);
LUA_API int(lua_type)(lua_State *L, int idx); LUA_API int(lua_type)(lua_State* L, int idx);
LUA_API const char *(lua_typename)(lua_State * L, int tp); LUA_API const char*(lua_typename)(lua_State * L, int tp);
LUA_API int(lua_equal)(lua_State *L, int idx1, int idx2); LUA_API int(lua_equal)(lua_State* L, int idx1, int idx2);
LUA_API int(lua_rawequal)(lua_State *L, int idx1, int idx2); LUA_API int(lua_rawequal)(lua_State* L, int idx1, int idx2);
LUA_API int(lua_lessthan)(lua_State *L, int idx1, int idx2); LUA_API int(lua_lessthan)(lua_State* L, int idx1, int idx2);
LUA_API lua_Number(lua_tonumber)(lua_State *L, int idx); LUA_API lua_Number(lua_tonumber)(lua_State* L, int idx);
LUA_API lua_Integer(lua_tointeger)(lua_State *L, int idx); LUA_API lua_Integer(lua_tointeger)(lua_State* L, int idx);
LUA_API int(lua_toboolean)(lua_State *L, int idx); LUA_API int(lua_toboolean)(lua_State* L, int idx);
LUA_API const char *(lua_tolstring)(lua_State * L, int idx, size_t *len); LUA_API const char*(lua_tolstring)(lua_State * L, int idx, size_t* len);
LUA_API size_t(lua_objlen)(lua_State *L, int idx); LUA_API size_t(lua_objlen)(lua_State* L, int idx);
LUA_API lua_CFunction(lua_tocfunction)(lua_State *L, int idx); LUA_API lua_CFunction(lua_tocfunction)(lua_State* L, int idx);
LUA_API void *(lua_touserdata)(lua_State * L, int idx); LUA_API void*(lua_touserdata)(lua_State * L, int idx);
LUA_API lua_State *(lua_tothread)(lua_State * L, int idx); LUA_API lua_State*(lua_tothread)(lua_State * L, int idx);
LUA_API const void *(lua_topointer)(lua_State * L, int idx); LUA_API const void*(lua_topointer)(lua_State * L, int idx);
/* /*
** push functions (C -> stack) ** push functions (C -> stack)
*/ */
LUA_API void(lua_pushnil)(lua_State *L); LUA_API void(lua_pushnil)(lua_State* L);
LUA_API void(lua_pushnumber)(lua_State *L, lua_Number n); LUA_API void(lua_pushnumber)(lua_State* L, lua_Number n);
LUA_API void(lua_pushinteger)(lua_State *L, lua_Integer n); LUA_API void(lua_pushinteger)(lua_State* L, lua_Integer n);
LUA_API void(lua_pushlstring)(lua_State *L, const char *s, size_t l); LUA_API void(lua_pushlstring)(lua_State* L, const char* s, size_t l);
LUA_API void(lua_pushstring)(lua_State *L, const char *s); LUA_API void(lua_pushstring)(lua_State* L, const char* s);
LUA_API const char *(lua_pushvfstring)(lua_State * L, const char *fmt, LUA_API const char*(lua_pushvfstring)(lua_State * L, const char* fmt, va_list argp);
va_list argp); LUA_API const char*(lua_pushfstring)(lua_State * L, const char* fmt, ...);
LUA_API const char *(lua_pushfstring)(lua_State * L, const char *fmt, ...); LUA_API void(lua_pushcclosure)(lua_State* L, lua_CFunction fn, int n);
LUA_API void(lua_pushcclosure)(lua_State *L, lua_CFunction fn, int n); LUA_API void(lua_pushboolean)(lua_State* L, int b);
LUA_API void(lua_pushboolean)(lua_State *L, int b); LUA_API void(lua_pushlightuserdata)(lua_State* L, void* p);
LUA_API void(lua_pushlightuserdata)(lua_State *L, void *p); LUA_API int(lua_pushthread)(lua_State* L);
LUA_API int(lua_pushthread)(lua_State *L);
/* /*
** get functions (Lua -> stack) ** get functions (Lua -> stack)
*/ */
LUA_API void(lua_gettable)(lua_State *L, int idx); LUA_API void(lua_gettable)(lua_State* L, int idx);
LUA_API void(lua_getfield)(lua_State *L, int idx, const char *k); LUA_API void(lua_getfield)(lua_State* L, int idx, const char* k);
LUA_API void(lua_rawget)(lua_State *L, int idx); LUA_API void(lua_rawget)(lua_State* L, int idx);
LUA_API void(lua_rawgeti)(lua_State *L, int idx, int n); LUA_API void(lua_rawgeti)(lua_State* L, int idx, int n);
LUA_API void(lua_createtable)(lua_State *L, int narr, int nrec); LUA_API void(lua_createtable)(lua_State* L, int narr, int nrec);
LUA_API void *(lua_newuserdata)(lua_State * L, size_t sz); LUA_API void*(lua_newuserdata)(lua_State * L, size_t sz);
LUA_API int(lua_getmetatable)(lua_State *L, int objindex); LUA_API int(lua_getmetatable)(lua_State* L, int objindex);
LUA_API void(lua_getfenv)(lua_State *L, int idx); LUA_API void(lua_getfenv)(lua_State* L, int idx);
/* /*
** set functions (stack -> Lua) ** set functions (stack -> Lua)
*/ */
LUA_API void(lua_settable)(lua_State *L, int idx); LUA_API void(lua_settable)(lua_State* L, int idx);
LUA_API void(lua_setfield)(lua_State *L, int idx, const char *k); LUA_API void(lua_setfield)(lua_State* L, int idx, const char* k);
LUA_API void(lua_rawset)(lua_State *L, int idx); LUA_API void(lua_rawset)(lua_State* L, int idx);
LUA_API void(lua_rawseti)(lua_State *L, int idx, int n); LUA_API void(lua_rawseti)(lua_State* L, int idx, int n);
LUA_API int(lua_setmetatable)(lua_State *L, int objindex); LUA_API int(lua_setmetatable)(lua_State* L, int objindex);
LUA_API int(lua_setfenv)(lua_State *L, int idx); LUA_API int(lua_setfenv)(lua_State* L, int idx);
/* /*
** `load' and `call' functions (load and run Lua code) ** `load' and `call' functions (load and run Lua code)
*/ */
LUA_API void(lua_call)(lua_State *L, int nargs, int nresults); LUA_API void(lua_call)(lua_State* L, int nargs, int nresults);
LUA_API int(lua_pcall)(lua_State *L, int nargs, int nresults, int errfunc); LUA_API int(lua_pcall)(lua_State* L, int nargs, int nresults, int errfunc);
LUA_API int(lua_cpcall)(lua_State *L, lua_CFunction func, void *ud); LUA_API int(lua_cpcall)(lua_State* L, lua_CFunction func, void* ud);
LUA_API int(lua_load)(lua_State *L, lua_Reader reader, void *dt, LUA_API int(lua_load)(lua_State* L, lua_Reader reader, void* dt, const char* chunkname);
const char *chunkname);
LUA_API int(lua_dump)(lua_State *L, lua_Writer writer, void *data); LUA_API int(lua_dump)(lua_State* L, lua_Writer writer, void* data);
/* /*
** coroutine functions ** coroutine functions
*/ */
LUA_API int(lua_yield)(lua_State *L, int nresults); LUA_API int(lua_yield)(lua_State* L, int nresults);
LUA_API int(lua_resume)(lua_State *L, int narg); LUA_API int(lua_resume)(lua_State* L, int narg);
LUA_API int(lua_status)(lua_State *L); LUA_API int(lua_status)(lua_State* L);
/* /*
** garbage-collection function and options ** garbage-collection function and options
@@ -205,20 +203,20 @@ LUA_API int(lua_status)(lua_State *L);
#define LUA_GCSETSTEPMUL 7 #define LUA_GCSETSTEPMUL 7
#define LUA_GCISRUNNING 9 #define LUA_GCISRUNNING 9
LUA_API int(lua_gc)(lua_State *L, int what, int data); LUA_API int(lua_gc)(lua_State* L, int what, int data);
/* /*
** miscellaneous functions ** miscellaneous functions
*/ */
LUA_API int(lua_error)(lua_State *L); LUA_API int(lua_error)(lua_State* L);
LUA_API int(lua_next)(lua_State *L, int idx); LUA_API int(lua_next)(lua_State* L, int idx);
LUA_API void(lua_concat)(lua_State *L, int n); LUA_API void(lua_concat)(lua_State* L, int n);
LUA_API lua_Alloc(lua_getallocf)(lua_State *L, void **ud); LUA_API lua_Alloc(lua_getallocf)(lua_State* L, void** ud);
LUA_API void lua_setallocf(lua_State *L, lua_Alloc f, void *ud); LUA_API void lua_setallocf(lua_State* L, lua_Alloc f, void* ud);
/* /*
** =============================================================== ** ===============================================================
@@ -245,8 +243,7 @@ LUA_API void lua_setallocf(lua_State *L, lua_Alloc f, void *ud);
#define lua_isnone(L, n) (lua_type(L, (n)) == LUA_TNONE) #define lua_isnone(L, n) (lua_type(L, (n)) == LUA_TNONE)
#define lua_isnoneornil(L, n) (lua_type(L, (n)) <= 0) #define lua_isnoneornil(L, n) (lua_type(L, (n)) <= 0)
#define lua_pushliteral(L, s) \ #define lua_pushliteral(L, s) lua_pushlstring(L, "" s, (sizeof(s) / sizeof(char)) - 1)
lua_pushlstring(L, "" s, (sizeof(s) / sizeof(char)) - 1)
#define lua_setglobal(L, s) lua_setfield(L, LUA_GLOBALSINDEX, (s)) #define lua_setglobal(L, s) lua_setfield(L, LUA_GLOBALSINDEX, (s))
#define lua_getglobal(L, s) lua_getfield(L, LUA_GLOBALSINDEX, (s)) #define lua_getglobal(L, s) lua_getfield(L, LUA_GLOBALSINDEX, (s))
@@ -267,7 +264,7 @@ LUA_API void lua_setallocf(lua_State *L, lua_Alloc f, void *ud);
#define lua_Chunkwriter lua_Writer #define lua_Chunkwriter lua_Writer
/* hack */ /* hack */
LUA_API void lua_setlevel(lua_State *from, lua_State *to); LUA_API void lua_setlevel(lua_State* from, lua_State* to);
/* /*
** {====================================================================== ** {======================================================================
@@ -295,38 +292,37 @@ LUA_API void lua_setlevel(lua_State *from, lua_State *to);
typedef struct lua_Debug lua_Debug; /* activation record */ typedef struct lua_Debug lua_Debug; /* activation record */
/* Functions to be called by the debuger in specific events */ /* Functions to be called by the debuger in specific events */
typedef void (*lua_Hook)(lua_State *L, lua_Debug *ar); typedef void (*lua_Hook)(lua_State* L, lua_Debug* ar);
LUA_API int lua_getstack(lua_State *L, int level, lua_Debug *ar); LUA_API int lua_getstack(lua_State* L, int level, lua_Debug* ar);
LUA_API int lua_getinfo(lua_State *L, const char *what, lua_Debug *ar); LUA_API int lua_getinfo(lua_State* L, const char* what, lua_Debug* ar);
LUA_API const char *lua_getlocal(lua_State *L, const lua_Debug *ar, int n); LUA_API const char* lua_getlocal(lua_State* L, const lua_Debug* ar, int n);
LUA_API const char *lua_setlocal(lua_State *L, const lua_Debug *ar, int n); LUA_API const char* lua_setlocal(lua_State* L, const lua_Debug* ar, int n);
LUA_API const char *lua_getupvalue(lua_State *L, int funcindex, int n); LUA_API const char* lua_getupvalue(lua_State* L, int funcindex, int n);
LUA_API const char *lua_setupvalue(lua_State *L, int funcindex, int n); LUA_API const char* lua_setupvalue(lua_State* L, int funcindex, int n);
LUA_API int lua_sethook(lua_State *L, lua_Hook func, int mask, int count); LUA_API int lua_sethook(lua_State* L, lua_Hook func, int mask, int count);
LUA_API lua_Hook lua_gethook(lua_State *L); LUA_API lua_Hook lua_gethook(lua_State* L);
LUA_API int lua_gethookmask(lua_State *L); LUA_API int lua_gethookmask(lua_State* L);
LUA_API int lua_gethookcount(lua_State *L); LUA_API int lua_gethookcount(lua_State* L);
/* From Lua 5.2. */ /* From Lua 5.2. */
LUA_API void *lua_upvalueid(lua_State *L, int idx, int n); LUA_API void* lua_upvalueid(lua_State* L, int idx, int n);
LUA_API void lua_upvaluejoin(lua_State *L, int idx1, int n1, int idx2, int n2); LUA_API void lua_upvaluejoin(lua_State* L, int idx1, int n1, int idx2, int n2);
LUA_API int lua_loadx(lua_State *L, lua_Reader reader, void *dt, LUA_API int lua_loadx(lua_State* L, lua_Reader reader, void* dt, const char* chunkname, const char* mode);
const char *chunkname, const char *mode); LUA_API const lua_Number* lua_version(lua_State* L);
LUA_API const lua_Number *lua_version(lua_State *L); LUA_API void lua_copy(lua_State* L, int fromidx, int toidx);
LUA_API void lua_copy(lua_State *L, int fromidx, int toidx); LUA_API lua_Number lua_tonumberx(lua_State* L, int idx, int* isnum);
LUA_API lua_Number lua_tonumberx(lua_State *L, int idx, int *isnum); LUA_API lua_Integer lua_tointegerx(lua_State* L, int idx, int* isnum);
LUA_API lua_Integer lua_tointegerx(lua_State *L, int idx, int *isnum);
/* From Lua 5.3. */ /* From Lua 5.3. */
LUA_API int lua_isyieldable(lua_State *L); LUA_API int lua_isyieldable(lua_State* L);
struct lua_Debug { struct lua_Debug {
int event; int event;
const char *name; /* (n) */ const char* name; /* (n) */
const char *namewhat; /* (n) `global', `local', `field', `method' */ const char* namewhat; /* (n) `global', `local', `field', `method' */
const char *what; /* (S) `Lua', `C', `main', `tail' */ const char* what; /* (S) `Lua', `C', `main', `tail' */
const char *source; /* (S) */ const char* source; /* (S) */
int currentline; /* (l) */ int currentline; /* (l) */
int nups; /* (u) number of upvalues */ int nups; /* (u) number of upvalues */
int linedefined; /* (S) */ int linedefined; /* (S) */

18
inc/lua/luaconf.h
View File

@@ -76,9 +76,7 @@
#define LUA_PATH_MARK "?" #define LUA_PATH_MARK "?"
#define LUA_EXECDIR "!" #define LUA_EXECDIR "!"
#define LUA_IGMARK "-" #define LUA_IGMARK "-"
#define LUA_PATH_CONFIG \ #define LUA_PATH_CONFIG LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" LUA_EXECDIR "\n" LUA_IGMARK "\n"
LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" LUA_EXECDIR \
"\n" LUA_IGMARK "\n"
/* Quoting in error messages. */ /* Quoting in error messages. */
#define LUA_QL(x) "'" x "'" #define LUA_QL(x) "'" x "'"
@@ -143,15 +141,15 @@
#define lua_assert(x) assert(x) #define lua_assert(x) assert(x)
#endif #endif
#ifdef LUA_USE_APICHECK #ifdef LUA_USE_APICHECK
#define luai_apicheck(L, o) \ #define luai_apicheck(L, o) \
{ \ { \
(void)L; \ (void)L; \
assert(o); \ assert(o); \
} }
#else #else
#define luai_apicheck(L, o) \ #define luai_apicheck(L, o) \
{ \ { \
(void)L; \ (void)L; \
} }
#endif #endif

13
inc/lua/luajit.h
View File

@@ -62,16 +62,13 @@ enum {
/* LuaJIT public C API. */ /* LuaJIT public C API. */
/* Control the JIT engine. */ /* Control the JIT engine. */
LUA_API int luaJIT_setmode(lua_State *L, int idx, int mode); LUA_API int luaJIT_setmode(lua_State* L, int idx, int mode);
/* Low-overhead profiling API. */ /* Low-overhead profiling API. */
typedef void (*luaJIT_profile_callback)(void *data, lua_State *L, int samples, typedef void (*luaJIT_profile_callback)(void* data, lua_State* L, int samples, int vmstate);
int vmstate); LUA_API void luaJIT_profile_start(lua_State* L, const char* mode, luaJIT_profile_callback cb, void* data);
LUA_API void luaJIT_profile_start(lua_State *L, const char *mode, LUA_API void luaJIT_profile_stop(lua_State* L);
luaJIT_profile_callback cb, void *data); LUA_API const char* luaJIT_profile_dumpstack(lua_State* L, const char* fmt, int depth, size_t* len);
LUA_API void luaJIT_profile_stop(lua_State *L);
LUA_API const char *luaJIT_profile_dumpstack(lua_State *L, const char *fmt,
int depth, size_t *len);
/* Enforce (dynamic) linker error for version mismatches. Call from main. */ /* Enforce (dynamic) linker error for version mismatches. Call from main. */
LUA_API void LUAJIT_VERSION_SYM(void); LUA_API void LUAJIT_VERSION_SYM(void);

24
inc/lua/lualib.h
View File

@@ -22,19 +22,19 @@
#define LUA_JITLIBNAME "jit" #define LUA_JITLIBNAME "jit"
#define LUA_FFILIBNAME "ffi" #define LUA_FFILIBNAME "ffi"
LUALIB_API int luaopen_base(lua_State *L); LUALIB_API int luaopen_base(lua_State* L);
LUALIB_API int luaopen_math(lua_State *L); LUALIB_API int luaopen_math(lua_State* L);
LUALIB_API int luaopen_string(lua_State *L); LUALIB_API int luaopen_string(lua_State* L);
LUALIB_API int luaopen_table(lua_State *L); LUALIB_API int luaopen_table(lua_State* L);
LUALIB_API int luaopen_io(lua_State *L); LUALIB_API int luaopen_io(lua_State* L);
LUALIB_API int luaopen_os(lua_State *L); LUALIB_API int luaopen_os(lua_State* L);
LUALIB_API int luaopen_package(lua_State *L); LUALIB_API int luaopen_package(lua_State* L);
LUALIB_API int luaopen_debug(lua_State *L); LUALIB_API int luaopen_debug(lua_State* L);
LUALIB_API int luaopen_bit(lua_State *L); LUALIB_API int luaopen_bit(lua_State* L);
LUALIB_API int luaopen_jit(lua_State *L); LUALIB_API int luaopen_jit(lua_State* L);
LUALIB_API int luaopen_ffi(lua_State *L); LUALIB_API int luaopen_ffi(lua_State* L);
LUALIB_API void luaL_openlibs(lua_State *L); LUALIB_API void luaL_openlibs(lua_State* L);
#ifndef lua_assert #ifndef lua_assert
#define lua_assert(x) ((void)0) #define lua_assert(x) ((void)0)

269
inc/tsfuncs/BlFuncs.cpp
View File

@@ -38,52 +38,53 @@ BlFunctionDefIntern(tsf_BlCon__getReturnBuffer);
// C->TS Args // C->TS Args
char *tsf_GetIntArg(signed int value) { char* tsf_GetIntArg(signed int value) {
char *ret = tsf_BlStringStack__getArgBuffer(16); char* ret = tsf_BlStringStack__getArgBuffer(16);
snprintf(ret, 16, "%d", value); snprintf(ret, 16, "%d", value);
return ret; return ret;
} }
char *tsf_GetFloatArg(float value) {
char *ret = tsf_BlStringStack__getArgBuffer(32); char* tsf_GetFloatArg(float value) {
char* ret = tsf_BlStringStack__getArgBuffer(32);
snprintf(ret, 32, "%g", value); snprintf(ret, 32, "%g", value);
return ret; return ret;
} }
char *tsf_GetStringArg(char *value) {
char* tsf_GetStringArg(char* value) {
int len = strlen(value) + 1; int len = strlen(value) + 1;
char *ret = tsf_BlStringStack__getArgBuffer(len); char* ret = tsf_BlStringStack__getArgBuffer(len);
memcpy(ret, value, len); memcpy(ret, value, len);
return ret; return ret;
} }
char *tsf_GetThisArg(ADDR obj) {
return tsf_GetIntArg(*(signed int *)(obj + 32)); char* tsf_GetThisArg(ADDR obj) { return tsf_GetIntArg(*(signed int*)(obj + 32)); }
}
// Eval // Eval
const char *tsf_Eval(const char *code) { const char* tsf_Eval(const char* code) {
const char *argv[] = {nullptr, code}; const char* argv[] = {nullptr, code};
return tsf_BlCon__evaluate(0, 2, argv); return tsf_BlCon__evaluate(0, 2, argv);
} }
const char *tsf_Evalf(const char *fmt, ...) { const char* tsf_Evalf(const char* fmt, ...) {
va_list args; va_list args;
char code[4096]; char code[4096];
va_start(args, fmt); va_start(args, fmt);
vsnprintf(code, 4096, fmt, args); vsnprintf(code, 4096, fmt, args);
va_end(args); va_end(args);
return tsf_Eval((const char *)code); return tsf_Eval((const char*)code);
} }
// Objects // Objects
ADDR tsf_FindObject(unsigned int id) { ADDR tsf_FindObject(unsigned int id) {
ADDR obj = *(ADDR *)(*(ADDR *)(tsf_gIdDictionary) + 4 * (id & 0xFFF)); ADDR obj = *(ADDR*)(*(ADDR*)(tsf_gIdDictionary) + 4 * (id & 0xFFF));
if (!obj) if (!obj)
return 0; return 0;
while (obj && *(unsigned int *)(obj + 32) != id) { while (obj && *(unsigned int*)(obj + 32) != id) {
obj = *(ADDR *)(obj + 16); obj = *(ADDR*)(obj + 16);
if (!obj) if (!obj)
return 0; return 0;
} }
@@ -91,12 +92,10 @@ ADDR tsf_FindObject(unsigned int id) {
return obj; return obj;
} }
ADDR tsf_FindObject(const char *name) { ADDR tsf_FindObject(const char* name) { return (ADDR)tsf_BlSim__findObject_name(name); }
return (ADDR)tsf_BlSim__findObject_name(name);
}
ADDR tsf_LookupNamespace(const char *ns, const char *package) { ADDR tsf_LookupNamespace(const char* ns, const char* package) {
const char *ste_package; const char* ste_package;
if (package) { if (package) {
ste_package = tsf_BlStringTable__insert(package, 0); ste_package = tsf_BlStringTable__insert(package, 0);
} else { } else {
@@ -104,21 +103,19 @@ ADDR tsf_LookupNamespace(const char *ns, const char *package) {
} }
if (ns) { if (ns) {
const char *ste_namespace = tsf_BlStringTable__insert(ns, 0); const char* ste_namespace = tsf_BlStringTable__insert(ns, 0);
return tsf_BlNamespace__find(ste_namespace, ste_package); return tsf_BlNamespace__find(ste_namespace, ste_package);
} else { } else {
return tsf_BlNamespace__find(nullptr, ste_package); return tsf_BlNamespace__find(nullptr, ste_package);
} }
} }
ADDR tsf_LookupNamespace(const char *ns) {
return tsf_LookupNamespace(ns, nullptr); ADDR tsf_LookupNamespace(const char* ns) { return tsf_LookupNamespace(ns, nullptr); }
}
// Object Fields // Object Fields
const char *tsf_GetDataField(ADDR simObject, const char *slotName, const char* tsf_GetDataField(ADDR simObject, const char* slotName, const char* array) {
const char *array) { const char* ste_slotName;
const char *ste_slotName;
if (slotName) { if (slotName) {
ste_slotName = tsf_BlStringTable__insert(slotName, 0); ste_slotName = tsf_BlStringTable__insert(slotName, 0);
} else { } else {
@@ -128,9 +125,8 @@ const char *tsf_GetDataField(ADDR simObject, const char *slotName,
return tsf_BlSimObject__getDataField(simObject, ste_slotName, array); return tsf_BlSimObject__getDataField(simObject, ste_slotName, array);
} }
void tsf_SetDataField(ADDR simObject, const char *slotName, const char *array, void tsf_SetDataField(ADDR simObject, const char* slotName, const char* array, const char* value) {
const char *value) { const char* ste_slotName;
const char *ste_slotName;
if (slotName) { if (slotName) {
ste_slotName = tsf_BlStringTable__insert(slotName, 0); ste_slotName = tsf_BlStringTable__insert(slotName, 0);
} else { } else {
@@ -142,83 +138,103 @@ void tsf_SetDataField(ADDR simObject, const char *slotName, const char *array,
// TS Global Variables // TS Global Variables
const char *tsf_GetVar(const char *name) { const char* tsf_GetVar(const char* name) { return tsf_BlCon__getVariable(name); }
return tsf_BlCon__getVariable(name);
void tsf_AddVarInternal(const char* name, signed int varType, void* data) {
tsf_BlDictionary__addVariable((ADDR*)tsf_gEvalState_globalVars, name, varType, data);
} }
void tsf_AddVarInternal(const char *name, signed int varType, void *data) { void tsf_AddVar(const char* name, const char** data) { tsf_AddVarInternal(name, 10, data); }
tsf_BlDictionary__addVariable((ADDR *)tsf_gEvalState_globalVars, name,
varType, data);
}
void tsf_AddVar(const char *name, const char **data) { void tsf_AddVar(const char* name, signed int* data) { tsf_AddVarInternal(name, 4, data); }
tsf_AddVarInternal(name, 10, data);
} void tsf_AddVar(const char* name, float* data) { tsf_AddVarInternal(name, 8, data); }
void tsf_AddVar(const char *name, signed int *data) {
tsf_AddVarInternal(name, 4, data); void tsf_AddVar(const char* name, bool* data) { tsf_AddVarInternal(name, 6, data); }
}
void tsf_AddVar(const char *name, float *data) {
tsf_AddVarInternal(name, 8, data);
}
void tsf_AddVar(const char *name, bool *data) {
tsf_AddVarInternal(name, 6, data);
}
// TS->C Functions // TS->C Functions
ADDR tsf_AddConsoleFuncInternal(const char *pname, const char *cname, ADDR tsf_AddConsoleFuncInternal(
const char *fname, signed int cbtype, const char* pname,
const char *usage, signed int mina, const char* cname,
signed int maxa) { const char* fname,
const char *ste_fname = tsf_BlStringTable__insert(fname, 0); signed int cbtype,
const char* usage,
signed int mina,
signed int maxa) {
const char* ste_fname = tsf_BlStringTable__insert(fname, 0);
ADDR ns = tsf_LookupNamespace(cname, pname); ADDR ns = tsf_LookupNamespace(cname, pname);
ADDR ent = tsf_BlNamespace__createLocalEntry(ns, ste_fname); ADDR ent = tsf_BlNamespace__createLocalEntry(ns, ste_fname);
*(signed int *)tsf_mCacheSequence += 1; *(signed int*)tsf_mCacheSequence += 1;
tsf_BlDataChunker__freeBlocks(*(ADDR *)tsf_mCacheAllocator); tsf_BlDataChunker__freeBlocks(*(ADDR*)tsf_mCacheAllocator);
*(const char **)(ent + 24) = usage; *(const char**)(ent + 24) = usage;
*(signed int *)(ent + 16) = mina; *(signed int*)(ent + 16) = mina;
*(signed int *)(ent + 20) = maxa; *(signed int*)(ent + 20) = maxa;
*(signed int *)(ent + 12) = cbtype; *(signed int*)(ent + 12) = cbtype;
return ent; return ent;
} }
void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname, void tsf_AddConsoleFunc(
tsf_StringCallback sc, const char *usage, const char* pname,
signed int mina, signed int maxa) { const char* cname,
ADDR ent = const char* fname,
tsf_AddConsoleFuncInternal(pname, cname, fname, 1, usage, mina, maxa); tsf_StringCallback sc,
*(tsf_StringCallback *)(ent + 40) = sc; const char* usage,
signed int mina,
signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 1, usage, mina, maxa);
*(tsf_StringCallback*)(ent + 40) = sc;
} }
void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
tsf_IntCallback ic, const char *usage, signed int mina, void tsf_AddConsoleFunc(
signed int maxa) { const char* pname,
ADDR ent = const char* cname,
tsf_AddConsoleFuncInternal(pname, cname, fname, 2, usage, mina, maxa); const char* fname,
*(tsf_IntCallback *)(ent + 40) = ic; tsf_IntCallback ic,
const char* usage,
signed int mina,
signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 2, usage, mina, maxa);
*(tsf_IntCallback*)(ent + 40) = ic;
} }
void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
tsf_FloatCallback fc, const char *usage, void tsf_AddConsoleFunc(
signed int mina, signed int maxa) { const char* pname,
ADDR ent = const char* cname,
tsf_AddConsoleFuncInternal(pname, cname, fname, 3, usage, mina, maxa); const char* fname,
*(tsf_FloatCallback *)(ent + 40) = fc; tsf_FloatCallback fc,
const char* usage,
signed int mina,
signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 3, usage, mina, maxa);
*(tsf_FloatCallback*)(ent + 40) = fc;
} }
void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
tsf_VoidCallback vc, const char *usage, signed int mina, void tsf_AddConsoleFunc(
signed int maxa) { const char* pname,
ADDR ent = const char* cname,
tsf_AddConsoleFuncInternal(pname, cname, fname, 4, usage, mina, maxa); const char* fname,
*(tsf_VoidCallback *)(ent + 40) = vc; tsf_VoidCallback vc,
const char* usage,
signed int mina,
signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 4, usage, mina, maxa);
*(tsf_VoidCallback*)(ent + 40) = vc;
} }
void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
tsf_BoolCallback bc, const char *usage, signed int mina, void tsf_AddConsoleFunc(
signed int maxa) { const char* pname,
ADDR ent = const char* cname,
tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa); const char* fname,
*(tsf_BoolCallback *)(ent + 40) = bc; tsf_BoolCallback bc,
const char* usage,
signed int mina,
signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa);
*(tsf_BoolCallback*)(ent + 40) = bc;
} }
// Initialization // Initialization
@@ -233,49 +249,54 @@ bool tsf_InitInternal() {
tsf_BlNamespace__createLocalEntry, tsf_BlNamespace__createLocalEntry,
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 08 53 56 57 A1 ? ? ? ? " "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 08 53 56 57 A1 ? ? ? ? "
"33 C5 50 8D 45 F4 64 A3 ? ? ? ? 89 4D F0"); "33 C5 50 8D 45 F4 64 A3 ? ? ? ? 89 4D F0");
BlScanFunctionText(tsf_BlDataChunker__freeBlocks, BlScanFunctionText(
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 51 53 56 57 " tsf_BlDataChunker__freeBlocks,
"A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B D9 8B 33"); "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 51 53 56 57 "
BlScanFunctionText(tsf_BlCon__evaluate, "A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B D9 8B 33");
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 56 57 A1 ? ? " BlScanFunctionText(
"? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B 75 10"); tsf_BlCon__evaluate,
BlScanFunctionText(tsf_BlCon__executef, "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 56 57 A1 ? ? "
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 55 56 " "? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B 75 10");
"8B B4 24 ? ? ? ? 33 C9"); BlScanFunctionText(
BlScanFunctionText(tsf_BlCon__executefSimObj, tsf_BlCon__executef,
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 56 8B " "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 55 56 "
"B4 24 ? ? ? ? 33 C9"); "8B B4 24 ? ? ? ? 33 C9");
BlScanFunctionText(tsf_BlCon__getVariable, BlScanFunctionText(
"53 56 8B F1 57 85 F6 0F 84 ? ? ? ?"); tsf_BlCon__executefSimObj,
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 56 8B "
"B4 24 ? ? ? ? 33 C9");
BlScanFunctionText(tsf_BlCon__getVariable, "53 56 8B F1 57 85 F6 0F 84 ? ? ? ?");
BlScanFunctionText(tsf_BlDictionary__addVariable, "8B 44 24 04 56 57 8B F9"); BlScanFunctionText(tsf_BlDictionary__addVariable, "8B 44 24 04 56 57 8B F9");
BlScanFunctionText(tsf_BlSim__findObject_name, "57 8B F9 8A 17"); BlScanFunctionText(tsf_BlSim__findObject_name, "57 8B F9 8A 17");
BlScanFunctionText(tsf_BlStringStack__getArgBuffer, BlScanFunctionText(
"55 8B EC 83 E4 F8 8B 0D ? ? ? ? A1 ? ? ? ? 56 57 8B 7D " tsf_BlStringStack__getArgBuffer,
"08 8D 14 01 03 D7 3B 15 ? ? ? ? 72 2C 8B 0D"); "55 8B EC 83 E4 F8 8B 0D ? ? ? ? A1 ? ? ? ? 56 57 8B 7D "
BlScanFunctionText(tsf_BlSimObject__getDataField, "08 8D 14 01 03 D7 3B 15 ? ? ? ? 72 2C 8B 0D");
"51 53 8B D9 55 56 8B 74 24 14"); BlScanFunctionText(tsf_BlSimObject__getDataField, "51 53 8B D9 55 56 8B 74 24 14");
BlScanFunctionText(tsf_BlSimObject__setDataField, BlScanFunctionText(
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 8B 84 24 " tsf_BlSimObject__setDataField,
"? ? ? ? 53 8B D9 89 44 24 04"); "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 8B 84 24 "
"? ? ? ? 53 8B D9 89 44 24 04");
BlScanFunctionText(tsf_BlCon__getReturnBuffer, "81 F9 ? ? ? ? 76 2B"); BlScanFunctionText(tsf_BlCon__getReturnBuffer, "81 F9 ? ? ? ? 76 2B");
ADDR BlScanText(tsf_mCacheSequenceLoc, ADDR BlScanText(
"FF 05 ? ? ? ? B9 ? ? ? ? 8B F8 E8 ? ? ? ? 8B 44 24 1C 89 47 " tsf_mCacheSequenceLoc,
"18 8B 44 24 14"); "FF 05 ? ? ? ? B9 ? ? ? ? 8B F8 E8 ? ? ? ? 8B 44 24 1C 89 47 "
"18 8B 44 24 14");
ADDR BlScanText( ADDR BlScanText(
tsf_mCacheAllocatorLoc, tsf_mCacheAllocatorLoc,
"89 35 ? ? ? ? C7 06 ? ? ? ? A1 ? ? ? ? 68 ? ? ? ? C7 40 ? ? ? ? ? E8 ? " "89 35 ? ? ? ? C7 06 ? ? ? ? A1 ? ? ? ? 68 ? ? ? ? C7 40 ? ? ? ? ? E8 ? "
"? ? ? 83 C4 04 8B 4D F4 64 89 0D ? ? ? ? 59 5E 8B E5 5D C3"); "? ? ? 83 C4 04 8B 4D F4 64 89 0D ? ? ? ? 59 5E 8B E5 5D C3");
ADDR BlScanText(tsf_gIdDictionaryLoc, ADDR BlScanText(tsf_gIdDictionaryLoc, "89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0");
"89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0"); ADDR BlScanText(
ADDR BlScanText(tsf_gEvalState_globalVarsLoc, tsf_gEvalState_globalVarsLoc,
"B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? 6A 0A 68 ? ? ? ? B9 ? ? ? " "B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? 6A 0A 68 ? ? ? ? B9 ? ? ? "
"? E8 ? ? ? ? E8 ? ? ? ?"); "? E8 ? ? ? ? E8 ? ? ? ?");
tsf_mCacheSequence = *(ADDR *)(tsf_mCacheSequenceLoc + 2); tsf_mCacheSequence = *(ADDR*)(tsf_mCacheSequenceLoc + 2);
tsf_mCacheAllocator = *(ADDR *)(tsf_mCacheAllocatorLoc + 2); tsf_mCacheAllocator = *(ADDR*)(tsf_mCacheAllocatorLoc + 2);
tsf_gIdDictionary = *(ADDR *)(tsf_gIdDictionaryLoc + 2); tsf_gIdDictionary = *(ADDR*)(tsf_gIdDictionaryLoc + 2);
tsf_gEvalState_globalVars = *(ADDR *)(tsf_gEvalState_globalVarsLoc + 1); tsf_gEvalState_globalVars = *(ADDR*)(tsf_gEvalState_globalVarsLoc + 1);
return true; return true;
} }

125
inc/tsfuncs/BlFuncs.hpp
View File

@@ -10,53 +10,44 @@
#include "BlHooks.hpp" #include "BlHooks.hpp"
#endif #endif
typedef const char *(*tsf_StringCallback)(ADDR, signed int, const char *[]); typedef const char* (*tsf_StringCallback)(ADDR, signed int, const char*[]);
typedef signed int (*tsf_IntCallback)(ADDR, signed int, const char *[]); typedef signed int (*tsf_IntCallback)(ADDR, signed int, const char*[]);
typedef float (*tsf_FloatCallback)(ADDR, signed int, const char *[]); typedef float (*tsf_FloatCallback)(ADDR, signed int, const char*[]);
typedef void (*tsf_VoidCallback)(ADDR, signed int, const char *[]); typedef void (*tsf_VoidCallback)(ADDR, signed int, const char*[]);
typedef bool (*tsf_BoolCallback)(ADDR, signed int, const char *[]); typedef bool (*tsf_BoolCallback)(ADDR, signed int, const char*[]);
/* These functions are used for tsf_BlCon__executefSimObj. /* These functions are used for tsf_BlCon__executefSimObj.
They refer to a special buffer for the argument stack. They refer to a special buffer for the argument stack.
For tsf_BlCon__executef, you need to use your own buffers. */ For tsf_BlCon__executef, you need to use your own buffers. */
char *tsf_GetIntArg(int); char* tsf_GetIntArg(int);
char *tsf_GetFloatArg(float); char* tsf_GetFloatArg(float);
char *tsf_ScriptThis(ADDR); char* tsf_ScriptThis(ADDR);
const char *tsf_Eval(const char *); const char* tsf_Eval(const char*);
const char *tsf_Evalf(const char *, ...); const char* tsf_Evalf(const char*, ...);
ADDR tsf_FindObject(unsigned int); ADDR tsf_FindObject(unsigned int);
ADDR tsf_FindObject(const char *); ADDR tsf_FindObject(const char*);
ADDR tsf_LookupNamespace(const char *, const char *); ADDR tsf_LookupNamespace(const char*, const char*);
const char *tsf_GetDataField(ADDR, const char *, const char *); const char* tsf_GetDataField(ADDR, const char*, const char*);
void tsf_SetDataField(ADDR, const char *, const char *, const char *); void tsf_SetDataField(ADDR, const char*, const char*, const char*);
const char *tsf_GetVar(const char *); const char* tsf_GetVar(const char*);
void tsf_AddVarInternal(const char *, signed int, void *); void tsf_AddVarInternal(const char*, signed int, void*);
void tsf_AddVar(const char *, const char **); void tsf_AddVar(const char*, const char**);
void tsf_AddVar(const char *, signed int *); void tsf_AddVar(const char*, signed int*);
void tsf_AddVar(const char *, float *); void tsf_AddVar(const char*, float*);
void tsf_AddVar(const char *, bool *); void tsf_AddVar(const char*, bool*);
ADDR tsf_AddConsoleFuncInternal(const char *, const char *, const char *, ADDR tsf_AddConsoleFuncInternal(const char*, const char*, const char*, signed int, const char*, signed int, signed int);
signed int, const char *, signed int, void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_StringCallback, const char*, signed int, signed int);
signed int); void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_IntCallback, const char*, signed int, signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *, void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_FloatCallback, const char*, signed int, signed int);
tsf_StringCallback, const char *, signed int, void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_VoidCallback, const char*, signed int, signed int);
signed int); void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_BoolCallback, const char*, signed int, signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *,
tsf_IntCallback, const char *, signed int, signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *,
tsf_FloatCallback, const char *, signed int,
signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *,
tsf_VoidCallback, const char *, signed int, signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *,
tsf_BoolCallback, const char *, signed int, signed int);
bool tsf_InitInternal(); bool tsf_InitInternal();
@@ -65,32 +56,20 @@ extern ADDR tsf_mCacheAllocator;
extern ADDR tsf_gIdDictionary; extern ADDR tsf_gIdDictionary;
extern ADDR tsf_gEvalState_globalVars; extern ADDR tsf_gEvalState_globalVars;
BlFunctionDefExtern(const char *, __stdcall, tsf_BlStringTable__insert, BlFunctionDefExtern(const char*, __stdcall, tsf_BlStringTable__insert, const char*, bool);
const char *, bool); BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char*, const char*);
BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char *, BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR, const char*);
const char *);
BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR,
const char *);
BlFunctionDefExtern(void, __thiscall, tsf_BlDataChunker__freeBlocks, ADDR); BlFunctionDefExtern(void, __thiscall, tsf_BlDataChunker__freeBlocks, ADDR);
BlFunctionDefExtern(const char *, , tsf_BlCon__evaluate, ADDR, signed int, BlFunctionDefExtern(const char*, , tsf_BlCon__evaluate, ADDR, signed int, const char**);
const char **); BlFunctionDefExtern(const char*, , tsf_BlCon__executef, signed int, ...);
BlFunctionDefExtern(const char *, , tsf_BlCon__executef, signed int, ...); BlFunctionDefExtern(const char*, , tsf_BlCon__executefSimObj, ADDR*, signed int, ...);
BlFunctionDefExtern(const char *, , tsf_BlCon__executefSimObj, ADDR *, BlFunctionDefExtern(const char*, __thiscall, tsf_BlCon__getVariable, const char*);
signed int, ...); BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR*, const char*, signed int, void*);
BlFunctionDefExtern(const char *, __thiscall, tsf_BlCon__getVariable, BlFunctionDefExtern(ADDR*, __thiscall, tsf_BlSim__findObject_name, const char*);
const char *); BlFunctionDefExtern(char*, __stdcall, tsf_BlStringStack__getArgBuffer, unsigned int);
BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR *, BlFunctionDefExtern(const char*, __thiscall, tsf_BlSimObject__getDataField, ADDR, const char*, const char*);
const char *, signed int, void *); BlFunctionDefExtern(void, __thiscall, tsf_BlSimObject__setDataField, ADDR, const char*, const char*, const char*);
BlFunctionDefExtern(ADDR *, __thiscall, tsf_BlSim__findObject_name, BlFunctionDefExtern(char*, __fastcall, tsf_BlCon__getReturnBuffer, unsigned int);
const char *);
BlFunctionDefExtern(char *, __stdcall, tsf_BlStringStack__getArgBuffer,
unsigned int);
BlFunctionDefExtern(const char *, __thiscall, tsf_BlSimObject__getDataField,
ADDR, const char *, const char *);
BlFunctionDefExtern(void, __thiscall, tsf_BlSimObject__setDataField, ADDR,
const char *, const char *, const char *);
BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer,
unsigned int);
// Function short names // Function short names
@@ -100,7 +79,7 @@ BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer,
#define BlIntArg tsf_GetIntArg #define BlIntArg tsf_GetIntArg
#define BlFloatArg tsf_GetFloatArg #define BlFloatArg tsf_GetFloatArg
#define BlThisArg tsf_GetThisArg #define BlThisArg tsf_GetThisArg
#define BlStringArg(x) tsf_GetStringArg((char *)x) #define BlStringArg(x) tsf_GetStringArg((char*)x)
#define BlReturnBuffer tsf_BlCon__getReturnBuffer #define BlReturnBuffer tsf_BlCon__getReturnBuffer
#define BlObject tsf_FindObject #define BlObject tsf_FindObject
@@ -114,23 +93,21 @@ BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer,
#define BlAddFunction tsf_AddConsoleFunc #define BlAddFunction tsf_AddConsoleFunc
#define __22ND_ARGUMENT(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, \ #define __22ND_ARGUMENT( \
a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, ...) \ a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, ...) \
a22 a22
#define __NUM_LIST(...) \ #define __NUM_LIST(...) \
__22ND_ARGUMENT(dummy, ##__VA_ARGS__, 20, 19, 18, 17, 16, 15, 14, 13, 12, \ __22ND_ARGUMENT(dummy, ##__VA_ARGS__, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
#define BlCall(...) tsf_BlCon__executef(__NUM_LIST(__VA_ARGS__), __VA_ARGS__) #define BlCall(...) tsf_BlCon__executef(__NUM_LIST(__VA_ARGS__), __VA_ARGS__)
#define BlCallObj(obj, ...) \ #define BlCallObj(obj, ...) tsf_BlCon__executefSimObj((ADDR*)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__)
tsf_BlCon__executefSimObj((ADDR *)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__)
#define BlFuncsInit() \ #define BlFuncsInit() \
if (!tsf_InitInternal()) { \ if (!tsf_InitInternal()) { \
return false; \ return false; \
} }
#define BlFuncsDeinit() \ #define BlFuncsDeinit() \
if (!tsf_DeinitInternal()) { \ if (!tsf_DeinitInternal()) { \
return false; \ return false; \
} }
#endif #endif

74
inc/tsfuncs/BlHooks.cpp
View File

@@ -27,14 +27,13 @@ void tsh_i_InitScanner() {
HMODULE module = GetModuleHandle(NULL); HMODULE module = GetModuleHandle(NULL);
if (module) { if (module) {
MODULEINFO info; MODULEINFO info;
GetModuleInformation(GetCurrentProcess(), module, &info, GetModuleInformation(GetCurrentProcess(), module, &info, sizeof(MODULEINFO));
sizeof(MODULEINFO));
ImageBase = (ADDR)info.lpBaseOfDll; ImageBase = (ADDR)info.lpBaseOfDll;
ImageSize = info.SizeOfImage; ImageSize = info.SizeOfImage;
} }
} }
bool tsh_i_CompareData(BYTE *data, BYTE *pattern, char *mask) { bool tsh_i_CompareData(BYTE* data, BYTE* pattern, char* mask) {
for (; *mask; ++data, ++pattern, ++mask) { for (; *mask; ++data, ++pattern, ++mask) {
if (*mask == 'x' && *data != *pattern) if (*mask == 'x' && *data != *pattern)
return false; return false;
@@ -42,8 +41,7 @@ bool tsh_i_CompareData(BYTE *data, BYTE *pattern, char *mask) {
return (*mask) == 0; return (*mask) == 0;
} }
ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE *pattern, ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE* pattern, char* mask) {
char *mask) {
for (ADDR i = imageBase; i < imageBase + imageSize; i++) { for (ADDR i = imageBase; i < imageBase + imageSize; i++) {
if (tsh_i_CompareData((PBYTE)i, pattern, mask)) { if (tsh_i_CompareData((PBYTE)i, pattern, mask)) {
return i; return i;
@@ -53,10 +51,10 @@ ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE *pattern,
} }
// Convert a text-style pattern into code-style // Convert a text-style pattern into code-style
void tsh_i_PatternTextToCode(char *text, char **opatt, char **omask) { void tsh_i_PatternTextToCode(char* text, char** opatt, char** omask) {
unsigned int len = strlen(text); unsigned int len = strlen(text);
char *patt = (char *)malloc(len); char* patt = (char*)malloc(len);
char *mask = (char *)malloc(len); char* mask = (char*)malloc(len);
int outidx = 0; int outidx = 0;
int val = 0; int val = 0;
@@ -93,15 +91,14 @@ void tsh_i_PatternTextToCode(char *text, char **opatt, char **omask) {
// Public functions for sig scanning // Public functions for sig scanning
// Scan using code-style pattern // Scan using code-style pattern
ADDR tsh_ScanCode(char *pattern, char *mask) { ADDR tsh_ScanCode(char* pattern, char* mask) {
return tsh_i_FindPattern(ImageBase, ImageSize - strlen(mask), (BYTE *)pattern, return tsh_i_FindPattern(ImageBase, ImageSize - strlen(mask), (BYTE*)pattern, mask);
mask);
} }
// Scan using a text-style pattern // Scan using a text-style pattern
ADDR tsh_ScanText(char *text) { ADDR tsh_ScanText(char* text) {
char *patt; char* patt;
char *mask; char* mask;
tsh_i_PatternTextToCode(text, &patt, &mask); tsh_i_PatternTextToCode(text, &patt, &mask);
ADDR res = tsh_ScanCode(patt, mask); ADDR res = tsh_ScanCode(patt, mask);
@@ -119,54 +116,46 @@ ADDR tsh_ScanText(char *text) {
void tsh_DeprotectAddress(ADDR length, ADDR location) { void tsh_DeprotectAddress(ADDR length, ADDR location) {
DWORD oldProtection; DWORD oldProtection;
VirtualProtect((void *)location, length, PAGE_EXECUTE_READWRITE, VirtualProtect((void*)location, length, PAGE_EXECUTE_READWRITE, &oldProtection);
&oldProtection);
// tsh_DeprotectedAddresses[location] = {length, oldProtection}; // tsh_DeprotectedAddresses[location] = {length, oldProtection};
} }
// Patch a string of bytes by deprotecting and then overwriting // Patch a string of bytes by deprotecting and then overwriting
void tsh_PatchBytes(ADDR length, ADDR location, BYTE *repl) { void tsh_PatchBytes(ADDR length, ADDR location, BYTE* repl) {
tsh_DeprotectAddress(length, location); tsh_DeprotectAddress(length, location);
memcpy((void *)location, (void *)repl, (size_t)length); memcpy((void*)location, (void*)repl, (size_t)length);
} }
void tsh_PatchByte(ADDR location, BYTE value) { void tsh_PatchByte(ADDR location, BYTE value) { tsh_PatchBytes(location, 1, &value); }
tsh_PatchBytes(location, 1, &value);
}
void tsh_ReplaceInt(ADDR addr, int rval) { void tsh_ReplaceInt(ADDR addr, int rval) { tsh_PatchBytes(4, addr, (BYTE*)(&rval)); }
tsh_PatchBytes(4, addr, (BYTE *)(&rval));
}
int tsh_i_CallOffset(ADDR instr, ADDR func) { return func - (instr + 4); } int tsh_i_CallOffset(ADDR instr, ADDR func) { return func - (instr + 4); }
void tsh_i_ReplaceCall(ADDR instr, ADDR target) { void tsh_i_ReplaceCall(ADDR instr, ADDR target) { tsh_ReplaceInt(instr, tsh_i_CallOffset(instr, target)); }
tsh_ReplaceInt(instr, tsh_i_CallOffset(instr, target));
}
void tsh_i_PatchCopy(ADDR dest, ADDR src, unsigned int len) { void tsh_i_PatchCopy(ADDR dest, ADDR src, unsigned int len) {
for (unsigned int i = 0; i < len; i++) { for (unsigned int i = 0; i < len; i++) {
tsh_PatchByte(dest + i, *((BYTE *)(src + i))); tsh_PatchByte(dest + i, *((BYTE*)(src + i)));
} }
} }
void tsh_HookFunction(ADDR victim, ADDR detour, BYTE *origbytes) { void tsh_HookFunction(ADDR victim, ADDR detour, BYTE* origbytes) {
memcpy(origbytes, (BYTE *)victim, 6); // save old data memcpy(origbytes, (BYTE*)victim, 6); // save old data
*(BYTE *)victim = 0xE9; // jmp rel32 *(BYTE*)victim = 0xE9; // jmp rel32
*(ADDR *)(victim + 1) = (detour - (victim + 5)); // jump offset *(ADDR*)(victim + 1) = (detour - (victim + 5)); // jump offset
*(BYTE *)(victim + 5) = 0xC3; // retn *(BYTE*)(victim + 5) = 0xC3; // retn
} }
void tsh_UnhookFunction(ADDR victim, BYTE *origbytes) { void tsh_UnhookFunction(ADDR victim, BYTE* origbytes) {
tsh_i_PatchCopy(victim, (ADDR)origbytes, 6); // restore old data tsh_i_PatchCopy(victim, (ADDR)origbytes, 6); // restore old data
} }
int tsh_PatchAllMatchesCode(ADDR len, char *patt, char *mask, char *replace, int tsh_PatchAllMatchesCode(ADDR len, char* patt, char* mask, char* replace, bool debugprint) {
bool debugprint) {
int numpatched = 0; int numpatched = 0;
for (ADDR i = ImageBase; i < ImageBase + ImageSize - len; i++) { for (ADDR i = ImageBase; i < ImageBase + ImageSize - len; i++) {
if (tsh_i_CompareData((BYTE *)i, (BYTE *)patt, mask)) { if (tsh_i_CompareData((BYTE*)i, (BYTE*)patt, mask)) {
if (debugprint) if (debugprint)
BlPrintf("RedoBlHooks: Patching call at %08x", i); BlPrintf("RedoBlHooks: Patching call at %08x", i);
@@ -180,10 +169,9 @@ int tsh_PatchAllMatchesCode(ADDR len, char *patt, char *mask, char *replace,
return numpatched; return numpatched;
} }
int tsh_PatchAllMatchesHex(ADDR len, char *text, char *replace, int tsh_PatchAllMatchesHex(ADDR len, char* text, char* replace, bool debugprint) {
bool debugprint) { char* patt;
char *patt; char* mask;
char *mask;
tsh_i_PatternTextToCode(text, &patt, &mask); tsh_i_PatternTextToCode(text, &patt, &mask);
int res = tsh_PatchAllMatchesCode(len, patt, mask, replace, debugprint); int res = tsh_PatchAllMatchesCode(len, patt, mask, replace, debugprint);
@@ -199,9 +187,7 @@ int tsh_PatchAllMatchesHex(ADDR len, char *text, char *replace,
bool tsh_InitInternal() { bool tsh_InitInternal() {
tsh_i_InitScanner(); tsh_i_InitScanner();
BlScanFunctionText( BlScanFunctionText(tsh_BlPrintf, "8D 44 24 08 33 D2 50 FF 74 24 08 33 C9 E8 ? ? ? ? 83 C4 08 C3");
tsh_BlPrintf,
"8D 44 24 08 33 D2 50 FF 74 24 08 33 C9 E8 ? ? ? ? 83 C4 08 C3");
return true; return true;
} }

140
inc/tsfuncs/BlHooks.hpp
View File

@@ -14,13 +14,13 @@ typedef unsigned int ADDR;
bool tsh_InitInternal(); bool tsh_InitInternal();
bool tsh_DeinitInternal(); bool tsh_DeinitInternal();
ADDR tsh_ScanCode(char *, char *); ADDR tsh_ScanCode(char*, char*);
ADDR tsh_ScanText(char *); ADDR tsh_ScanText(char*);
void tsh_HookFunction(ADDR, ADDR, BYTE *); void tsh_HookFunction(ADDR, ADDR, BYTE*);
void tsh_UnhookFunction(ADDR, BYTE *); void tsh_UnhookFunction(ADDR, BYTE*);
int tsh_PatchAllMatches(unsigned int, char *, char *, char *, bool); int tsh_PatchAllMatches(unsigned int, char*, char*, char*, bool);
void tsh_PatchByte(ADDR, BYTE); void tsh_PatchByte(ADDR, BYTE);
void tsh_PatchBytes(unsigned int, ADDR, BYTE *); void tsh_PatchBytes(unsigned int, ADDR, BYTE*);
void tsh_PatchInt(ADDR, int); void tsh_PatchInt(ADDR, int);
// Debug print settings // Debug print settings
@@ -34,13 +34,13 @@ void tsh_PatchInt(ADDR, int);
// Function short names // Function short names
// Use in code when the def is not shared in a header // Use in code when the def is not shared in a header
#define BlFunctionDef(returnType, convention, name, ...) \ #define BlFunctionDef(returnType, convention, name, ...) \
typedef returnType(convention *tsh_##name##FnT)(__VA_ARGS__); \ typedef returnType(convention* tsh_##name##FnT)(__VA_ARGS__); \
tsh_##name##FnT name; tsh_##name##FnT name;
// Use in header for shared function defs when a BlFunctionDefIntern exists in // Use in header for shared function defs when a BlFunctionDefIntern exists in
// code // code
#define BlFunctionDefExtern(returnType, convention, name, ...) \ #define BlFunctionDefExtern(returnType, convention, name, ...) \
typedef returnType(convention *tsh_##name##FnT)(__VA_ARGS__); \ typedef returnType(convention* tsh_##name##FnT)(__VA_ARGS__); \
extern tsh_##name##FnT name; extern tsh_##name##FnT name;
// Use in code for shared function defs when a BlFunctionDefExtern exists in // Use in code for shared function defs when a BlFunctionDefExtern exists in
// header // header
@@ -48,94 +48,84 @@ void tsh_PatchInt(ADDR, int);
// Scan for and assign the pattern to the variable, or err and return if not // Scan for and assign the pattern to the variable, or err and return if not
// found // found
#define BlScanFunctionCode(target, patt, mask) \ #define BlScanFunctionCode(target, patt, mask) \
target = (tsh_##target##FnT)tsh_ScanCode((char *)patt, (char *)mask); \ target = (tsh_##target##FnT)tsh_ScanCode((char*)patt, (char*)mask); \
if (!target) { \ if (!target) { \
BlPrintf("RedoBlHooks | Cannot find function " #target "!"); \ BlPrintf("RedoBlHooks | Cannot find function " #target "!"); \
return false; \ return false; \
} else { \ } else { \
if (tsh_DEBUGPRINT) \ if (tsh_DEBUGPRINT) \
BlPrintf("RedoBlHooks | Found function " #target " at %08x", \ BlPrintf("RedoBlHooks | Found function " #target " at %08x", (int)target); \
(int)target); \
} }
#define BlScanFunctionText(target, text) \ #define BlScanFunctionText(target, text) \
target = (tsh_##target##FnT)tsh_ScanText((char *)text); \ target = (tsh_##target##FnT)tsh_ScanText((char*)text); \
if (!target) { \ if (!target) { \
BlPrintf("RedoBlHooks | Cannot find function " #target "!"); \ BlPrintf("RedoBlHooks | Cannot find function " #target "!"); \
return false; \ return false; \
} else { \ } else { \
if (tsh_DEBUGPRINT) \ if (tsh_DEBUGPRINT) \
BlPrintf("RedoBlHooks | Found function " #target " at %08x", \ BlPrintf("RedoBlHooks | Found function " #target " at %08x", (int)target); \
(int)target); \
} }
#define BlScanCode(target, patt, mask) \ #define BlScanCode(target, patt, mask) \
target = tsh_ScanCode((char *)patt, (char *)mask); \ target = tsh_ScanCode((char*)patt, (char*)mask); \
if (!target) { \ if (!target) { \
BlPrintf("RedoBlHooks | Cannot find pattern " #target "!"); \ BlPrintf("RedoBlHooks | Cannot find pattern " #target "!"); \
return false; \ return false; \
} else { \ } else { \
if (tsh_DEBUGPRINT) \ if (tsh_DEBUGPRINT) \
BlPrintf("RedoBlHooks | Found " #target " at %08x", (int)target); \ BlPrintf("RedoBlHooks | Found " #target " at %08x", (int)target); \
} }
#define BlScanText(target, text) \ #define BlScanText(target, text) \
target = tsh_ScanText((char *)text); \ target = tsh_ScanText((char*)text); \
if (!target) { \ if (!target) { \
BlPrintf("RedoBlHooks | Cannot find " #target "!"); \ BlPrintf("RedoBlHooks | Cannot find " #target "!"); \
return false; \ return false; \
} else { \ } else { \
if (tsh_DEBUGPRINT) \ if (tsh_DEBUGPRINT) \
BlPrintf("RedoBlHooks | Found " #target " at %08x", (int)target); \ BlPrintf("RedoBlHooks | Found " #target " at %08x", (int)target); \
} }
// Use in code to define the data and functions for hooking a function // Use in code to define the data and functions for hooking a function
#define BlFunctionHookDef(func) \ #define BlFunctionHookDef(func) \
BYTE tsh_BlFunctionHook##func##Data[6]; \ BYTE tsh_BlFunctionHook##func##Data[6]; \
void func##HookOn() { \ void func##HookOn() { tsh_HookFunction((ADDR)func, (ADDR)func##Hook, tsh_BlFunctionHook##func##Data); } \
tsh_HookFunction((ADDR)func, (ADDR)func##Hook, \ void func##HookOff() { tsh_UnhookFunction((ADDR)func, tsh_BlFunctionHook##func##Data); }
tsh_BlFunctionHook##func##Data); \
} \
void func##HookOff() { \
tsh_UnhookFunction((ADDR)func, tsh_BlFunctionHook##func##Data); \
}
// Use in code to initialize the hook once // Use in code to initialize the hook once
#define BlFunctionHookInit(func) \ #define BlFunctionHookInit(func) \
tsh_DeprotectAddress(6, (ADDR)func); \ tsh_DeprotectAddress(6, (ADDR)func); \
func##HookOn(); func##HookOn();
// Replace all matches of the pattern with the given byte string // Replace all matches of the pattern with the given byte string
#define BlPatchAllMatchesCode(len, patt, mask, repl) \ #define BlPatchAllMatchesCode(len, patt, mask, repl) \
tsh_PatchAllMatchesCode((ADDR)len, (char *)patt, (char *)mask, (char *)repl, \ tsh_PatchAllMatchesCode((ADDR)len, (char*)patt, (char*)mask, (char*)repl, tsh_DEBUGPRINT);
tsh_DEBUGPRINT); #define BlPatchAllMatchesText(len, text, repl) \
#define BlPatchAllMatchesText(len, text, repl) \ tsh_PatchAllMatchesCode((ADDR)len, (char*)text, (char*)repl, tsh_DEBUGPRINT);
tsh_PatchAllMatchesCode((ADDR)len, (char *)text, (char *)repl, \
tsh_DEBUGPRINT);
// Deprotect and replace one byte // Deprotect and replace one byte
#define BlPatchByte(addr, byte) tsh_PatchByte((ADDR)addr, (BYTE)byte); #define BlPatchByte(addr, byte) tsh_PatchByte((ADDR)addr, (BYTE)byte);
// Deprotect and replace a byte string // Deprotect and replace a byte string
#define BlPatchBytes(len, addr, repl) \ #define BlPatchBytes(len, addr, repl) tsh_PatchBytes((ADDR)len, (ADDR)addr, (BYTE*)repl);
tsh_PatchBytes((ADDR)len, (ADDR)addr, (BYTE *)repl);
// BlPrintf(char* format, ...) // BlPrintf(char* format, ...)
#define BlPrintf(...) \ #define BlPrintf(...) \
if (tsh_BlPrintf) { \ if (tsh_BlPrintf) { \
tsh_BlPrintf(__VA_ARGS__); \ tsh_BlPrintf(__VA_ARGS__); \
} }
// BlHooksInit() -> bool: success // BlHooksInit() -> bool: success
#define BlHooksInit() \ #define BlHooksInit() \
if (!tsh_InitInternal()) { \ if (!tsh_InitInternal()) { \
BlPrintf("BlHooksInit failed"); \ BlPrintf("BlHooksInit failed"); \
return false; \ return false; \
} }
// BlHooksDeinit() -> bool: success // BlHooksDeinit() -> bool: success
#define BlHooksDeinit() \ #define BlHooksDeinit() \
if (!tsh_DeinitInternal()) { \ if (!tsh_DeinitInternal()) { \
BlPrintf("BlHooksDeinit failed"); \ BlPrintf("BlHooksDeinit failed"); \
return false; \ return false; \
} }
// Scanned structures // Scanned structures
BlFunctionDefExtern(void, , tsh_BlPrintf, const char *, ...); BlFunctionDefExtern(void, , tsh_BlPrintf, const char*, ...);
#endif #endif

23
src/bllua4.cpp
View File

@@ -14,7 +14,7 @@
#include "luainterp.cpp" #include "luainterp.cpp"
#include "lualibts.cpp" #include "lualibts.cpp"
lua_State *gL; lua_State* gL;
#include "tsliblua.cpp" #include "tsliblua.cpp"
// Global variables // Global variables
@@ -22,9 +22,9 @@ lua_State *gL;
// Setup // Setup
// Hack to encode the contents of text files as static strings // Hack to encode the contents of text files as static strings
#define INCLUDE_BIN(varname, filename) \ #define INCLUDE_BIN(varname, filename) \
asm("_" #varname ": .incbin \"" filename "\""); \ asm("_" #varname ": .incbin \"" filename "\""); \
asm(".byte 0"); \ asm(".byte 0"); \
extern char varname[]; extern char varname[];
INCLUDE_BIN(bll_fileLuaEnvSafe, "lua-env-safe.lua"); INCLUDE_BIN(bll_fileLuaEnvSafe, "lua-env-safe.lua");
INCLUDE_BIN(bll_fileLuaEnv, "lua-env.lua"); INCLUDE_BIN(bll_fileLuaEnv, "lua-env.lua");
@@ -39,10 +39,10 @@ INCLUDE_BIN(bll_fileLuaLibblTypes, "util/libbl-types.lua");
INCLUDE_BIN(bll_fileTsLibblSupport, "util/libbl-support.cs"); INCLUDE_BIN(bll_fileTsLibblSupport, "util/libbl-support.cs");
INCLUDE_BIN(bll_fileLoadaddons, "util/loadaddons.cs"); INCLUDE_BIN(bll_fileLoadaddons, "util/loadaddons.cs");
#define BLL_LOAD_LUA(lstate, vname) \ #define BLL_LOAD_LUA(lstate, vname) \
if (!bll_LuaEval(lstate, vname)) { \ if (!bll_LuaEval(lstate, vname)) { \
BlPrintf(" Error executing " #vname); \ BlPrintf(" Error executing " #vname); \
return false; \ return false; \
} }
bool init() { bool init() {
@@ -65,9 +65,8 @@ bool init() {
#endif #endif
// Expose Lua API to TS // Expose Lua API to TS
BlAddFunction(NULL, NULL, "_bllua_luacall", bll_ts_luacall, BlAddFunction(
"LuaCall(name, ...) - Call Lua function and return result", 2, NULL, NULL, "_bllua_luacall", bll_ts_luacall, "LuaCall(name, ...) - Call Lua function and return result", 2, 20);
20);
BlEval(bll_fileTsEnv); BlEval(bll_fileTsEnv);
// Load utilities // Load utilities
@@ -103,7 +102,7 @@ bool deinit() {
return true; return true;
} }
bool __stdcall DllMain(HINSTANCE hinstance, DWORD reason, void *reserved) { bool __stdcall DllMain(HINSTANCE hinstance, DWORD reason, void* reserved) {
switch (reason) { switch (reason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
return init(); return init();

14
src/luainterp.cpp
View File

@@ -6,7 +6,7 @@
#include "lua.h" #include "lua.h"
#include <cstring> #include <cstring>
int bll_error_handler(lua_State *L) { int bll_error_handler(lua_State* L) {
lua_getfield(L, LUA_GLOBALSINDEX, "_bllua_on_error"); lua_getfield(L, LUA_GLOBALSINDEX, "_bllua_on_error");
if (!lua_isfunction(L, -1)) { if (!lua_isfunction(L, -1)) {
BlPrintf(" Lua error handler: _bllua_on_error not defined."); BlPrintf(" Lua error handler: _bllua_on_error not defined.");
@@ -21,7 +21,8 @@ int bll_error_handler(lua_State *L) {
lua_pcall(L, 1, 1, 0); lua_pcall(L, 1, 1, 0);
return 1; return 1;
} }
int bll_pcall(lua_State *L, int nargs, int nret) {
int bll_pcall(lua_State* L, int nargs, int nret) {
// calculate stack position for message handler // calculate stack position for message handler
int hpos = lua_gettop(L) - nargs; int hpos = lua_gettop(L) - nargs;
// push custom error message handler // push custom error message handler
@@ -36,7 +37,7 @@ int bll_pcall(lua_State *L, int nargs, int nret) {
} }
// Display the last Lua error in the BL console // Display the last Lua error in the BL console
void bll_printError(lua_State *L, const char *operation, const char *item) { void bll_printError(lua_State* L, const char* operation, const char* item) {
// error_handler(L); // error_handler(L);
BlPrintf("\x03Lua error: %s", lua_tostring(L, -1)); BlPrintf("\x03Lua error: %s", lua_tostring(L, -1));
BlPrintf("\x03 (%s: %s)", operation, item); BlPrintf("\x03 (%s: %s)", operation, item);
@@ -44,7 +45,7 @@ void bll_printError(lua_State *L, const char *operation, const char *item) {
} }
// Eval a string of Lua code // Eval a string of Lua code
bool bll_LuaEval(lua_State *L, const char *str) { bool bll_LuaEval(lua_State* L, const char* str) {
if (luaL_loadbuffer(L, str, strlen(str), "input") || bll_pcall(L, 0, 1)) { if (luaL_loadbuffer(L, str, strlen(str), "input") || bll_pcall(L, 0, 1)) {
bll_printError(L, "eval", str); bll_printError(L, "eval", str);
return false; return false;
@@ -55,9 +56,10 @@ bool bll_LuaEval(lua_State *L, const char *str) {
// Convert a Lua stack entry into a string for providing to TS // Convert a Lua stack entry into a string for providing to TS
// Use static buffer to avoid excessive malloc // Use static buffer to avoid excessive malloc
char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX]; char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX];
bool bll_toarg(lua_State *L, char *buf, int i, bool err) {
bool bll_toarg(lua_State* L, char* buf, int i, bool err) {
if (lua_isstring(L, i)) { if (lua_isstring(L, i)) {
const char *str = lua_tostring(L, i); const char* str = lua_tostring(L, i);
if (strlen(str) >= BLL_ARG_MAX) { if (strlen(str) >= BLL_ARG_MAX) {
if (err) if (err)
luaL_error(L, "argument to TS is too long - max length is 8192"); luaL_error(L, "argument to TS is too long - max length is 8192");

8
src/luainterp.hpp
View File

@@ -8,10 +8,10 @@
#define BLL_ARG_MAX 8192 #define BLL_ARG_MAX 8192
extern char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX]; extern char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX];
bool bll_toarg(lua_State *L, char *buf, int i, bool err); bool bll_toarg(lua_State* L, char* buf, int i, bool err);
int bll_pcall(lua_State *L, int nargs, int nret); int bll_pcall(lua_State* L, int nargs, int nret);
void bll_printError(lua_State *L, const char *operation, const char *item); void bll_printError(lua_State* L, const char* operation, const char* item);
extern lua_State *gL; extern lua_State* gL;
#endif #endif

203
src/lualibts.cpp
View File

@@ -9,8 +9,7 @@
#include "lua.h" #include "lua.h"
#include "luainterp.hpp" #include "luainterp.hpp"
int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc, int bll_TsCall(lua_State* L, const char* oname, const char* fname, int argc, int ofs) {
int ofs) {
ADDR obj = (ADDR)NULL; ADDR obj = (ADDR)NULL;
if (oname) { if (oname) {
obj = BlObject(oname); obj = BlObject(oname);
@@ -23,15 +22,15 @@ int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
return luaL_error(L, "Lua->TS call: Too many arguments (Max is 19)"); return luaL_error(L, "Lua->TS call: Too many arguments (Max is 19)");
} }
char *argv[BLL_ARG_COUNT]; char* argv[BLL_ARG_COUNT];
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
char *argbuf = bll_arg_buffer[i]; char* argbuf = bll_arg_buffer[i];
argv[i] = argbuf; argv[i] = argbuf;
bll_toarg(L, argbuf, i + ofs + 1, true); bll_toarg(L, argbuf, i + ofs + 1, true);
} }
// /:^| / // /:^| /
const char *res; const char* res;
if (obj) { if (obj) {
switch (argc) { switch (argc) {
case 0: case 0:
@@ -56,71 +55,65 @@ int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4]); res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4]);
break; break;
case 7: case 7:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
argv[5]);
break; break;
case 8: case 8:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]);
argv[5], argv[6]);
break; break;
case 9: case 9:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]);
argv[5], argv[6], argv[7]);
break; break;
case 10: case 10:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]);
argv[5], argv[6], argv[7], argv[8]);
break; break;
case 11: case 11:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(
argv[5], argv[6], argv[7], argv[8], argv[9]); obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]);
break; break;
case 12: case 12:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]); obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[10]);
break; break;
case 13: case 13:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[11]); argv[10], argv[11]);
break; break;
case 14: case 14:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[11], argv[12]); argv[10], argv[11], argv[12]);
break; break;
case 15: case 15:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[11], argv[12], argv[13]); argv[10], argv[11], argv[12], argv[13]);
break; break;
case 16: case 16:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[11], argv[12], argv[13], argv[14]); argv[10], argv[11], argv[12], argv[13], argv[14]);
break; break;
case 17: case 17:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[11], argv[12], argv[13], argv[14], argv[15]); argv[10], argv[11], argv[12], argv[13], argv[14], argv[15]);
break; break;
case 18: case 18:
res = res = BlCallObj(
BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]);
argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]);
break; break;
case 19: case 19:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[11], argv[12], argv[13], argv[14], argv[15], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
argv[16], argv[17]);
break; break;
case 20: case 20:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], res = BlCallObj(
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9],
argv[11], argv[12], argv[13], argv[14], argv[15], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]);
argv[16], argv[17], argv[18]);
break; break;
default: default:
res = ""; res = "";
@@ -150,64 +143,60 @@ int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]); res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
break; break;
case 7: case 7:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]);
argv[6]);
break; break;
case 8: case 8:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]);
argv[6], argv[7]);
break; break;
case 9: case 9:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]);
argv[6], argv[7], argv[8]);
break; break;
case 10: case 10:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]);
argv[6], argv[7], argv[8], argv[9]);
break; break;
case 11: case 11:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(
argv[6], argv[7], argv[8], argv[9], argv[10]); fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
break; break;
case 12: case 12:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]); fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11]);
break; break;
case 13: case 13:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[12]); argv[11], argv[12]);
break; break;
case 14: case 14:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[12], argv[13]); argv[11], argv[12], argv[13]);
break; break;
case 15: case 15:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[12], argv[13], argv[14]); argv[11], argv[12], argv[13], argv[14]);
break; break;
case 16: case 16:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[12], argv[13], argv[14], argv[15]); argv[11], argv[12], argv[13], argv[14], argv[15]);
break; break;
case 17: case 17:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[12], argv[13], argv[14], argv[15], argv[16]); argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]);
break; break;
case 18: case 18:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]); argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
break; break;
case 19: case 19:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], res = BlCall(
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]);
argv[18]);
break; break;
default: default:
res = ""; res = "";
@@ -219,57 +208,58 @@ int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
return 1; return 1;
} }
// Lua lib function: ts.call // Lua lib function: ts.call
int bll_lua_tscall(lua_State *L) { int bll_lua_tscall(lua_State* L) {
int argc = lua_gettop(L) - 1; // number of arguments after function name int argc = lua_gettop(L) - 1; // number of arguments after function name
if (argc < 0) if (argc < 0)
return luaL_error(L, "_bllua_ts.call: Must provide a function name"); return luaL_error(L, "_bllua_ts.call: Must provide a function name");
const char *fname = luaL_checkstring(L, 1); const char* fname = luaL_checkstring(L, 1);
return bll_TsCall(L, NULL, fname, argc, 1); return bll_TsCall(L, NULL, fname, argc, 1);
} }
// Lua lib function: ts.callobj
int bll_lua_tscallobj(lua_State *L) {
int argc =
lua_gettop(L) - 2; // number of arguments after function name and object?
if (argc < 0)
return luaL_error(
L, "_bllua_ts.callobj: Must provide an object and function name");
const char *oname = luaL_checkstring(L, 1); // Lua lib function: ts.callobj
const char *fname = luaL_checkstring(L, 2); int bll_lua_tscallobj(lua_State* L) {
int argc = lua_gettop(L) - 2; // number of arguments after function name and object?
if (argc < 0)
return luaL_error(L, "_bllua_ts.callobj: Must provide an object and function name");
const char* oname = luaL_checkstring(L, 1);
const char* fname = luaL_checkstring(L, 2);
return bll_TsCall(L, oname, fname, argc, 2); return bll_TsCall(L, oname, fname, argc, 2);
} }
// Lua lib function: ts.getvar // Lua lib function: ts.getvar
int bll_lua_tsgetvar(lua_State *L) { int bll_lua_tsgetvar(lua_State* L) {
const char *vname = luaL_checkstring(L, 1); const char* vname = luaL_checkstring(L, 1);
const char *var = BlGetVar(vname); const char* var = BlGetVar(vname);
lua_pushstring(L, var); lua_pushstring(L, var);
return 1; return 1;
} }
// Lua lib function: ts.getfield // Lua lib function: ts.getfield
int bll_lua_tsgetfield(lua_State *L) { int bll_lua_tsgetfield(lua_State* L) {
const char *oname = luaL_checkstring(L, 1); const char* oname = luaL_checkstring(L, 1);
const char *vname = luaL_checkstring(L, 2); const char* vname = luaL_checkstring(L, 2);
ADDR obj = BlObject(oname); ADDR obj = BlObject(oname);
if (!obj) { if (!obj) {
return luaL_error(L, "_bllua_ts.getfield: Object not found"); return luaL_error(L, "_bllua_ts.getfield: Object not found");
} }
const char *val = BlGetField(obj, vname, NULL); const char* val = BlGetField(obj, vname, NULL);
lua_pushstring(L, val); lua_pushstring(L, val);
return 1; return 1;
} }
// Lua lib function: ts.setfield // Lua lib function: ts.setfield
int bll_lua_tssetfield(lua_State *L) { int bll_lua_tssetfield(lua_State* L) {
const char *oname = luaL_checkstring(L, 1); const char* oname = luaL_checkstring(L, 1);
const char *vname = luaL_checkstring(L, 2); const char* vname = luaL_checkstring(L, 2);
const char *val = luaL_checkstring(L, 3); const char* val = luaL_checkstring(L, 3);
ADDR obj = BlObject(oname); ADDR obj = BlObject(oname);
if (!obj) { if (!obj) {
return luaL_error(L, "_bllua_ts.setfield: Object not found"); return luaL_error(L, "_bllua_ts.setfield: Object not found");
@@ -280,17 +270,17 @@ int bll_lua_tssetfield(lua_State *L) {
} }
// Lua lib function: ts.eval // Lua lib function: ts.eval
int bll_lua_tseval(lua_State *L) { int bll_lua_tseval(lua_State* L) {
const char *str = luaL_checkstring(L, 1); const char* str = luaL_checkstring(L, 1);
const char *res = BlEval(str); const char* res = BlEval(str);
lua_pushstring(L, res); lua_pushstring(L, res);
return 1; return 1;
} }
// Lua lib function: ts.echo // Lua lib function: ts.echo
// Print to BL console - used in Lua print implementation // Print to BL console - used in Lua print implementation
int bll_lua_tsecho(lua_State *L) { int bll_lua_tsecho(lua_State* L) {
const char *str = luaL_checkstring(L, 1); const char* str = luaL_checkstring(L, 1);
BlPrintf("%s", str); BlPrintf("%s", str);
return 0; return 0;
} }
@@ -301,4 +291,5 @@ const luaL_Reg bll_lua_reg[] = {
{"setfield", bll_lua_tssetfield}, {"eval", bll_lua_tseval}, {"setfield", bll_lua_tssetfield}, {"eval", bll_lua_tseval},
{"echo", bll_lua_tsecho}, {NULL, NULL}, {"echo", bll_lua_tsecho}, {NULL, NULL},
}; };
void llibbl_init(lua_State *L) { luaL_register(L, "_bllua_ts", bll_lua_reg); }
void llibbl_init(lua_State* L) { luaL_register(L, "_bllua_ts", bll_lua_reg); }

6
src/tsliblua.cpp
View File

@@ -5,7 +5,7 @@
#include "BlHooks.hpp" #include "BlHooks.hpp"
#include "luainterp.hpp" #include "luainterp.hpp"
bool bll_LuaCall(const char *fname, int argc, const char *argv[]) { bool bll_LuaCall(const char* fname, int argc, const char* argv[]) {
lua_getglobal(gL, fname); lua_getglobal(gL, fname);
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
lua_pushstring(gL, argv[i]); lua_pushstring(gL, argv[i]);
@@ -18,7 +18,7 @@ bool bll_LuaCall(const char *fname, int argc, const char *argv[]) {
} }
// TS lib function: luacall // TS lib function: luacall
const char *bll_ts_luacall(ADDR obj, int argc, const char *argv[]) { const char* bll_ts_luacall(ADDR obj, int argc, const char* argv[]) {
if (argc < 2) if (argc < 2)
return ""; return "";
@@ -26,7 +26,7 @@ const char *bll_ts_luacall(ADDR obj, int argc, const char *argv[]) {
return ""; return "";
} }
char *retbuf = BlReturnBuffer(BLL_ARG_MAX); char* retbuf = BlReturnBuffer(BLL_ARG_MAX);
bll_toarg(gL, retbuf, -1, false); // provide returned value to ts bll_toarg(gL, retbuf, -1, false); // provide returned value to ts
lua_pop(gL, 1); // pop returned value lua_pop(gL, 1); // pop returned value
return retbuf; return retbuf;