forked from redo/BlockLua
.clang-format updates
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
BasedOnStyle: LLVM
|
||||
|
||||
# Include sorting and grouping
|
||||
SortIncludes: CaseSensitive
|
||||
IncludeBlocks: Preserve
|
||||
IncludeCategories:
|
||||
@@ -12,3 +14,29 @@ IncludeCategories:
|
||||
Priority: 4
|
||||
- Regex: ".*"
|
||||
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
|
||||
|
||||
@@ -20,24 +20,19 @@ typedef struct luaL_Reg {
|
||||
lua_CFunction func;
|
||||
} luaL_Reg;
|
||||
|
||||
LUALIB_API void(luaL_openlib)(lua_State *L, const char *libname,
|
||||
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_openlib)(lua_State* L, const char* libname, const luaL_Reg* l, int nup);
|
||||
LUALIB_API void(luaL_register)(lua_State* L, const char* libname, const luaL_Reg* l);
|
||||
LUALIB_API int(luaL_getmetafield)(lua_State* L, int obj, const char* e);
|
||||
LUALIB_API int(luaL_callmeta)(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_argerror)(lua_State* L, int numarg, const char* extramsg);
|
||||
LUALIB_API const char *(luaL_checklstring)(lua_State * L, int numArg,
|
||||
size_t *l);
|
||||
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, size_t* l);
|
||||
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_optinteger)(lua_State *L, int nArg,
|
||||
lua_Integer def);
|
||||
LUALIB_API lua_Integer(luaL_optinteger)(lua_State* L, int nArg, lua_Integer def);
|
||||
|
||||
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);
|
||||
@@ -49,8 +44,7 @@ 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 int(luaL_error)(lua_State* L, const char* fmt, ...);
|
||||
|
||||
LUALIB_API int(luaL_checkoption)(lua_State *L, int narg, const char *def,
|
||||
const char *const lst[]);
|
||||
LUALIB_API int(luaL_checkoption)(lua_State* L, int narg, const char* def, const char* const lst[]);
|
||||
|
||||
/* pre-defined references */
|
||||
#define LUA_NOREF (-2)
|
||||
@@ -60,30 +54,23 @@ LUALIB_API int(luaL_ref)(lua_State *L, int t);
|
||||
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_loadbuffer)(lua_State *L, const char *buff, size_t sz,
|
||||
const char *name);
|
||||
LUALIB_API int(luaL_loadbuffer)(lua_State* L, const char* buff, size_t sz, const char* name);
|
||||
LUALIB_API int(luaL_loadstring)(lua_State* L, const char* s);
|
||||
|
||||
LUALIB_API lua_State*(luaL_newstate)(void);
|
||||
|
||||
LUALIB_API const char *(luaL_gsub)(lua_State * L, const char *s, const char *p,
|
||||
const char *r);
|
||||
LUALIB_API const char*(luaL_gsub)(lua_State * L, const char* s, const char* p, const char* r);
|
||||
|
||||
LUALIB_API const char *(luaL_findtable)(lua_State * L, int idx,
|
||||
const char *fname, int szhint);
|
||||
LUALIB_API const char*(luaL_findtable)(lua_State * L, int idx, const char* fname, int szhint);
|
||||
|
||||
/* From Lua 5.2. */
|
||||
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_loadfilex)(lua_State *L, const char *filename,
|
||||
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 void luaL_traceback(lua_State *L, lua_State *L1, const char *msg,
|
||||
int level);
|
||||
LUALIB_API int(luaL_loadfilex)(lua_State* L, const char* filename, 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 void luaL_traceback(lua_State* L, lua_State* L1, const char* msg, int level);
|
||||
LUALIB_API void(luaL_setfuncs)(lua_State* L, const luaL_Reg* l, int nup);
|
||||
LUALIB_API void(luaL_pushmodule)(lua_State *L, const char *modname,
|
||||
int sizehint);
|
||||
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) \
|
||||
((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
|
||||
#define luaL_argcheck(L, cond, numarg, extramsg) ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
|
||||
#define luaL_checkstring(L, n) (luaL_checklstring(L, (n), NULL))
|
||||
#define luaL_optstring(L, n, d) (luaL_optlstring(L, (n), (d), NULL))
|
||||
#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_dofile(L, fn) \
|
||||
(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
|
||||
#define luaL_dofile(L, fn) (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
|
||||
|
||||
#define luaL_dostring(L, s) \
|
||||
(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
|
||||
#define luaL_dostring(L, s) (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
|
||||
|
||||
#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)))
|
||||
|
||||
/* From Lua 5.2. */
|
||||
#define luaL_newlibtable(L, l) \
|
||||
lua_createtable(L, 0, sizeof(l) / sizeof((l)[0]) - 1)
|
||||
#define luaL_newlibtable(L, l) lua_createtable(L, 0, sizeof(l) / sizeof((l)[0]) - 1)
|
||||
#define luaL_newlib(L, l) (luaL_newlibtable(L, l), luaL_setfuncs(L, l, 0))
|
||||
|
||||
/*
|
||||
@@ -133,8 +116,7 @@ typedef struct luaL_Buffer {
|
||||
} luaL_Buffer;
|
||||
|
||||
#define luaL_addchar(B, c) \
|
||||
((void)((B)->p < ((B)->buffer + LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), \
|
||||
(*(B)->p++ = (char)(c)))
|
||||
((void)((B)->p < ((B)->buffer + LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), (*(B)->p++ = (char)(c)))
|
||||
|
||||
/* compatibility only */
|
||||
#define luaL_putchar(B, c) luaL_addchar(B, c)
|
||||
|
||||
@@ -143,8 +143,7 @@ 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_pushlstring)(lua_State* L, const char* s, size_t l);
|
||||
LUA_API void(lua_pushstring)(lua_State* L, const char* s);
|
||||
LUA_API const char *(lua_pushvfstring)(lua_State * L, const char *fmt,
|
||||
va_list argp);
|
||||
LUA_API const char*(lua_pushvfstring)(lua_State * L, const char* fmt, va_list argp);
|
||||
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_pushboolean)(lua_State* L, int b);
|
||||
@@ -179,8 +178,7 @@ LUA_API int(lua_setfenv)(lua_State *L, int idx);
|
||||
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_cpcall)(lua_State* L, lua_CFunction func, void* ud);
|
||||
LUA_API int(lua_load)(lua_State *L, lua_Reader reader, void *dt,
|
||||
const char *chunkname);
|
||||
LUA_API int(lua_load)(lua_State* L, lua_Reader reader, void* dt, const char* chunkname);
|
||||
|
||||
LUA_API int(lua_dump)(lua_State* L, lua_Writer writer, void* data);
|
||||
|
||||
@@ -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_isnoneornil(L, n) (lua_type(L, (n)) <= 0)
|
||||
|
||||
#define lua_pushliteral(L, s) \
|
||||
lua_pushlstring(L, "" s, (sizeof(s) / sizeof(char)) - 1)
|
||||
#define lua_pushliteral(L, s) lua_pushlstring(L, "" s, (sizeof(s) / sizeof(char)) - 1)
|
||||
|
||||
#define lua_setglobal(L, s) lua_setfield(L, LUA_GLOBALSINDEX, (s))
|
||||
#define lua_getglobal(L, s) lua_getfield(L, LUA_GLOBALSINDEX, (s))
|
||||
@@ -311,8 +308,7 @@ LUA_API int lua_gethookcount(lua_State *L);
|
||||
/* From Lua 5.2. */
|
||||
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 int lua_loadx(lua_State *L, lua_Reader reader, void *dt,
|
||||
const char *chunkname, const char *mode);
|
||||
LUA_API int lua_loadx(lua_State* L, lua_Reader reader, void* dt, const char* chunkname, const char* mode);
|
||||
LUA_API const lua_Number* lua_version(lua_State* L);
|
||||
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);
|
||||
|
||||
@@ -76,9 +76,7 @@
|
||||
#define LUA_PATH_MARK "?"
|
||||
#define LUA_EXECDIR "!"
|
||||
#define LUA_IGMARK "-"
|
||||
#define LUA_PATH_CONFIG \
|
||||
LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" LUA_EXECDIR \
|
||||
"\n" LUA_IGMARK "\n"
|
||||
#define LUA_PATH_CONFIG LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" LUA_EXECDIR "\n" LUA_IGMARK "\n"
|
||||
|
||||
/* Quoting in error messages. */
|
||||
#define LUA_QL(x) "'" x "'"
|
||||
|
||||
@@ -65,13 +65,10 @@ enum {
|
||||
LUA_API int luaJIT_setmode(lua_State* L, int idx, int mode);
|
||||
|
||||
/* Low-overhead profiling API. */
|
||||
typedef void (*luaJIT_profile_callback)(void *data, lua_State *L, int samples,
|
||||
int vmstate);
|
||||
LUA_API void luaJIT_profile_start(lua_State *L, const char *mode,
|
||||
luaJIT_profile_callback cb, void *data);
|
||||
typedef void (*luaJIT_profile_callback)(void* data, lua_State* L, int samples, 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_stop(lua_State* L);
|
||||
LUA_API const char *luaJIT_profile_dumpstack(lua_State *L, const char *fmt,
|
||||
int depth, size_t *len);
|
||||
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. */
|
||||
LUA_API void LUAJIT_VERSION_SYM(void);
|
||||
|
||||
@@ -43,20 +43,21 @@ char *tsf_GetIntArg(signed int value) {
|
||||
snprintf(ret, 16, "%d", value);
|
||||
return ret;
|
||||
}
|
||||
|
||||
char* tsf_GetFloatArg(float value) {
|
||||
char* ret = tsf_BlStringStack__getArgBuffer(32);
|
||||
snprintf(ret, 32, "%g", value);
|
||||
return ret;
|
||||
}
|
||||
|
||||
char* tsf_GetStringArg(char* value) {
|
||||
int len = strlen(value) + 1;
|
||||
char* ret = tsf_BlStringStack__getArgBuffer(len);
|
||||
memcpy(ret, value, len);
|
||||
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
|
||||
|
||||
@@ -91,9 +92,7 @@ ADDR tsf_FindObject(unsigned int id) {
|
||||
return obj;
|
||||
}
|
||||
|
||||
ADDR tsf_FindObject(const char *name) {
|
||||
return (ADDR)tsf_BlSim__findObject_name(name);
|
||||
}
|
||||
ADDR tsf_FindObject(const char* name) { return (ADDR)tsf_BlSim__findObject_name(name); }
|
||||
|
||||
ADDR tsf_LookupNamespace(const char* ns, const char* package) {
|
||||
const char* ste_package;
|
||||
@@ -110,14 +109,12 @@ ADDR tsf_LookupNamespace(const char *ns, const char *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
|
||||
|
||||
const char *tsf_GetDataField(ADDR simObject, const char *slotName,
|
||||
const char *array) {
|
||||
const char* tsf_GetDataField(ADDR simObject, const char* slotName, const char* array) {
|
||||
const char* ste_slotName;
|
||||
if (slotName) {
|
||||
ste_slotName = tsf_BlStringTable__insert(slotName, 0);
|
||||
@@ -128,8 +125,7 @@ const char *tsf_GetDataField(ADDR simObject, const char *slotName,
|
||||
return tsf_BlSimObject__getDataField(simObject, ste_slotName, array);
|
||||
}
|
||||
|
||||
void tsf_SetDataField(ADDR simObject, const char *slotName, const char *array,
|
||||
const char *value) {
|
||||
void tsf_SetDataField(ADDR simObject, const char* slotName, const char* array, const char* value) {
|
||||
const char* ste_slotName;
|
||||
if (slotName) {
|
||||
ste_slotName = tsf_BlStringTable__insert(slotName, 0);
|
||||
@@ -142,33 +138,29 @@ void tsf_SetDataField(ADDR simObject, const char *slotName, const char *array,
|
||||
|
||||
// TS Global Variables
|
||||
|
||||
const char *tsf_GetVar(const char *name) {
|
||||
return tsf_BlCon__getVariable(name);
|
||||
}
|
||||
const char* tsf_GetVar(const char* 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);
|
||||
tsf_BlDictionary__addVariable((ADDR*)tsf_gEvalState_globalVars, name, varType, data);
|
||||
}
|
||||
|
||||
void tsf_AddVar(const char *name, const char **data) {
|
||||
tsf_AddVarInternal(name, 10, data);
|
||||
}
|
||||
void tsf_AddVar(const char *name, signed int *data) {
|
||||
tsf_AddVarInternal(name, 4, 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);
|
||||
}
|
||||
void tsf_AddVar(const char* name, const char** data) { tsf_AddVarInternal(name, 10, data); }
|
||||
|
||||
void tsf_AddVar(const char* name, signed int* data) { tsf_AddVarInternal(name, 4, 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
|
||||
|
||||
ADDR tsf_AddConsoleFuncInternal(const char *pname, const char *cname,
|
||||
const char *fname, signed int cbtype,
|
||||
const char *usage, signed int mina,
|
||||
ADDR tsf_AddConsoleFuncInternal(
|
||||
const char* pname,
|
||||
const char* cname,
|
||||
const char* fname,
|
||||
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);
|
||||
@@ -185,39 +177,63 @@ ADDR tsf_AddConsoleFuncInternal(const char *pname, const char *cname,
|
||||
return ent;
|
||||
}
|
||||
|
||||
void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
|
||||
tsf_StringCallback sc, const char *usage,
|
||||
signed int mina, signed int maxa) {
|
||||
ADDR ent =
|
||||
tsf_AddConsoleFuncInternal(pname, cname, fname, 1, usage, mina, maxa);
|
||||
void tsf_AddConsoleFunc(
|
||||
const char* pname,
|
||||
const char* cname,
|
||||
const char* fname,
|
||||
tsf_StringCallback 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(
|
||||
const char* pname,
|
||||
const char* cname,
|
||||
const char* fname,
|
||||
tsf_IntCallback ic,
|
||||
const char* usage,
|
||||
signed int mina,
|
||||
signed int maxa) {
|
||||
ADDR ent =
|
||||
tsf_AddConsoleFuncInternal(pname, cname, fname, 2, usage, mina, 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,
|
||||
signed int mina, signed int maxa) {
|
||||
ADDR ent =
|
||||
tsf_AddConsoleFuncInternal(pname, cname, fname, 3, usage, mina, maxa);
|
||||
|
||||
void tsf_AddConsoleFunc(
|
||||
const char* pname,
|
||||
const char* cname,
|
||||
const char* fname,
|
||||
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(
|
||||
const char* pname,
|
||||
const char* cname,
|
||||
const char* fname,
|
||||
tsf_VoidCallback vc,
|
||||
const char* usage,
|
||||
signed int mina,
|
||||
signed int maxa) {
|
||||
ADDR ent =
|
||||
tsf_AddConsoleFuncInternal(pname, cname, fname, 4, usage, mina, 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(
|
||||
const char* pname,
|
||||
const char* cname,
|
||||
const char* fname,
|
||||
tsf_BoolCallback bc,
|
||||
const char* usage,
|
||||
signed int mina,
|
||||
signed int maxa) {
|
||||
ADDR ent =
|
||||
tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa);
|
||||
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa);
|
||||
*(tsf_BoolCallback*)(ent + 40) = bc;
|
||||
}
|
||||
|
||||
@@ -233,42 +249,47 @@ bool tsf_InitInternal() {
|
||||
tsf_BlNamespace__createLocalEntry,
|
||||
"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");
|
||||
BlScanFunctionText(tsf_BlDataChunker__freeBlocks,
|
||||
BlScanFunctionText(
|
||||
tsf_BlDataChunker__freeBlocks,
|
||||
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 51 53 56 57 "
|
||||
"A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B D9 8B 33");
|
||||
BlScanFunctionText(tsf_BlCon__evaluate,
|
||||
BlScanFunctionText(
|
||||
tsf_BlCon__evaluate,
|
||||
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 56 57 A1 ? ? "
|
||||
"? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B 75 10");
|
||||
BlScanFunctionText(tsf_BlCon__executef,
|
||||
BlScanFunctionText(
|
||||
tsf_BlCon__executef,
|
||||
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 55 56 "
|
||||
"8B B4 24 ? ? ? ? 33 C9");
|
||||
BlScanFunctionText(tsf_BlCon__executefSimObj,
|
||||
BlScanFunctionText(
|
||||
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_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_BlSim__findObject_name, "57 8B F9 8A 17");
|
||||
BlScanFunctionText(tsf_BlStringStack__getArgBuffer,
|
||||
BlScanFunctionText(
|
||||
tsf_BlStringStack__getArgBuffer,
|
||||
"55 8B EC 83 E4 F8 8B 0D ? ? ? ? A1 ? ? ? ? 56 57 8B 7D "
|
||||
"08 8D 14 01 03 D7 3B 15 ? ? ? ? 72 2C 8B 0D");
|
||||
BlScanFunctionText(tsf_BlSimObject__getDataField,
|
||||
"51 53 8B D9 55 56 8B 74 24 14");
|
||||
BlScanFunctionText(tsf_BlSimObject__setDataField,
|
||||
BlScanFunctionText(tsf_BlSimObject__getDataField, "51 53 8B D9 55 56 8B 74 24 14");
|
||||
BlScanFunctionText(
|
||||
tsf_BlSimObject__setDataField,
|
||||
"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");
|
||||
|
||||
ADDR BlScanText(tsf_mCacheSequenceLoc,
|
||||
ADDR BlScanText(
|
||||
tsf_mCacheSequenceLoc,
|
||||
"FF 05 ? ? ? ? B9 ? ? ? ? 8B F8 E8 ? ? ? ? 8B 44 24 1C 89 47 "
|
||||
"18 8B 44 24 14");
|
||||
ADDR BlScanText(
|
||||
tsf_mCacheAllocatorLoc,
|
||||
"89 35 ? ? ? ? C7 06 ? ? ? ? A1 ? ? ? ? 68 ? ? ? ? C7 40 ? ? ? ? ? E8 ? "
|
||||
"? ? ? 83 C4 04 8B 4D F4 64 89 0D ? ? ? ? 59 5E 8B E5 5D C3");
|
||||
ADDR BlScanText(tsf_gIdDictionaryLoc,
|
||||
"89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0");
|
||||
ADDR BlScanText(tsf_gEvalState_globalVarsLoc,
|
||||
ADDR BlScanText(tsf_gIdDictionaryLoc, "89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0");
|
||||
ADDR BlScanText(
|
||||
tsf_gEvalState_globalVarsLoc,
|
||||
"B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? 6A 0A 68 ? ? ? ? B9 ? ? ? "
|
||||
"? E8 ? ? ? ? E8 ? ? ? ?");
|
||||
|
||||
|
||||
@@ -42,21 +42,12 @@ void tsf_AddVar(const char *, signed int *);
|
||||
void tsf_AddVar(const char*, float*);
|
||||
void tsf_AddVar(const char*, bool*);
|
||||
|
||||
ADDR tsf_AddConsoleFuncInternal(const char *, const char *, const char *,
|
||||
signed int, const char *, signed int,
|
||||
signed int);
|
||||
void tsf_AddConsoleFunc(const char *, const char *, const char *,
|
||||
tsf_StringCallback, 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);
|
||||
ADDR tsf_AddConsoleFuncInternal(const char*, const char*, const char*, signed int, const char*, signed int, signed int);
|
||||
void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_StringCallback, 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();
|
||||
|
||||
@@ -65,32 +56,20 @@ extern ADDR tsf_mCacheAllocator;
|
||||
extern ADDR tsf_gIdDictionary;
|
||||
extern ADDR tsf_gEvalState_globalVars;
|
||||
|
||||
BlFunctionDefExtern(const char *, __stdcall, tsf_BlStringTable__insert,
|
||||
const char *, bool);
|
||||
BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char *,
|
||||
const char *);
|
||||
BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR,
|
||||
const char *);
|
||||
BlFunctionDefExtern(const char*, __stdcall, tsf_BlStringTable__insert, const char*, bool);
|
||||
BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char*, const char*);
|
||||
BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR, const char*);
|
||||
BlFunctionDefExtern(void, __thiscall, tsf_BlDataChunker__freeBlocks, ADDR);
|
||||
BlFunctionDefExtern(const char *, , tsf_BlCon__evaluate, ADDR, signed int,
|
||||
const char **);
|
||||
BlFunctionDefExtern(const char*, , tsf_BlCon__evaluate, ADDR, signed int, const char**);
|
||||
BlFunctionDefExtern(const char*, , tsf_BlCon__executef, signed int, ...);
|
||||
BlFunctionDefExtern(const char *, , tsf_BlCon__executefSimObj, ADDR *,
|
||||
signed int, ...);
|
||||
BlFunctionDefExtern(const char *, __thiscall, tsf_BlCon__getVariable,
|
||||
const char *);
|
||||
BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR *,
|
||||
const char *, signed int, void *);
|
||||
BlFunctionDefExtern(ADDR *, __thiscall, tsf_BlSim__findObject_name,
|
||||
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);
|
||||
BlFunctionDefExtern(const char*, , tsf_BlCon__executefSimObj, ADDR*, signed int, ...);
|
||||
BlFunctionDefExtern(const char*, __thiscall, tsf_BlCon__getVariable, const char*);
|
||||
BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR*, const char*, signed int, void*);
|
||||
BlFunctionDefExtern(ADDR*, __thiscall, tsf_BlSim__findObject_name, 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
|
||||
|
||||
@@ -114,15 +93,13 @@ BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer,
|
||||
|
||||
#define BlAddFunction tsf_AddConsoleFunc
|
||||
|
||||
#define __22ND_ARGUMENT(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, \
|
||||
a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, ...) \
|
||||
#define __22ND_ARGUMENT( \
|
||||
a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, ...) \
|
||||
a22
|
||||
#define __NUM_LIST(...) \
|
||||
__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)
|
||||
__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)
|
||||
#define BlCall(...) tsf_BlCon__executef(__NUM_LIST(__VA_ARGS__), __VA_ARGS__)
|
||||
#define BlCallObj(obj, ...) \
|
||||
tsf_BlCon__executefSimObj((ADDR *)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__)
|
||||
#define BlCallObj(obj, ...) tsf_BlCon__executefSimObj((ADDR*)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__)
|
||||
|
||||
#define BlFuncsInit() \
|
||||
if (!tsf_InitInternal()) { \
|
||||
|
||||
@@ -27,8 +27,7 @@ void tsh_i_InitScanner() {
|
||||
HMODULE module = GetModuleHandle(NULL);
|
||||
if (module) {
|
||||
MODULEINFO info;
|
||||
GetModuleInformation(GetCurrentProcess(), module, &info,
|
||||
sizeof(MODULEINFO));
|
||||
GetModuleInformation(GetCurrentProcess(), module, &info, sizeof(MODULEINFO));
|
||||
ImageBase = (ADDR)info.lpBaseOfDll;
|
||||
ImageSize = info.SizeOfImage;
|
||||
}
|
||||
@@ -42,8 +41,7 @@ bool tsh_i_CompareData(BYTE *data, BYTE *pattern, char *mask) {
|
||||
return (*mask) == 0;
|
||||
}
|
||||
|
||||
ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE *pattern,
|
||||
char *mask) {
|
||||
ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE* pattern, char* mask) {
|
||||
for (ADDR i = imageBase; i < imageBase + imageSize; i++) {
|
||||
if (tsh_i_CompareData((PBYTE)i, pattern, mask)) {
|
||||
return i;
|
||||
@@ -94,8 +92,7 @@ void tsh_i_PatternTextToCode(char *text, char **opatt, char **omask) {
|
||||
|
||||
// Scan using code-style pattern
|
||||
ADDR tsh_ScanCode(char* pattern, char* mask) {
|
||||
return tsh_i_FindPattern(ImageBase, ImageSize - strlen(mask), (BYTE *)pattern,
|
||||
mask);
|
||||
return tsh_i_FindPattern(ImageBase, ImageSize - strlen(mask), (BYTE*)pattern, mask);
|
||||
}
|
||||
|
||||
// Scan using a text-style pattern
|
||||
@@ -119,8 +116,7 @@ ADDR tsh_ScanText(char *text) {
|
||||
|
||||
void tsh_DeprotectAddress(ADDR length, ADDR location) {
|
||||
DWORD oldProtection;
|
||||
VirtualProtect((void *)location, length, PAGE_EXECUTE_READWRITE,
|
||||
&oldProtection);
|
||||
VirtualProtect((void*)location, length, PAGE_EXECUTE_READWRITE, &oldProtection);
|
||||
// tsh_DeprotectedAddresses[location] = {length, oldProtection};
|
||||
}
|
||||
|
||||
@@ -130,19 +126,13 @@ void tsh_PatchBytes(ADDR length, ADDR location, BYTE *repl) {
|
||||
memcpy((void*)location, (void*)repl, (size_t)length);
|
||||
}
|
||||
|
||||
void tsh_PatchByte(ADDR location, BYTE value) {
|
||||
tsh_PatchBytes(location, 1, &value);
|
||||
}
|
||||
void tsh_PatchByte(ADDR location, BYTE value) { tsh_PatchBytes(location, 1, &value); }
|
||||
|
||||
void tsh_ReplaceInt(ADDR addr, int rval) {
|
||||
tsh_PatchBytes(4, addr, (BYTE *)(&rval));
|
||||
}
|
||||
void tsh_ReplaceInt(ADDR addr, int rval) { tsh_PatchBytes(4, addr, (BYTE*)(&rval)); }
|
||||
|
||||
int tsh_i_CallOffset(ADDR instr, ADDR func) { return func - (instr + 4); }
|
||||
|
||||
void tsh_i_ReplaceCall(ADDR instr, ADDR target) {
|
||||
tsh_ReplaceInt(instr, tsh_i_CallOffset(instr, target));
|
||||
}
|
||||
void tsh_i_ReplaceCall(ADDR instr, ADDR target) { tsh_ReplaceInt(instr, tsh_i_CallOffset(instr, target)); }
|
||||
|
||||
void tsh_i_PatchCopy(ADDR dest, ADDR src, unsigned int len) {
|
||||
for (unsigned int i = 0; i < len; i++) {
|
||||
@@ -162,8 +152,7 @@ void tsh_UnhookFunction(ADDR victim, BYTE *origbytes) {
|
||||
tsh_i_PatchCopy(victim, (ADDR)origbytes, 6); // restore old data
|
||||
}
|
||||
|
||||
int tsh_PatchAllMatchesCode(ADDR len, char *patt, char *mask, char *replace,
|
||||
bool debugprint) {
|
||||
int tsh_PatchAllMatchesCode(ADDR len, char* patt, char* mask, char* replace, bool debugprint) {
|
||||
int numpatched = 0;
|
||||
for (ADDR i = ImageBase; i < ImageBase + ImageSize - len; i++) {
|
||||
if (tsh_i_CompareData((BYTE*)i, (BYTE*)patt, mask)) {
|
||||
@@ -180,8 +169,7 @@ int tsh_PatchAllMatchesCode(ADDR len, char *patt, char *mask, char *replace,
|
||||
return numpatched;
|
||||
}
|
||||
|
||||
int tsh_PatchAllMatchesHex(ADDR len, char *text, char *replace,
|
||||
bool debugprint) {
|
||||
int tsh_PatchAllMatchesHex(ADDR len, char* text, char* replace, bool debugprint) {
|
||||
char* patt;
|
||||
char* mask;
|
||||
tsh_i_PatternTextToCode(text, &patt, &mask);
|
||||
@@ -199,9 +187,7 @@ int tsh_PatchAllMatchesHex(ADDR len, char *text, char *replace,
|
||||
bool tsh_InitInternal() {
|
||||
tsh_i_InitScanner();
|
||||
|
||||
BlScanFunctionText(
|
||||
tsh_BlPrintf,
|
||||
"8D 44 24 08 33 D2 50 FF 74 24 08 33 C9 E8 ? ? ? ? 83 C4 08 C3");
|
||||
BlScanFunctionText(tsh_BlPrintf, "8D 44 24 08 33 D2 50 FF 74 24 08 33 C9 E8 ? ? ? ? 83 C4 08 C3");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -55,8 +55,7 @@ void tsh_PatchInt(ADDR, int);
|
||||
return false; \
|
||||
} else { \
|
||||
if (tsh_DEBUGPRINT) \
|
||||
BlPrintf("RedoBlHooks | Found function " #target " at %08x", \
|
||||
(int)target); \
|
||||
BlPrintf("RedoBlHooks | Found function " #target " at %08x", (int)target); \
|
||||
}
|
||||
#define BlScanFunctionText(target, text) \
|
||||
target = (tsh_##target##FnT)tsh_ScanText((char*)text); \
|
||||
@@ -65,8 +64,7 @@ void tsh_PatchInt(ADDR, int);
|
||||
return false; \
|
||||
} else { \
|
||||
if (tsh_DEBUGPRINT) \
|
||||
BlPrintf("RedoBlHooks | Found function " #target " at %08x", \
|
||||
(int)target); \
|
||||
BlPrintf("RedoBlHooks | Found function " #target " at %08x", (int)target); \
|
||||
}
|
||||
#define BlScanCode(target, patt, mask) \
|
||||
target = tsh_ScanCode((char*)patt, (char*)mask); \
|
||||
@@ -90,13 +88,8 @@ void tsh_PatchInt(ADDR, int);
|
||||
// Use in code to define the data and functions for hooking a function
|
||||
#define BlFunctionHookDef(func) \
|
||||
BYTE tsh_BlFunctionHook##func##Data[6]; \
|
||||
void func##HookOn() { \
|
||||
tsh_HookFunction((ADDR)func, (ADDR)func##Hook, \
|
||||
tsh_BlFunctionHook##func##Data); \
|
||||
} \
|
||||
void func##HookOff() { \
|
||||
tsh_UnhookFunction((ADDR)func, tsh_BlFunctionHook##func##Data); \
|
||||
}
|
||||
void func##HookOn() { tsh_HookFunction((ADDR)func, (ADDR)func##Hook, tsh_BlFunctionHook##func##Data); } \
|
||||
void func##HookOff() { tsh_UnhookFunction((ADDR)func, tsh_BlFunctionHook##func##Data); }
|
||||
// Use in code to initialize the hook once
|
||||
#define BlFunctionHookInit(func) \
|
||||
tsh_DeprotectAddress(6, (ADDR)func); \
|
||||
@@ -104,17 +97,14 @@ void tsh_PatchInt(ADDR, int);
|
||||
|
||||
// Replace all matches of the pattern with the given byte string
|
||||
#define BlPatchAllMatchesCode(len, patt, mask, repl) \
|
||||
tsh_PatchAllMatchesCode((ADDR)len, (char *)patt, (char *)mask, (char *)repl, \
|
||||
tsh_DEBUGPRINT);
|
||||
tsh_PatchAllMatchesCode((ADDR)len, (char*)patt, (char*)mask, (char*)repl, tsh_DEBUGPRINT);
|
||||
#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
|
||||
#define BlPatchByte(addr, byte) tsh_PatchByte((ADDR)addr, (BYTE)byte);
|
||||
// Deprotect and replace a byte string
|
||||
#define BlPatchBytes(len, addr, repl) \
|
||||
tsh_PatchBytes((ADDR)len, (ADDR)addr, (BYTE *)repl);
|
||||
#define BlPatchBytes(len, addr, repl) tsh_PatchBytes((ADDR)len, (ADDR)addr, (BYTE*)repl);
|
||||
|
||||
// BlPrintf(char* format, ...)
|
||||
#define BlPrintf(...) \
|
||||
|
||||
@@ -65,9 +65,8 @@ bool init() {
|
||||
#endif
|
||||
|
||||
// Expose Lua API to TS
|
||||
BlAddFunction(NULL, NULL, "_bllua_luacall", bll_ts_luacall,
|
||||
"LuaCall(name, ...) - Call Lua function and return result", 2,
|
||||
20);
|
||||
BlAddFunction(
|
||||
NULL, NULL, "_bllua_luacall", bll_ts_luacall, "LuaCall(name, ...) - Call Lua function and return result", 2, 20);
|
||||
BlEval(bll_fileTsEnv);
|
||||
|
||||
// Load utilities
|
||||
|
||||
@@ -21,6 +21,7 @@ int bll_error_handler(lua_State *L) {
|
||||
lua_pcall(L, 1, 1, 0);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int bll_pcall(lua_State* L, int nargs, int nret) {
|
||||
// calculate stack position for message handler
|
||||
int hpos = lua_gettop(L) - nargs;
|
||||
@@ -55,6 +56,7 @@ bool bll_LuaEval(lua_State *L, const char *str) {
|
||||
// Convert a Lua stack entry into a string for providing to TS
|
||||
// Use static buffer to avoid excessive malloc
|
||||
char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX];
|
||||
|
||||
bool bll_toarg(lua_State* L, char* buf, int i, bool err) {
|
||||
if (lua_isstring(L, i)) {
|
||||
const char* str = lua_tostring(L, i);
|
||||
|
||||
149
src/lualibts.cpp
149
src/lualibts.cpp
@@ -9,8 +9,7 @@
|
||||
#include "lua.h"
|
||||
#include "luainterp.hpp"
|
||||
|
||||
int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
|
||||
int ofs) {
|
||||
int bll_TsCall(lua_State* L, const char* oname, const char* fname, int argc, int ofs) {
|
||||
ADDR obj = (ADDR)NULL;
|
||||
if (oname) {
|
||||
obj = BlObject(oname);
|
||||
@@ -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]);
|
||||
break;
|
||||
case 7:
|
||||
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
|
||||
argv[5]);
|
||||
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
|
||||
break;
|
||||
case 8:
|
||||
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
|
||||
argv[5], argv[6]);
|
||||
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]);
|
||||
break;
|
||||
case 9:
|
||||
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
|
||||
argv[5], argv[6], argv[7]);
|
||||
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]);
|
||||
break;
|
||||
case 10:
|
||||
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
|
||||
argv[5], argv[6], argv[7], argv[8]);
|
||||
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]);
|
||||
break;
|
||||
case 11:
|
||||
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
|
||||
argv[5], argv[6], argv[7], argv[8], argv[9]);
|
||||
res = BlCallObj(
|
||||
obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]);
|
||||
break;
|
||||
case 12:
|
||||
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
|
||||
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
|
||||
res = BlCallObj(
|
||||
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;
|
||||
case 13:
|
||||
res = BlCallObj(obj, 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]);
|
||||
res = BlCallObj(
|
||||
obj, 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;
|
||||
case 14:
|
||||
res = BlCallObj(obj, 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], argv[12]);
|
||||
res = BlCallObj(
|
||||
obj, 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], argv[12]);
|
||||
break;
|
||||
case 15:
|
||||
res = BlCallObj(obj, 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], argv[12], argv[13]);
|
||||
res = BlCallObj(
|
||||
obj, 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], argv[12], argv[13]);
|
||||
break;
|
||||
case 16:
|
||||
res = BlCallObj(obj, 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], argv[12], argv[13], argv[14]);
|
||||
res = BlCallObj(
|
||||
obj, 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], argv[12], argv[13], argv[14]);
|
||||
break;
|
||||
case 17:
|
||||
res = BlCallObj(obj, 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], argv[12], argv[13], argv[14], argv[15]);
|
||||
res = BlCallObj(
|
||||
obj, 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], argv[12], argv[13], argv[14], argv[15]);
|
||||
break;
|
||||
case 18:
|
||||
res =
|
||||
BlCallObj(obj, 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], argv[12], argv[13], argv[14], argv[15], argv[16]);
|
||||
res = BlCallObj(
|
||||
obj, 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], argv[12], argv[13], argv[14], argv[15], argv[16]);
|
||||
break;
|
||||
case 19:
|
||||
res = BlCallObj(obj, 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], argv[12], argv[13], argv[14], argv[15],
|
||||
argv[16], argv[17]);
|
||||
res = BlCallObj(
|
||||
obj, 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], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
|
||||
break;
|
||||
case 20:
|
||||
res = BlCallObj(obj, 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], argv[12], argv[13], argv[14], argv[15],
|
||||
argv[16], argv[17], argv[18]);
|
||||
res = BlCallObj(
|
||||
obj, 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], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]);
|
||||
break;
|
||||
default:
|
||||
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]);
|
||||
break;
|
||||
case 7:
|
||||
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
|
||||
argv[6]);
|
||||
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]);
|
||||
break;
|
||||
case 8:
|
||||
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
|
||||
argv[6], argv[7]);
|
||||
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]);
|
||||
break;
|
||||
case 9:
|
||||
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
|
||||
argv[6], argv[7], argv[8]);
|
||||
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]);
|
||||
break;
|
||||
case 10:
|
||||
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
|
||||
argv[6], argv[7], argv[8], argv[9]);
|
||||
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]);
|
||||
break;
|
||||
case 11:
|
||||
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
|
||||
argv[6], argv[7], argv[8], argv[9], argv[10]);
|
||||
res = BlCall(
|
||||
fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
|
||||
break;
|
||||
case 12:
|
||||
res = BlCall(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]);
|
||||
res = BlCall(
|
||||
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;
|
||||
case 13:
|
||||
res = BlCall(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],
|
||||
argv[12]);
|
||||
res = BlCall(
|
||||
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], argv[12]);
|
||||
break;
|
||||
case 14:
|
||||
res = BlCall(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],
|
||||
argv[12], argv[13]);
|
||||
res = BlCall(
|
||||
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], argv[12], argv[13]);
|
||||
break;
|
||||
case 15:
|
||||
res = BlCall(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],
|
||||
argv[12], argv[13], argv[14]);
|
||||
res = BlCall(
|
||||
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], argv[12], argv[13], argv[14]);
|
||||
break;
|
||||
case 16:
|
||||
res = BlCall(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],
|
||||
argv[12], argv[13], argv[14], argv[15]);
|
||||
res = BlCall(
|
||||
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], argv[12], argv[13], argv[14], argv[15]);
|
||||
break;
|
||||
case 17:
|
||||
res = BlCall(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],
|
||||
argv[12], argv[13], argv[14], argv[15], argv[16]);
|
||||
res = BlCall(
|
||||
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], argv[12], argv[13], argv[14], argv[15], argv[16]);
|
||||
break;
|
||||
case 18:
|
||||
res = BlCall(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],
|
||||
argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
|
||||
res = BlCall(
|
||||
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], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
|
||||
break;
|
||||
case 19:
|
||||
res = BlCall(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],
|
||||
argv[12], argv[13], argv[14], argv[15], argv[16], argv[17],
|
||||
argv[18]);
|
||||
res = BlCall(
|
||||
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], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]);
|
||||
break;
|
||||
default:
|
||||
res = "";
|
||||
@@ -219,6 +208,7 @@ int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Lua lib function: ts.call
|
||||
int bll_lua_tscall(lua_State* L) {
|
||||
int argc = lua_gettop(L) - 1; // number of arguments after function name
|
||||
@@ -229,13 +219,12 @@ int bll_lua_tscall(lua_State *L) {
|
||||
|
||||
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?
|
||||
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");
|
||||
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);
|
||||
@@ -265,6 +254,7 @@ int bll_lua_tsgetfield(lua_State *L) {
|
||||
lua_pushstring(L, val);
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Lua lib function: ts.setfield
|
||||
int bll_lua_tssetfield(lua_State* L) {
|
||||
const char* oname = luaL_checkstring(L, 1);
|
||||
@@ -301,4 +291,5 @@ const luaL_Reg bll_lua_reg[] = {
|
||||
{"setfield", bll_lua_tssetfield}, {"eval", bll_lua_tseval},
|
||||
{"echo", bll_lua_tsecho}, {NULL, NULL},
|
||||
};
|
||||
|
||||
void llibbl_init(lua_State* L) { luaL_register(L, "_bllua_ts", bll_lua_reg); }
|
||||
|
||||
Reference in New Issue
Block a user