diff --git a/Math/Matrix/VectorFloat32.h b/Math/Matrix/VectorFloat32.h index 7ca4a61..a229448 100644 --- a/Math/Matrix/VectorFloat32.h +++ b/Math/Matrix/VectorFloat32.h @@ -10,6 +10,8 @@ #ifndef MATH_MATRIX_VECTORFLOAT32_H #define MATH_MATRIX_VECTORFLOAT32_H +#include "../Stdlib/SIMD/SIMD_F32.h" + namespace Math::Matrix::VectorFloat32 { struct v3_f32_4_simd { diff --git a/Resources/lua/lib/x64/lua54.lib b/Resources/lua/lib/x64/lua54.lib new file mode 100644 index 0000000..1876b94 Binary files /dev/null and b/Resources/lua/lib/x64/lua54.lib differ diff --git a/Resources/lua/src/lauxlib.h b/Resources/lua/src/lauxlib.h new file mode 100644 index 0000000..59fef6a --- /dev/null +++ b/Resources/lua/src/lauxlib.h @@ -0,0 +1,276 @@ +/* +** $Id: lauxlib.h $ +** Auxiliary functions for building Lua libraries +** See Copyright Notice in lua.h +*/ + + +#ifndef lauxlib_h +#define lauxlib_h + + +#include +#include + +#include "lua.h" + + +/* global table */ +#define LUA_GNAME "_G" + + +typedef struct luaL_Buffer luaL_Buffer; + + +/* extra error code for 'luaL_loadfilex' */ +#define LUA_ERRFILE (LUA_ERRERR+1) + + +/* key, in the registry, for table of loaded modules */ +#define LUA_LOADED_TABLE "_LOADED" + + +/* key, in the registry, for table of preloaded loaders */ +#define LUA_PRELOAD_TABLE "_PRELOAD" + + +typedef struct luaL_Reg { + const char *name; + lua_CFunction func; +} luaL_Reg; + + +#define LUAL_NUMSIZES (sizeof(lua_Integer)*16 + sizeof(lua_Number)) + +LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver, size_t sz); +#define luaL_checkversion(L) \ + luaL_checkversion_(L, LUA_VERSION_NUM, LUAL_NUMSIZES) + +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 const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len); +LUALIB_API int (luaL_argerror) (lua_State *L, int arg, const char *extramsg); +LUALIB_API int (luaL_typeerror) (lua_State *L, int arg, const char *tname); +LUALIB_API const char *(luaL_checklstring) (lua_State *L, int arg, + size_t *l); +LUALIB_API const char *(luaL_optlstring) (lua_State *L, int arg, + const char *def, size_t *l); +LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int arg); +LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int arg, lua_Number def); + +LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int arg); +LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int arg, + 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 arg, int t); +LUALIB_API void (luaL_checkany) (lua_State *L, int arg); + +LUALIB_API int (luaL_newmetatable) (lua_State *L, const char *tname); +LUALIB_API void (luaL_setmetatable) (lua_State *L, const char *tname); +LUALIB_API void *(luaL_testudata) (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 int (luaL_error) (lua_State *L, const char *fmt, ...); + +LUALIB_API int (luaL_checkoption) (lua_State *L, int arg, const char *def, + const char *const lst[]); + +LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname); +LUALIB_API int (luaL_execresult) (lua_State *L, int stat); + + +/* predefined references */ +#define LUA_NOREF (-2) +#define LUA_REFNIL (-1) + +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_loadfilex) (lua_State *L, const char *filename, + const char *mode); + +#define luaL_loadfile(L,f) luaL_loadfilex(L,f,NULL) + +LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, + const char *name, const char *mode); +LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s); + +LUALIB_API lua_State *(luaL_newstate) (void); + +LUALIB_API lua_Integer (luaL_len) (lua_State *L, int idx); + +LUALIB_API void luaL_addgsub (luaL_Buffer *b, 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 void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup); + +LUALIB_API int (luaL_getsubtable) (lua_State *L, int idx, const char *fname); + +LUALIB_API void (luaL_traceback) (lua_State *L, lua_State *L1, + const char *msg, int level); + +LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname, + lua_CFunction openf, int glb); + +/* +** =============================================================== +** some useful macros +** =============================================================== +*/ + + +#define luaL_newlibtable(L,l) \ + lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1) + +#define luaL_newlib(L,l) \ + (luaL_checkversion(L), luaL_newlibtable(L,l), luaL_setfuncs(L,l,0)) + +#define luaL_argcheck(L, cond,arg,extramsg) \ + ((void)((cond) || luaL_argerror(L, (arg), (extramsg)))) + +#define luaL_argexpected(L,cond,arg,tname) \ + ((void)((cond) || luaL_typeerror(L, (arg), (tname)))) + +#define luaL_checkstring(L,n) (luaL_checklstring(L, (n), NULL)) +#define luaL_optstring(L,n,d) (luaL_optlstring(L, (n), (d), NULL)) + +#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_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))) + +#define luaL_loadbuffer(L,s,sz,n) luaL_loadbufferx(L,s,sz,n,NULL) + + +/* push the value used to represent failure/error */ +#define luaL_pushfail(L) lua_pushnil(L) + + +/* +** {====================================================== +** Generic Buffer manipulation +** ======================================================= +*/ + +struct luaL_Buffer { + char *b; /* buffer address */ + size_t size; /* buffer size */ + size_t n; /* number of characters in buffer */ + lua_State *L; + union { + LUAI_MAXALIGN; /* ensure maximum alignment for buffer */ + char b[LUAL_BUFFERSIZE]; /* initial buffer */ + } init; +}; + + +#define luaL_bufflen(bf) ((bf)->n) +#define luaL_buffaddr(bf) ((bf)->b) + + +#define luaL_addchar(B,c) \ + ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \ + ((B)->b[(B)->n++] = (c))) + +#define luaL_addsize(B,s) ((B)->n += (s)) + +#define luaL_buffsub(B,s) ((B)->n -= (s)) + +LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B); +LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz); +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_addvalue) (luaL_Buffer *B); +LUALIB_API void (luaL_pushresult) (luaL_Buffer *B); +LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz); +LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz); + +#define luaL_prepbuffer(B) luaL_prepbuffsize(B, LUAL_BUFFERSIZE) + +/* }====================================================== */ + + + +/* +** {====================================================== +** File handles for IO library +** ======================================================= +*/ + +/* +** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and +** initial structure 'luaL_Stream' (it may contain other fields +** after that initial structure). +*/ + +#define LUA_FILEHANDLE "FILE*" + + +typedef struct luaL_Stream { + FILE *f; /* stream (NULL for incompletely created streams) */ + lua_CFunction closef; /* to close stream (NULL for closed streams) */ +} luaL_Stream; + +/* }====================================================== */ + +/* +** {================================================================== +** "Abstraction Layer" for basic report of messages and errors +** =================================================================== +*/ + +/* print a string */ +#if !defined(lua_writestring) +#define lua_writestring(s,l) fwrite((s), sizeof(char), (l), stdout) +#endif + +/* print a newline and flush the output */ +#if !defined(lua_writeline) +#define lua_writeline() (lua_writestring("\n", 1), fflush(stdout)) +#endif + +/* print an error message */ +#if !defined(lua_writestringerror) +#define lua_writestringerror(s,p) \ + (fprintf(stderr, (s), (p)), fflush(stderr)) +#endif + +/* }================================================================== */ + + +/* +** {============================================================ +** Compatibility with deprecated conversions +** ============================================================= +*/ +#if defined(LUA_COMPAT_APIINTCASTS) + +#define luaL_checkunsigned(L,a) ((lua_Unsigned)luaL_checkinteger(L,a)) +#define luaL_optunsigned(L,a,d) \ + ((lua_Unsigned)luaL_optinteger(L,a,(lua_Integer)(d))) + +#define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n))) +#define luaL_optint(L,n,d) ((int)luaL_optinteger(L, (n), (d))) + +#define luaL_checklong(L,n) ((long)luaL_checkinteger(L, (n))) +#define luaL_optlong(L,n,d) ((long)luaL_optinteger(L, (n), (d))) + +#endif +/* }============================================================ */ + + + +#endif + + diff --git a/Resources/lua/src/lua.h b/Resources/lua/src/lua.h new file mode 100644 index 0000000..c9d64d7 --- /dev/null +++ b/Resources/lua/src/lua.h @@ -0,0 +1,517 @@ +/* +** $Id: lua.h $ +** Lua - A Scripting Language +** Lua.org, PUC-Rio, Brazil (http://www.lua.org) +** See Copyright Notice at the end of this file +*/ + + +#ifndef lua_h +#define lua_h + +#include +#include + + +#include "luaconf.h" + + +#define LUA_VERSION_MAJOR "5" +#define LUA_VERSION_MINOR "4" +#define LUA_VERSION_RELEASE "2" + +#define LUA_VERSION_NUM 504 +#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 0) + +#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR +#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE +#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2020 Lua.org, PUC-Rio" +#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes" + + +/* mark for precompiled code ('Lua') */ +#define LUA_SIGNATURE "\x1bLua" + +/* option for multiple returns in 'lua_pcall' and 'lua_call' */ +#define LUA_MULTRET (-1) + + +/* +** Pseudo-indices +** (-LUAI_MAXSTACK is the minimum valid index; we keep some free empty +** space after that to help overflow detection) +*/ +#define LUA_REGISTRYINDEX (-LUAI_MAXSTACK - 1000) +#define lua_upvalueindex(i) (LUA_REGISTRYINDEX - (i)) + + +/* thread status */ +#define LUA_OK 0 +#define LUA_YIELD 1 +#define LUA_ERRRUN 2 +#define LUA_ERRSYNTAX 3 +#define LUA_ERRMEM 4 +#define LUA_ERRERR 5 + + +typedef struct lua_State lua_State; + + +/* +** basic types +*/ +#define LUA_TNONE (-1) + +#define LUA_TNIL 0 +#define LUA_TBOOLEAN 1 +#define LUA_TLIGHTUSERDATA 2 +#define LUA_TNUMBER 3 +#define LUA_TSTRING 4 +#define LUA_TTABLE 5 +#define LUA_TFUNCTION 6 +#define LUA_TUSERDATA 7 +#define LUA_TTHREAD 8 + +#define LUA_NUMTYPES 9 + + + +/* minimum Lua stack available to a C function */ +#define LUA_MINSTACK 20 + + +/* predefined values in the registry */ +#define LUA_RIDX_MAINTHREAD 1 +#define LUA_RIDX_GLOBALS 2 +#define LUA_RIDX_LAST LUA_RIDX_GLOBALS + + +/* type of numbers in Lua */ +typedef LUA_NUMBER lua_Number; + + +/* type for integer functions */ +typedef LUA_INTEGER lua_Integer; + +/* unsigned integer type */ +typedef LUA_UNSIGNED lua_Unsigned; + +/* type for continuation-function contexts */ +typedef LUA_KCONTEXT lua_KContext; + + +/* +** Type for C functions registered with Lua +*/ +typedef int (*lua_CFunction) (lua_State *L); + +/* +** Type for continuation functions +*/ +typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx); + + +/* +** Type for functions that read/write blocks when loading/dumping Lua chunks +*/ +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); + + +/* +** Type for memory-allocation functions +*/ +typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize); + + +/* +** Type for warning functions +*/ +typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont); + + + + +/* +** generic extra include file +*/ +#if defined(LUA_USER_H) +#include LUA_USER_H +#endif + + +/* +** RCS ident string +*/ +extern const char lua_ident[]; + + +/* +** state manipulation +*/ +LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud); +LUA_API void (lua_close) (lua_State *L); +LUA_API lua_State *(lua_newthread) (lua_State *L); +LUA_API int (lua_resetthread) (lua_State *L); + +LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf); + + +LUA_API lua_Number (lua_version) (lua_State *L); + + +/* +** basic stack manipulation +*/ +LUA_API int (lua_absindex) (lua_State *L, int idx); +LUA_API int (lua_gettop) (lua_State *L); +LUA_API void (lua_settop) (lua_State *L, int idx); +LUA_API void (lua_pushvalue) (lua_State *L, int idx); +LUA_API void (lua_rotate) (lua_State *L, int idx, int n); +LUA_API void (lua_copy) (lua_State *L, int fromidx, int toidx); +LUA_API int (lua_checkstack) (lua_State *L, int n); + +LUA_API void (lua_xmove) (lua_State *from, lua_State *to, int n); + + +/* +** access functions (stack -> C) +*/ + +LUA_API int (lua_isnumber) (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_isinteger) (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 const char *(lua_typename) (lua_State *L, int tp); + +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 int (lua_toboolean) (lua_State *L, int idx); +LUA_API const char *(lua_tolstring) (lua_State *L, int idx, size_t *len); +LUA_API lua_Unsigned (lua_rawlen) (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 lua_State *(lua_tothread) (lua_State *L, int idx); +LUA_API const void *(lua_topointer) (lua_State *L, int idx); + + +/* +** Comparison and arithmetic functions +*/ + +#define LUA_OPADD 0 /* ORDER TM, ORDER OP */ +#define LUA_OPSUB 1 +#define LUA_OPMUL 2 +#define LUA_OPMOD 3 +#define LUA_OPPOW 4 +#define LUA_OPDIV 5 +#define LUA_OPIDIV 6 +#define LUA_OPBAND 7 +#define LUA_OPBOR 8 +#define LUA_OPBXOR 9 +#define LUA_OPSHL 10 +#define LUA_OPSHR 11 +#define LUA_OPUNM 12 +#define LUA_OPBNOT 13 + +LUA_API void (lua_arith) (lua_State *L, int op); + +#define LUA_OPEQ 0 +#define LUA_OPLT 1 +#define LUA_OPLE 2 + +LUA_API int (lua_rawequal) (lua_State *L, int idx1, int idx2); +LUA_API int (lua_compare) (lua_State *L, int idx1, int idx2, int op); + + +/* +** push functions (C -> stack) +*/ +LUA_API void (lua_pushnil) (lua_State *L); +LUA_API void (lua_pushnumber) (lua_State *L, lua_Number n); +LUA_API void (lua_pushinteger) (lua_State *L, lua_Integer n); +LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t len); +LUA_API const char *(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_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); +LUA_API void (lua_pushlightuserdata) (lua_State *L, void *p); +LUA_API int (lua_pushthread) (lua_State *L); + + +/* +** get functions (Lua -> stack) +*/ +LUA_API int (lua_getglobal) (lua_State *L, const char *name); +LUA_API int (lua_gettable) (lua_State *L, int idx); +LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k); +LUA_API int (lua_geti) (lua_State *L, int idx, lua_Integer n); +LUA_API int (lua_rawget) (lua_State *L, int idx); +LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n); +LUA_API int (lua_rawgetp) (lua_State *L, int idx, const void *p); + +LUA_API void (lua_createtable) (lua_State *L, int narr, int nrec); +LUA_API void *(lua_newuserdatauv) (lua_State *L, size_t sz, int nuvalue); +LUA_API int (lua_getmetatable) (lua_State *L, int objindex); +LUA_API int (lua_getiuservalue) (lua_State *L, int idx, int n); + + +/* +** set functions (stack -> Lua) +*/ +LUA_API void (lua_setglobal) (lua_State *L, const char *name); +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_seti) (lua_State *L, int idx, lua_Integer n); +LUA_API void (lua_rawset) (lua_State *L, int idx); +LUA_API void (lua_rawseti) (lua_State *L, int idx, lua_Integer n); +LUA_API void (lua_rawsetp) (lua_State *L, int idx, const void *p); +LUA_API int (lua_setmetatable) (lua_State *L, int objindex); +LUA_API int (lua_setiuservalue) (lua_State *L, int idx, int n); + + +/* +** 'load' and 'call' functions (load and run Lua code) +*/ +LUA_API void (lua_callk) (lua_State *L, int nargs, int nresults, + lua_KContext ctx, lua_KFunction k); +#define lua_call(L,n,r) lua_callk(L, (n), (r), 0, NULL) + +LUA_API int (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc, + lua_KContext ctx, lua_KFunction k); +#define lua_pcall(L,n,r,f) lua_pcallk(L, (n), (r), (f), 0, NULL) + +LUA_API int (lua_load) (lua_State *L, lua_Reader reader, void *dt, + const char *chunkname, const char *mode); + +LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data, int strip); + + +/* +** coroutine functions +*/ +LUA_API int (lua_yieldk) (lua_State *L, int nresults, lua_KContext ctx, + lua_KFunction k); +LUA_API int (lua_resume) (lua_State *L, lua_State *from, int narg, + int *nres); +LUA_API int (lua_status) (lua_State *L); +LUA_API int (lua_isyieldable) (lua_State *L); + +#define lua_yield(L,n) lua_yieldk(L, (n), 0, NULL) + + +/* +** Warning-related functions +*/ +LUA_API void (lua_setwarnf) (lua_State *L, lua_WarnFunction f, void *ud); +LUA_API void (lua_warning) (lua_State *L, const char *msg, int tocont); + + +/* +** garbage-collection function and options +*/ + +#define LUA_GCSTOP 0 +#define LUA_GCRESTART 1 +#define LUA_GCCOLLECT 2 +#define LUA_GCCOUNT 3 +#define LUA_GCCOUNTB 4 +#define LUA_GCSTEP 5 +#define LUA_GCSETPAUSE 6 +#define LUA_GCSETSTEPMUL 7 +#define LUA_GCISRUNNING 9 +#define LUA_GCGEN 10 +#define LUA_GCINC 11 + +LUA_API int (lua_gc) (lua_State *L, int what, ...); + + +/* +** miscellaneous functions +*/ + +LUA_API int (lua_error) (lua_State *L); + +LUA_API int (lua_next) (lua_State *L, int idx); + +LUA_API void (lua_concat) (lua_State *L, int n); +LUA_API void (lua_len) (lua_State *L, int idx); + +LUA_API size_t (lua_stringtonumber) (lua_State *L, const char *s); + +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_toclose) (lua_State *L, int idx); + + +/* +** {============================================================== +** some useful macros +** =============================================================== +*/ + +#define lua_getextraspace(L) ((void *)((char *)(L) - LUA_EXTRASPACE)) + +#define lua_tonumber(L,i) lua_tonumberx(L,(i),NULL) +#define lua_tointeger(L,i) lua_tointegerx(L,(i),NULL) + +#define lua_pop(L,n) lua_settop(L, -(n)-1) + +#define lua_newtable(L) lua_createtable(L, 0, 0) + +#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n))) + +#define lua_pushcfunction(L,f) lua_pushcclosure(L, (f), 0) + +#define lua_isfunction(L,n) (lua_type(L, (n)) == LUA_TFUNCTION) +#define lua_istable(L,n) (lua_type(L, (n)) == LUA_TTABLE) +#define lua_islightuserdata(L,n) (lua_type(L, (n)) == LUA_TLIGHTUSERDATA) +#define lua_isnil(L,n) (lua_type(L, (n)) == LUA_TNIL) +#define lua_isboolean(L,n) (lua_type(L, (n)) == LUA_TBOOLEAN) +#define lua_isthread(L,n) (lua_type(L, (n)) == LUA_TTHREAD) +#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_pushstring(L, "" s) + +#define lua_pushglobaltable(L) \ + ((void)lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS)) + +#define lua_tostring(L,i) lua_tolstring(L, (i), NULL) + + +#define lua_insert(L,idx) lua_rotate(L, (idx), 1) + +#define lua_remove(L,idx) (lua_rotate(L, (idx), -1), lua_pop(L, 1)) + +#define lua_replace(L,idx) (lua_copy(L, -1, (idx)), lua_pop(L, 1)) + +/* }============================================================== */ + + +/* +** {============================================================== +** compatibility macros +** =============================================================== +*/ +#if defined(LUA_COMPAT_APIINTCASTS) + +#define lua_pushunsigned(L,n) lua_pushinteger(L, (lua_Integer)(n)) +#define lua_tounsignedx(L,i,is) ((lua_Unsigned)lua_tointegerx(L,i,is)) +#define lua_tounsigned(L,i) lua_tounsignedx(L,(i),NULL) + +#endif + +#define lua_newuserdata(L,s) lua_newuserdatauv(L,s,1) +#define lua_getuservalue(L,idx) lua_getiuservalue(L,idx,1) +#define lua_setuservalue(L,idx) lua_setiuservalue(L,idx,1) + +#define LUA_NUMTAGS LUA_NUMTYPES + +/* }============================================================== */ + +/* +** {====================================================================== +** Debug API +** ======================================================================= +*/ + + +/* +** Event codes +*/ +#define LUA_HOOKCALL 0 +#define LUA_HOOKRET 1 +#define LUA_HOOKLINE 2 +#define LUA_HOOKCOUNT 3 +#define LUA_HOOKTAILCALL 4 + + +/* +** Event masks +*/ +#define LUA_MASKCALL (1 << LUA_HOOKCALL) +#define LUA_MASKRET (1 << LUA_HOOKRET) +#define LUA_MASKLINE (1 << LUA_HOOKLINE) +#define LUA_MASKCOUNT (1 << LUA_HOOKCOUNT) + +typedef struct lua_Debug lua_Debug; /* activation record */ + + +/* Functions to be called by the debugger in specific events */ +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_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_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_setupvalue) (lua_State *L, int funcindex, int n); + +LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n); +LUA_API void (lua_upvaluejoin) (lua_State *L, int fidx1, int n1, + int fidx2, int n2); + +LUA_API void (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count); +LUA_API lua_Hook (lua_gethook) (lua_State *L); +LUA_API int (lua_gethookmask) (lua_State *L); +LUA_API int (lua_gethookcount) (lua_State *L); + +LUA_API int (lua_setcstacklimit) (lua_State *L, unsigned int limit); + +struct lua_Debug { + int event; + const char *name; /* (n) */ + const char *namewhat; /* (n) 'global', 'local', 'field', 'method' */ + const char *what; /* (S) 'Lua', 'C', 'main', 'tail' */ + const char *source; /* (S) */ + size_t srclen; /* (S) */ + int currentline; /* (l) */ + int linedefined; /* (S) */ + int lastlinedefined; /* (S) */ + unsigned char nups; /* (u) number of upvalues */ + unsigned char nparams;/* (u) number of parameters */ + char isvararg; /* (u) */ + char istailcall; /* (t) */ + unsigned short ftransfer; /* (r) index of first value transferred */ + unsigned short ntransfer; /* (r) number of transferred values */ + char short_src[LUA_IDSIZE]; /* (S) */ + /* private part */ + struct CallInfo *i_ci; /* active function */ +}; + +/* }====================================================================== */ + + +/****************************************************************************** +* Copyright (C) 1994-2020 Lua.org, PUC-Rio. +* +* Permission is hereby granted, free of charge, to any person obtaining +* a copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sublicense, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* The above copyright notice and this permission notice shall be +* included in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +******************************************************************************/ + + +#endif diff --git a/Resources/lua/src/lua.hpp b/Resources/lua/src/lua.hpp new file mode 100644 index 0000000..ec417f5 --- /dev/null +++ b/Resources/lua/src/lua.hpp @@ -0,0 +1,9 @@ +// lua.hpp +// Lua header files for C++ +// <> not supplied automatically because Lua also compiles as C++ + +extern "C" { +#include "lua.h" +#include "lualib.h" +#include "lauxlib.h" +} diff --git a/Resources/lua/src/luaconf.h b/Resources/lua/src/luaconf.h new file mode 100644 index 0000000..3ad294e --- /dev/null +++ b/Resources/lua/src/luaconf.h @@ -0,0 +1,763 @@ +/* +** $Id: luaconf.h $ +** Configuration file for Lua +** See Copyright Notice in lua.h +*/ + + +#ifndef luaconf_h +#define luaconf_h + +#include +#include + + +/* +** =================================================================== +** General Configuration File for Lua +** +** Some definitions here can be changed externally, through the +** compiler (e.g., with '-D' options). Those are protected by +** '#if !defined' guards. However, several other definitions should +** be changed directly here, either because they affect the Lua +** ABI (by making the changes here, you ensure that all software +** connected to Lua, such as C libraries, will be compiled with the +** same configuration); or because they are seldom changed. +** +** Search for "@@" to find all configurable definitions. +** =================================================================== +*/ + + +/* +** {==================================================================== +** System Configuration: macros to adapt (if needed) Lua to some +** particular platform, for instance restricting it to C89. +** ===================================================================== +*/ + +/* +@@ LUA_USE_C89 controls the use of non-ISO-C89 features. +** Define it if you want Lua to avoid the use of a few C99 features +** or Windows-specific features on Windows. +*/ +/* #define LUA_USE_C89 */ + + +/* +** By default, Lua on Windows use (some) specific Windows features +*/ +#if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE) +#define LUA_USE_WINDOWS /* enable goodies for regular Windows */ +#endif + + +#if defined(LUA_USE_WINDOWS) +#define LUA_DL_DLL /* enable support for DLL */ +#define LUA_USE_C89 /* broadly, Windows is C89 */ +#endif + + +#if defined(LUA_USE_LINUX) +#define LUA_USE_POSIX +#define LUA_USE_DLOPEN /* needs an extra library: -ldl */ +#endif + + +#if defined(LUA_USE_MACOSX) +#define LUA_USE_POSIX +#define LUA_USE_DLOPEN /* MacOS does not need -ldl */ +#endif + + +/* +@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits. +*/ +#define LUAI_IS32INT ((UINT_MAX >> 30) >= 3) + +/* }================================================================== */ + + + +/* +** {================================================================== +** Configuration for Number types. +** =================================================================== +*/ + +/* +@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats. +*/ +/* #define LUA_32BITS */ + + +/* +@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for +** C89 ('long' and 'double'); Windows always has '__int64', so it does +** not need to use this case. +*/ +#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS) +#define LUA_C89_NUMBERS +#endif + + +/* +@@ LUA_INT_TYPE defines the type for Lua integers. +@@ LUA_FLOAT_TYPE defines the type for Lua floats. +** Lua should work fine with any mix of these options supported +** by your C compiler. The usual configurations are 64-bit integers +** and 'double' (the default), 32-bit integers and 'float' (for +** restricted platforms), and 'long'/'double' (for C compilers not +** compliant with C99, which may not have support for 'long long'). +*/ + +/* predefined options for LUA_INT_TYPE */ +#define LUA_INT_INT 1 +#define LUA_INT_LONG 2 +#define LUA_INT_LONGLONG 3 + +/* predefined options for LUA_FLOAT_TYPE */ +#define LUA_FLOAT_FLOAT 1 +#define LUA_FLOAT_DOUBLE 2 +#define LUA_FLOAT_LONGDOUBLE 3 + +#if defined(LUA_32BITS) /* { */ +/* +** 32-bit integers and 'float' +*/ +#if LUAI_IS32INT /* use 'int' if big enough */ +#define LUA_INT_TYPE LUA_INT_INT +#else /* otherwise use 'long' */ +#define LUA_INT_TYPE LUA_INT_LONG +#endif +#define LUA_FLOAT_TYPE LUA_FLOAT_FLOAT + +#elif defined(LUA_C89_NUMBERS) /* }{ */ +/* +** largest types available for C89 ('long' and 'double') +*/ +#define LUA_INT_TYPE LUA_INT_LONG +#define LUA_FLOAT_TYPE LUA_FLOAT_DOUBLE + +#endif /* } */ + + +/* +** default configuration for 64-bit Lua ('long long' and 'double') +*/ +#if !defined(LUA_INT_TYPE) +#define LUA_INT_TYPE LUA_INT_LONGLONG +#endif + +#if !defined(LUA_FLOAT_TYPE) +#define LUA_FLOAT_TYPE LUA_FLOAT_DOUBLE +#endif + +/* }================================================================== */ + + + +/* +** {================================================================== +** Configuration for Paths. +** =================================================================== +*/ + +/* +** LUA_PATH_SEP is the character that separates templates in a path. +** LUA_PATH_MARK is the string that marks the substitution points in a +** template. +** LUA_EXEC_DIR in a Windows path is replaced by the executable's +** directory. +*/ +#define LUA_PATH_SEP ";" +#define LUA_PATH_MARK "?" +#define LUA_EXEC_DIR "!" + + +/* +@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for +** Lua libraries. +@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for +** C libraries. +** CHANGE them if your machine has a non-conventional directory +** hierarchy or if you want to install your libraries in +** non-conventional directories. +*/ + +#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR +#if defined(_WIN32) /* { */ +/* +** In Windows, any exclamation mark ('!') in the path is replaced by the +** path of the directory of the executable file of the current process. +*/ +#define LUA_LDIR "!\\lua\\" +#define LUA_CDIR "!\\" +#define LUA_SHRDIR "!\\..\\share\\lua\\" LUA_VDIR "\\" + +#if !defined(LUA_PATH_DEFAULT) +#define LUA_PATH_DEFAULT \ + LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \ + LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua;" \ + LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\\init.lua;" \ + ".\\?.lua;" ".\\?\\init.lua" +#endif + +#if !defined(LUA_CPATH_DEFAULT) +#define LUA_CPATH_DEFAULT \ + LUA_CDIR"?.dll;" \ + LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \ + LUA_CDIR"loadall.dll;" ".\\?.dll;" \ + LUA_CDIR"?54.dll;" ".\\?54.dll" +#endif + +#else /* }{ */ + +#define LUA_ROOT "/usr/local/" +#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" +#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + +#if !defined(LUA_PATH_DEFAULT) +#define LUA_PATH_DEFAULT \ + LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ + LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ + "./?.lua;" "./?/init.lua" +#endif + +#if !defined(LUA_CPATH_DEFAULT) +#define LUA_CPATH_DEFAULT \ + LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so;" \ + LUA_CDIR"lib?54.so;" "./lib?54.so" +#endif + +#endif /* } */ + + +/* +@@ LUA_DIRSEP is the directory separator (for submodules). +** CHANGE it if your machine does not use "/" as the directory separator +** and is not Windows. (On Windows Lua automatically uses "\".) +*/ +#if !defined(LUA_DIRSEP) + +#if defined(_WIN32) +#define LUA_DIRSEP "\\" +#else +#define LUA_DIRSEP "/" +#endif + +#endif + +/* }================================================================== */ + + +/* +** {================================================================== +** Marks for exported symbols in the C code +** =================================================================== +*/ + +/* +@@ LUA_API is a mark for all core API functions. +@@ LUALIB_API is a mark for all auxiliary library functions. +@@ LUAMOD_API is a mark for all standard library opening functions. +** CHANGE them if you need to define those functions in some special way. +** For instance, if you want to create one Windows DLL with the core and +** the libraries, you may want to use the following definition (define +** LUA_BUILD_AS_DLL to get it). +*/ +#if defined(LUA_BUILD_AS_DLL) /* { */ + +#if defined(LUA_CORE) || defined(LUA_LIB) /* { */ +#define LUA_API __declspec(dllexport) +#else /* }{ */ +#define LUA_API __declspec(dllimport) +#endif /* } */ + +#else /* }{ */ + +#define LUA_API extern + +#endif /* } */ + + +/* +** More often than not the libs go together with the core. +*/ +#define LUALIB_API LUA_API +#define LUAMOD_API LUA_API + + +/* +@@ LUAI_FUNC is a mark for all extern functions that are not to be +** exported to outside modules. +@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables, +** none of which to be exported to outside modules (LUAI_DDEF for +** definitions and LUAI_DDEC for declarations). +** CHANGE them if you need to mark them in some special way. Elf/gcc +** (versions 3.2 and later) mark them as "hidden" to optimize access +** when Lua is compiled as a shared library. Not all elf targets support +** this attribute. Unfortunately, gcc does not offer a way to check +** whether the target offers that support, and those without support +** give a warning about it. To avoid these warnings, change to the +** default definition. +*/ +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ + defined(__ELF__) /* { */ +#define LUAI_FUNC __attribute__((visibility("internal"))) extern +#else /* }{ */ +#define LUAI_FUNC extern +#endif /* } */ + +#define LUAI_DDEC(dec) LUAI_FUNC dec +#define LUAI_DDEF /* empty */ + +/* }================================================================== */ + + +/* +** {================================================================== +** Compatibility with previous versions +** =================================================================== +*/ + +/* +@@ LUA_COMPAT_5_3 controls other macros for compatibility with Lua 5.3. +** You can define it to get all options, or change specific options +** to fit your specific needs. +*/ +#if defined(LUA_COMPAT_5_3) /* { */ + +/* +@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated +** functions in the mathematical library. +** (These functions were already officially removed in 5.3; +** nevertheless they are still available here.) +*/ +#define LUA_COMPAT_MATHLIB + +/* +@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for +** manipulating other integer types (lua_pushunsigned, lua_tounsigned, +** luaL_checkint, luaL_checklong, etc.) +** (These macros were also officially removed in 5.3, but they are still +** available here.) +*/ +#define LUA_COMPAT_APIINTCASTS + + +/* +@@ LUA_COMPAT_LT_LE controls the emulation of the '__le' metamethod +** using '__lt'. +*/ +#define LUA_COMPAT_LT_LE + + +/* +@@ The following macros supply trivial compatibility for some +** changes in the API. The macros themselves document how to +** change your code to avoid using them. +** (Once more, these macros were officially removed in 5.3, but they are +** still available here.) +*/ +#define lua_strlen(L,i) lua_rawlen(L, (i)) + +#define lua_objlen(L,i) lua_rawlen(L, (i)) + +#define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ) +#define lua_lessthan(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPLT) + +#endif /* } */ + +/* }================================================================== */ + + + +/* +** {================================================================== +** Configuration for Numbers. +** Change these definitions if no predefined LUA_FLOAT_* / LUA_INT_* +** satisfy your needs. +** =================================================================== +*/ + +/* +@@ LUA_NUMBER is the floating-point type used by Lua. +@@ LUAI_UACNUMBER is the result of a 'default argument promotion' +@@ over a floating number. +@@ l_floatatt(x) corrects float attribute 'x' to the proper float type +** by prefixing it with one of FLT/DBL/LDBL. +@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats. +@@ LUA_NUMBER_FMT is the format for writing floats. +@@ lua_number2str converts a float to a string. +@@ l_mathop allows the addition of an 'l' or 'f' to all math operations. +@@ l_floor takes the floor of a float. +@@ lua_str2number converts a decimal numeral to a number. +*/ + + +/* The following definitions are good for most cases here */ + +#define l_floor(x) (l_mathop(floor)(x)) + +#define lua_number2str(s,sz,n) \ + l_sprintf((s), sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)(n)) + +/* +@@ lua_numbertointeger converts a float number with an integral value +** to an integer, or returns 0 if float is not within the range of +** a lua_Integer. (The range comparisons are tricky because of +** rounding. The tests here assume a two-complement representation, +** where MININTEGER always has an exact representation as a float; +** MAXINTEGER may not have one, and therefore its conversion to float +** may have an ill-defined value.) +*/ +#define lua_numbertointeger(n,p) \ + ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \ + (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \ + (*(p) = (LUA_INTEGER)(n), 1)) + + +/* now the variable definitions */ + +#if LUA_FLOAT_TYPE == LUA_FLOAT_FLOAT /* { single float */ + +#define LUA_NUMBER float + +#define l_floatatt(n) (FLT_##n) + +#define LUAI_UACNUMBER double + +#define LUA_NUMBER_FRMLEN "" +#define LUA_NUMBER_FMT "%.7g" + +#define l_mathop(op) op##f + +#define lua_str2number(s,p) strtof((s), (p)) + + +#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE /* }{ long double */ + +#define LUA_NUMBER long double + +#define l_floatatt(n) (LDBL_##n) + +#define LUAI_UACNUMBER long double + +#define LUA_NUMBER_FRMLEN "L" +#define LUA_NUMBER_FMT "%.19Lg" + +#define l_mathop(op) op##l + +#define lua_str2number(s,p) strtold((s), (p)) + +#elif LUA_FLOAT_TYPE == LUA_FLOAT_DOUBLE /* }{ double */ + +#define LUA_NUMBER double + +#define l_floatatt(n) (DBL_##n) + +#define LUAI_UACNUMBER double + +#define LUA_NUMBER_FRMLEN "" +#define LUA_NUMBER_FMT "%.14g" + +#define l_mathop(op) op + +#define lua_str2number(s,p) strtod((s), (p)) + +#else /* }{ */ + +#error "numeric float type not defined" + +#endif /* } */ + + + +/* +@@ LUA_INTEGER is the integer type used by Lua. +** +@@ LUA_UNSIGNED is the unsigned version of LUA_INTEGER. +** +@@ LUAI_UACINT is the result of a 'default argument promotion' +@@ over a LUA_INTEGER. +@@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers. +@@ LUA_INTEGER_FMT is the format for writing integers. +@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER. +@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER. +@@ LUA_MAXUNSIGNED is the maximum value for a LUA_UNSIGNED. +@@ LUA_UNSIGNEDBITS is the number of bits in a LUA_UNSIGNED. +@@ lua_integer2str converts an integer to a string. +*/ + + +/* The following definitions are good for most cases here */ + +#define LUA_INTEGER_FMT "%" LUA_INTEGER_FRMLEN "d" + +#define LUAI_UACINT LUA_INTEGER + +#define lua_integer2str(s,sz,n) \ + l_sprintf((s), sz, LUA_INTEGER_FMT, (LUAI_UACINT)(n)) + +/* +** use LUAI_UACINT here to avoid problems with promotions (which +** can turn a comparison between unsigneds into a signed comparison) +*/ +#define LUA_UNSIGNED unsigned LUAI_UACINT + + +#define LUA_UNSIGNEDBITS (sizeof(LUA_UNSIGNED) * CHAR_BIT) + + +/* now the variable definitions */ + +#if LUA_INT_TYPE == LUA_INT_INT /* { int */ + +#define LUA_INTEGER int +#define LUA_INTEGER_FRMLEN "" + +#define LUA_MAXINTEGER INT_MAX +#define LUA_MININTEGER INT_MIN + +#define LUA_MAXUNSIGNED UINT_MAX + +#elif LUA_INT_TYPE == LUA_INT_LONG /* }{ long */ + +#define LUA_INTEGER long +#define LUA_INTEGER_FRMLEN "l" + +#define LUA_MAXINTEGER LONG_MAX +#define LUA_MININTEGER LONG_MIN + +#define LUA_MAXUNSIGNED ULONG_MAX + +#elif LUA_INT_TYPE == LUA_INT_LONGLONG /* }{ long long */ + +/* use presence of macro LLONG_MAX as proxy for C99 compliance */ +#if defined(LLONG_MAX) /* { */ +/* use ISO C99 stuff */ + +#define LUA_INTEGER long long +#define LUA_INTEGER_FRMLEN "ll" + +#define LUA_MAXINTEGER LLONG_MAX +#define LUA_MININTEGER LLONG_MIN + +#define LUA_MAXUNSIGNED ULLONG_MAX + +#elif defined(LUA_USE_WINDOWS) /* }{ */ +/* in Windows, can use specific Windows types */ + +#define LUA_INTEGER __int64 +#define LUA_INTEGER_FRMLEN "I64" + +#define LUA_MAXINTEGER _I64_MAX +#define LUA_MININTEGER _I64_MIN + +#define LUA_MAXUNSIGNED _UI64_MAX + +#else /* }{ */ + +#error "Compiler does not support 'long long'. Use option '-DLUA_32BITS' \ + or '-DLUA_C89_NUMBERS' (see file 'luaconf.h' for details)" + +#endif /* } */ + +#else /* }{ */ + +#error "numeric integer type not defined" + +#endif /* } */ + +/* }================================================================== */ + + +/* +** {================================================================== +** Dependencies with C99 and other C details +** =================================================================== +*/ + +/* +@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89. +** (All uses in Lua have only one format item.) +*/ +#if !defined(LUA_USE_C89) +#define l_sprintf(s,sz,f,i) snprintf(s,sz,f,i) +#else +#define l_sprintf(s,sz,f,i) ((void)(sz), sprintf(s,f,i)) +#endif + + +/* +@@ lua_strx2number converts a hexadecimal numeral to a number. +** In C99, 'strtod' does that conversion. Otherwise, you can +** leave 'lua_strx2number' undefined and Lua will provide its own +** implementation. +*/ +#if !defined(LUA_USE_C89) +#define lua_strx2number(s,p) lua_str2number(s,p) +#endif + + +/* +@@ lua_pointer2str converts a pointer to a readable string in a +** non-specified way. +*/ +#define lua_pointer2str(buff,sz,p) l_sprintf(buff,sz,"%p",p) + + +/* +@@ lua_number2strx converts a float to a hexadecimal numeral. +** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that. +** Otherwise, you can leave 'lua_number2strx' undefined and Lua will +** provide its own implementation. +*/ +#if !defined(LUA_USE_C89) +#define lua_number2strx(L,b,sz,f,n) \ + ((void)L, l_sprintf(b,sz,f,(LUAI_UACNUMBER)(n))) +#endif + + +/* +** 'strtof' and 'opf' variants for math functions are not valid in +** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the +** availability of these variants. ('math.h' is already included in +** all files that use these macros.) +*/ +#if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF)) +#undef l_mathop /* variants not available */ +#undef lua_str2number +#define l_mathop(op) (lua_Number)op /* no variant */ +#define lua_str2number(s,p) ((lua_Number)strtod((s), (p))) +#endif + + +/* +@@ LUA_KCONTEXT is the type of the context ('ctx') for continuation +** functions. It must be a numerical type; Lua will use 'intptr_t' if +** available, otherwise it will use 'ptrdiff_t' (the nearest thing to +** 'intptr_t' in C89) +*/ +#define LUA_KCONTEXT ptrdiff_t + +#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \ + __STDC_VERSION__ >= 199901L +#include +#if defined(INTPTR_MAX) /* even in C99 this type is optional */ +#undef LUA_KCONTEXT +#define LUA_KCONTEXT intptr_t +#endif +#endif + + +/* +@@ lua_getlocaledecpoint gets the locale "radix character" (decimal point). +** Change that if you do not want to use C locales. (Code using this +** macro must include the header 'locale.h'.) +*/ +#if !defined(lua_getlocaledecpoint) +#define lua_getlocaledecpoint() (localeconv()->decimal_point[0]) +#endif + +/* }================================================================== */ + + +/* +** {================================================================== +** Language Variations +** ===================================================================== +*/ + +/* +@@ LUA_NOCVTN2S/LUA_NOCVTS2N control how Lua performs some +** coercions. Define LUA_NOCVTN2S to turn off automatic coercion from +** numbers to strings. Define LUA_NOCVTS2N to turn off automatic +** coercion from strings to numbers. +*/ +/* #define LUA_NOCVTN2S */ +/* #define LUA_NOCVTS2N */ + + +/* +@@ LUA_USE_APICHECK turns on several consistency checks on the C API. +** Define it as a help when debugging C code. +*/ +#if defined(LUA_USE_APICHECK) +#include +#define luai_apicheck(l,e) assert(e) +#endif + +/* }================================================================== */ + + +/* +** {================================================================== +** Macros that affect the API and must be stable (that is, must be the +** same when you compile Lua and when you compile code that links to +** Lua). +** ===================================================================== +*/ + +/* +@@ LUAI_MAXSTACK limits the size of the Lua stack. +** CHANGE it if you need a different limit. This limit is arbitrary; +** its only purpose is to stop Lua from consuming unlimited stack +** space (and to reserve some numbers for pseudo-indices). +** (It must fit into max(size_t)/32.) +*/ +#if LUAI_IS32INT +#define LUAI_MAXSTACK 1000000 +#else +#define LUAI_MAXSTACK 15000 +#endif + + +/* +@@ LUA_EXTRASPACE defines the size of a raw memory area associated with +** a Lua state with very fast access. +** CHANGE it if you need a different size. +*/ +#define LUA_EXTRASPACE (sizeof(void *)) + + +/* +@@ LUA_IDSIZE gives the maximum size for the description of the source +@@ of a function in debug information. +** CHANGE it if you want a different size. +*/ +#define LUA_IDSIZE 60 + + +/* +@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system. +*/ +#define LUAL_BUFFERSIZE ((int)(16 * sizeof(void*) * sizeof(lua_Number))) + + +/* +@@ LUAI_MAXALIGN defines fields that, when used in a union, ensure +** maximum alignment for the other items in that union. +*/ +#define LUAI_MAXALIGN lua_Number n; double u; void *s; lua_Integer i; long l + +/* }================================================================== */ + + + + + +/* =================================================================== */ + +/* +** Local configuration. You can use this space to add your redefinitions +** without modifying the main part of the file. +*/ + + + + + +#endif + diff --git a/Resources/lua/src/lualib.h b/Resources/lua/src/lualib.h new file mode 100644 index 0000000..eb08b53 --- /dev/null +++ b/Resources/lua/src/lualib.h @@ -0,0 +1,58 @@ +/* +** $Id: lualib.h $ +** Lua standard libraries +** See Copyright Notice in lua.h +*/ + + +#ifndef lualib_h +#define lualib_h + +#include "lua.h" + + +/* version suffix for environment variable names */ +#define LUA_VERSUFFIX "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR + + +LUAMOD_API int (luaopen_base) (lua_State *L); + +#define LUA_COLIBNAME "coroutine" +LUAMOD_API int (luaopen_coroutine) (lua_State *L); + +#define LUA_TABLIBNAME "table" +LUAMOD_API int (luaopen_table) (lua_State *L); + +#define LUA_IOLIBNAME "io" +LUAMOD_API int (luaopen_io) (lua_State *L); + +#define LUA_OSLIBNAME "os" +LUAMOD_API int (luaopen_os) (lua_State *L); + +#define LUA_STRLIBNAME "string" +LUAMOD_API int (luaopen_string) (lua_State *L); + +#define LUA_UTF8LIBNAME "utf8" +LUAMOD_API int (luaopen_utf8) (lua_State *L); + +#define LUA_MATHLIBNAME "math" +LUAMOD_API int (luaopen_math) (lua_State *L); + +#define LUA_DBLIBNAME "debug" +LUAMOD_API int (luaopen_debug) (lua_State *L); + +#define LUA_LOADLIBNAME "package" +LUAMOD_API int (luaopen_package) (lua_State *L); + + +/* open all previous libraries */ +LUALIB_API void (luaL_openlibs) (lua_State *L); + + + +#if !defined(lua_assert) +#define lua_assert(x) ((void)0) +#endif + + +#endif diff --git a/Resources/sqlite/license.png b/Resources/sqlite/license.png new file mode 100644 index 0000000..f30b4f8 Binary files /dev/null and b/Resources/sqlite/license.png differ diff --git a/Stdlib/SIMD/SIMD_F32.h b/Stdlib/SIMD/SIMD_F32.h index 40b73f8..5dbb2ef 100644 --- a/Stdlib/SIMD/SIMD_F32.h +++ b/Stdlib/SIMD/SIMD_F32.h @@ -890,35 +890,35 @@ namespace Stdlib::SIMD inline bool all_true(f32_4_simd a) { - bool is_true = (_mm_movemask_ps(a.s) == 15); + bool is_true = _mm_movemask_ps(a.s) == 15; return is_true; } inline bool all_true(f32_8_simd a) { - bool is_true = (_mm256_movemask_ps(a.s) == 255); + bool is_true = _mm256_movemask_ps(a.s) == 255; return is_true; } inline bool all_true(f32_16_simd a) { - bool is_true = (_mm512_movepi32_mask(_mm512_castps_si512(a.s)) == 65535); + bool is_true = _mm512_movepi32_mask(_mm512_castps_si512(a.s)) == 65535; return is_true; } inline bool all_false(f32_4_simd a) { - bool is_false = (_mm_movemask_ps(a.s) == 0); + bool is_false = _mm_movemask_ps(a.s) == 0; return is_false; } inline bool all_false(f32_8_simd a) { - bool is_false = (_mm256_movemask_ps(a.s) == 0); + bool is_false = _mm256_movemask_ps(a.s) == 0; return is_false; } @@ -926,7 +926,7 @@ namespace Stdlib::SIMD inline bool all_false(f32_16_simd a) { // @todo This can be optimized (requires also changes in the comparison functions return) - bool is_false = (_mm512_movepi32_mask(_mm512_castps_si512(a.s)) == 0); + bool is_false = _mm512_movepi32_mask(_mm512_castps_si512(a.s)) == 0; return is_false; } diff --git a/Stdlib/SIMD/SIMD_Helper.h b/Stdlib/SIMD/SIMD_Helper.h index e84f0df..dee6101 100644 --- a/Stdlib/SIMD/SIMD_Helper.h +++ b/Stdlib/SIMD/SIMD_Helper.h @@ -16,7 +16,7 @@ namespace Stdlib::SIMD { - bool is_avx_supported() + bool is_sse_supported() { uint32_t eax, ebx, ecx, edx; diff --git a/Stdlib/SIMD/SIMD_I32.h b/Stdlib/SIMD/SIMD_I32.h index 0166ea0..0527065 100644 --- a/Stdlib/SIMD/SIMD_I32.h +++ b/Stdlib/SIMD/SIMD_I32.h @@ -55,7 +55,7 @@ namespace Stdlib::SIMD return simd; } - inline void unload_int32_4_simd(int32_4_simd a, int32 *array) { _mm_store_epi32(array, a.s); } + inline void unload_int32_4_simd(int32_4_simd a, int32 *array) { _mm_store_si128((__m128i *) array, a.s); } inline int32_8_simd load_int32_8_simd(int32 *mem) { @@ -73,7 +73,7 @@ namespace Stdlib::SIMD return simd; } - inline void unload_int32_8_simd(int32_8_simd a, int32 *array) { _mm256_store_epi32(array, a.s); } + inline void unload_int32_8_simd(int32_8_simd a, int32 *array) { _mm256_store_si256((__m256i *) array, a.s); } inline int32_16_simd load_int32_16_simd(int32 *mem) { @@ -196,26 +196,26 @@ namespace Stdlib::SIMD return simd; } - inline Stdlib::SIMD::f32_4_simd operator/(int32_4_simd a, int32_4_simd b) + inline f32_4_simd operator/(int32_4_simd a, int32_4_simd b) { - Stdlib::SIMD::f32_4_simd simd; - simd.s = _mm_div_ps(a.s, b.s); + f32_4_simd simd; + simd.s = _mm_div_ps(_mm_cvtepi32_ps(a.s), _mm_cvtepi32_ps(b.s)); return simd; } - inline Stdlib::SIMD::f32_8_simd operator/(int32_8_simd a, int32_8_simd b) + inline f32_8_simd operator/(int32_8_simd a, int32_8_simd b) { - Stdlib::SIMD::f32_8_simd simd; - simd.s = _mm256_div_ps(a.s, b.s); + f32_8_simd simd; + simd.s = _mm256_div_ps(_mm256_cvtepi32_ps(a.s), _mm256_cvtepi32_ps(b.s)); return simd; } - inline Stdlib::SIMD::f32_16_simd operator/(int32_16_simd a, int32_16_simd b) + inline f32_16_simd operator/(int32_16_simd a, int32_16_simd b) { - Stdlib::SIMD::f32_16_simd simd; - simd.s = _mm512_div_ps(a.s, b.s); + f32_16_simd simd; + simd.s = _mm512_div_ps(_mm512_cvtepi32_ps(a.s), _mm512_cvtepi32_ps(b.s)); return simd; } @@ -416,7 +416,7 @@ namespace Stdlib::SIMD inline int32_16_simd operator>(int32_16_simd a, int32_16_simd b) { int32_16_simd simd; - simd.s = _mm512_mask_blend_ps(_mm512_cmpgt_epi32_mask(a.s, b.s), a.s, b.s); + simd.s = _mm512_mask_blend_epi32(_mm512_cmpgt_epi32_mask(a.s, b.s), a.s, b.s); return simd; } @@ -440,7 +440,7 @@ namespace Stdlib::SIMD inline int32_16_simd operator>=(int32_16_simd a, int32_16_simd b) { int32_16_simd simd; - simd.s = _mm512_mask_blend_ps(_mm512_cmpge_epi32_mask(a.s, b.s), a.s, b.s); + simd.s = _mm512_mask_blend_epi32(_mm512_cmpge_epi32_mask(a.s, b.s), a.s, b.s); return simd; } @@ -464,7 +464,7 @@ namespace Stdlib::SIMD inline int32_16_simd operator==(int32_16_simd a, int32_16_simd b) { int32_16_simd simd; - simd.s = _mm512_mask_blend_ps(_mm512_cmpeq_epi32_mask(a.s, b.s), a.s, b.s); + simd.s = _mm512_mask_blend_epi32(_mm512_cmpeq_epi32_mask(a.s, b.s), a.s, b.s); return simd; } @@ -472,7 +472,7 @@ namespace Stdlib::SIMD inline int32_4_simd operator!=(int32_4_simd a, int32_4_simd b) { int32_4_simd simd; - simd.s = _mm_cmpneq_epi32(a.s, b.s); + simd.s = _mm_andnot_si128(_mm_cmpeq_epi32(a.s, b.s), _mm_set1_epi32(-1)); return simd; } @@ -480,7 +480,7 @@ namespace Stdlib::SIMD inline int32_8_simd operator!=(int32_8_simd a, int32_8_simd b) { int32_8_simd simd; - simd.s = _mm256_cmp_epi32(a.s, b.s, _CMP_NEQ_OQ); + simd.s = _mm256_mask_blend_epi32(_mm256_cmp_epi32_mask(a.s, b.s, _MM_CMPINT_NE), a.s, b.s); return simd; } @@ -488,8 +488,7 @@ namespace Stdlib::SIMD inline int32_16_simd operator!=(int32_16_simd a, int32_16_simd b) { int32_16_simd simd; - simd.s = _mm512_mask_mov_epi32(_mm512_setzero_epi32(), _mm512_cmp_ps_mask(a.s, b.s, _CMP_NEQ_OQ), - _mm512_set1_epi32(1.0f)); + simd.s = _mm512_mask_blend_epi32(_mm512_cmp_epi32_mask(a.s, b.s, _MM_CMPINT_NE), a.s, b.s); return simd; } @@ -586,31 +585,26 @@ namespace Stdlib::SIMD inline int32_4_simd abs(int32_4_simd a) { - unsigned int unsigned_mask = (unsigned int) (1 << 31); - __m128 mask = _mm_set1_epi32(*(float *) &unsigned_mask); + __m128i mask = _mm_set1_epi32(0x7FFFFFFF); int32_4_simd simd; - simd.s = _mm_and_epi32(a.s, mask); + simd.s = _mm_and_si128(a.s, mask); return simd; } inline int32_8_simd abs(int32_8_simd a) { - unsigned int unsigned_mask = (unsigned int) (1 << 31); - __m256 mask = _mm256_set1_epi32(*(float *) &unsigned_mask); - + __m256i mask = _mm256_set1_epi32(0x7FFFFFFF); int32_8_simd simd; - simd.s = _mm256_and_epi32(a.s, mask); + simd.s = _mm256_and_si256(a.s, mask); return simd; } inline int32_16_simd abs(int32_16_simd a) { - unsigned int unsigned_mask = (unsigned int) (1 << 31); - __m512 mask = _mm512_set1_epi32(*(float *) &unsigned_mask); - + __m512i mask = _mm512_set1_epi32(0x7FFFFFFF); int32_16_simd simd; simd.s = _mm512_and_epi32(a.s, mask); @@ -667,168 +661,108 @@ namespace Stdlib::SIMD inline int32_4_simd sign(int32_4_simd a) { - unsigned int umask = (unsigned int) (1 << 31); - __m128 mask = _mm_set1_epi32(*(float *) &umask); + __m128i mask = _mm_set1_epi32(0x80000000); + __m128i signBit = _mm_and_epi32(a.s, mask); + __m128i b = _mm_set1_epi32(1); - int32_4_simd signBit; - signBit.s = _mm_and_epi32(a.s, mask); - - int32_4_simd b; - b.s = _mm_set1_epi32(1.0f); - - int32_4_simd simd = b | signBit; + int32_4_simd simd; + simd.s = _mm_or_si128(b, signBit); return simd; } inline int32_8_simd sign(int32_8_simd a) { - unsigned int umask = (unsigned int) (1 << 31); - __m256 mask = _mm256_set1_epi32(*(float *) &umask); + __m256i mask = _mm256_set1_epi32(0x80000000); + __m256i signBit = _mm256_and_epi32(a.s, mask); + __m256i b = _mm256_set1_epi32(1); - int32_8_simd signBit; - signBit.s = _mm256_and_epi32(a.s, mask); - - int32_8_simd b; - b.s = _mm256_set1_epi32(1.0f); - - int32_8_simd simd = b | signBit; + int32_8_simd simd; + simd.s = _mm256_or_si256(b, signBit); return simd; } inline int32_16_simd sign(int32_16_simd a) { - unsigned int umask = (unsigned int) (1 << 31); - __m512 mask = _mm512_set1_epi32(*(float *) &umask); - - int32_16_simd signBit; - signBit.s = _mm512_and_epi32(a.s, mask); - - int32_16_simd b; - b.s = _mm512_set1_epi32(1.0f); - - int32_16_simd simd = b | signBit; - - return simd; - } - - inline int32_4_simd floor(int32_4_simd a) - { - int32_4_simd simd; - simd.s = _mm_floor_epi32(a.s); - - return simd; - } - - inline int32_8_simd floor(int32_8_simd a) - { - int32_8_simd simd; - simd.s = _mm256_floor_epi32(a.s); - - return simd; - } - - inline int32_16_simd floor(int32_16_simd a) - { + __m512i mask = _mm512_set1_epi32(0x80000000); + __m512i signBit = _mm512_and_epi32(a.s, mask); + __m512i b = _mm512_set1_epi32(1); int32_16_simd simd; - simd.s = _mm512_floor_epi32(a.s); + + simd.s = _mm512_or_si512(b, signBit); return simd; } - inline int32_4_simd ceil(int32_4_simd a) + inline f32_4_simd sqrt(int32_4_simd a) { - int32_4_simd simd; - simd.s = _mm_ceil_epi32(a.s); + f32_4_simd simd; + simd.s = _mm_sqrt_ps(_mm_cvtepi32_ps(a.s)); return simd; } - inline int32_8_simd ceil(int32_8_simd a) + inline f32_8_simd sqrt(int32_8_simd a) { - int32_8_simd simd; - simd.s = _mm256_ceil_epi32(a.s); + f32_8_simd simd; + simd.s = _mm256_sqrt_ps(_mm256_cvtepi32_ps(a.s)); return simd; } - inline int32_16_simd ceil(int32_16_simd a) + inline f32_16_simd sqrt(int32_16_simd a) { - int32_16_simd simd; - simd.s = _mm512_ceil_epi32(a.s); + f32_16_simd simd; + simd.s = _mm512_sqrt_ps(_mm512_cvtepi32_ps(a.s)); return simd; } - inline int32_4_simd sqrt(int32_4_simd a) + inline f32_4_simd sqrt_inv_approx(int32_4_simd a) { - int32_4_simd simd; - simd.s = _mm_sqrt_epi32(a.s); + f32_4_simd simd; + simd.s = _mm_rsqrt_ps(_mm_cvtepi32_ps(a.s)); return simd; } - inline int32_8_simd sqrt(int32_8_simd a) + inline f32_8_simd sqrt_inv_approx(int32_8_simd a) { - int32_8_simd simd; - simd.s = _mm256_sqrt_epi32(a.s); + f32_8_simd simd; + simd.s = _mm256_rsqrt_ps(_mm256_cvtepi32_ps(a.s)); return simd; } - inline int32_16_simd sqrt(int32_16_simd a) + inline f32_16_simd sqrt_inv_approx(int32_16_simd a) { - int32_16_simd simd; - simd.s = _mm512_sqrt_epi32(a.s); + f32_16_simd simd; + simd.s = _mm512_rsqrt14_ps(_mm512_cvtepi32_ps(a.s)); return simd; } - inline int32_4_simd sqrt_inv_approx(int32_4_simd a) + inline f32_4_simd one_over_approx(int32_4_simd a) { - int32_4_simd simd; - simd.s = _mm_rsqrt_epi32(a.s); + f32_4_simd simd; + simd.s = _mm_rcp_ps(_mm_cvtepi32_ps(a.s)); return simd; } - inline int32_8_simd sqrt_inv_approx(int32_8_simd a) + inline f32_8_simd one_over_approx(int32_8_simd a) { - int32_8_simd simd; - simd.s = _mm256_rsqrt_epi32(a.s); + f32_8_simd simd; + simd.s = _mm256_rcp_ps(_mm256_cvtepi32_ps(a.s)); return simd; } - inline int32_16_simd sqrt_inv_approx(int32_16_simd a) + inline f32_16_simd one_over_approx(int32_16_simd a) { - int32_16_simd simd; - simd.s = _mm512_rsqrt14_epi32(a.s); - - return simd; - } - - inline int32_4_simd one_over_approx(int32_4_simd a) - { - int32_4_simd simd; - simd.s = _mm_rcp_epi32(a.s); - - return simd; - } - - inline int32_8_simd one_over_approx(int32_8_simd a) - { - int32_8_simd simd; - simd.s = _mm256_rcp_epi32(a.s); - - return simd; - } - - inline int32_16_simd one_over_approx(int32_16_simd a) - { - int32_16_simd simd; - simd.s = _mm512_rcp14_epi32(a.s); + f32_16_simd simd; + simd.s = _mm512_rcp14_ps(_mm512_cvtepi32_ps(a.s)); return simd; } @@ -850,77 +784,77 @@ namespace Stdlib::SIMD inline int32 which_true(int32_4_simd a) { - int32 which_true = _mm_movemask_epi32(a.s); + int32 which_true = _mm_movemask_epi8(a.s); return which_true; } inline int32 which_true(int32_8_simd a) { - int32 which_true = _mm256_movemask_epi32(a.s); + int32 which_true = _mm256_movemask_epi8(a.s); return which_true; } inline int32 which_true(int32_16_simd a) { - int32 which_true = _mm512_movepi32_mask(_mm512_castps_si512(a.s)); + int32 which_true = _mm512_movepi32_mask(a.s); return which_true; } inline bool any_true(int32_4_simd a) { - bool is_any_true = _mm_movemask_epi32(a.s) > 0; + bool is_any_true = _mm_movemask_epi8(a.s) > 0; return is_any_true; } inline bool any_true(int32_8_simd a) { - bool is_any_true = _mm256_movemask_epi32(a.s) > 0; + bool is_any_true = _mm256_movemask_epi8(a.s) > 0; return is_any_true; } inline bool any_true(int32_16_simd a) { - bool is_any_true = _mm512_movepi32_mask(_mm512_castps_si512(a.s)) > 0; + bool is_any_true = _mm512_movepi32_mask(a.s) > 0; return is_any_true; } inline bool all_true(int32_4_simd a) { - bool is_true = (_mm_movemask_epi32(a.s) == 15); + bool is_true = _mm_movemask_epi8(a.s) == 15; return is_true; } inline bool all_true(int32_8_simd a) { - bool is_true = (_mm256_movemask_epi32(a.s) == 255); + bool is_true = _mm256_movemask_epi8(a.s) == 255; return is_true; } inline bool all_true(int32_16_simd a) { - bool is_true = (_mm512_movepi32_mask(_mm512_castps_si512(a.s)) == 65535); + bool is_true = _mm512_movepi32_mask(a.s) == 65535; return is_true; } inline bool all_false(int32_4_simd a) { - bool is_false = (_mm_movemask_epi32(a.s) == 0); + bool is_false = _mm_movemask_epi8(a.s) == 0; return is_false; } inline bool all_false(int32_8_simd a) { - bool is_false = (_mm256_movemask_epi32(a.s) == 0); + bool is_false = _mm256_movemask_epi8(a.s) == 0; return is_false; } @@ -928,7 +862,7 @@ namespace Stdlib::SIMD inline bool all_false(int32_16_simd a) { // @todo This can be optimized (requires also changes in the comparison functions return) - bool is_false = (_mm512_movepi32_mask(_mm512_castps_si512(a.s)) == 0); + bool is_false = _mm512_movepi32_mask(a.s) == 0; return is_false; } diff --git a/Stdlib/Types.h b/Stdlib/Types.h index b517bf5..fda4d91 100644 --- a/Stdlib/Types.h +++ b/Stdlib/Types.h @@ -26,4 +26,6 @@ typedef uint64_t uint64; typedef float f32; typedef double f64; +typedef unsigned char byte; + #endif diff --git a/Stdlib/compiler.h b/Stdlib/compiler.h new file mode 100644 index 0000000..cbfaaa2 --- /dev/null +++ b/Stdlib/compiler.h @@ -0,0 +1,27 @@ +/** + * Jingga + * + * @package Stdlib + * @copyright Dennis Eichhorn + * @license OMS License 1.0 + * @version 1.0.0 + * @link https://jingga.app + */ +#ifndef STDLIB_COMPILER_H +#define STDLIB_COMPILER_H + +#ifdef _MSC_VER + void* aligned_alloc(size_t alignment, size_t size) { + return _aligned_malloc(size, alignment); + } + + void aligned_free(void* ptr) { + _aligned_free(ptr); + } +#else + void aligned_free(void* ptr) { + free(ptr); + } +#endif + +#endif diff --git a/UI/window.h b/UI/window.h index c1ffdfe..928c435 100644 --- a/UI/window.h +++ b/UI/window.h @@ -1,6 +1,8 @@ #ifndef UI_WINDOW_H #define UI_WINDOW_H +#include + #ifdef _WIN32 #include #include @@ -10,14 +12,27 @@ namespace UI { - typedef struct { + struct WindowStat { + double oldFrame = 0; + double newFrame = 0; + double dt = 0; + }; + + void update_window_stat(WindowStat *stat) + { + stat->newFrame = (double) clock() / CLOCKS_PER_SEC; + stat->dt = stat->newFrame - stat->oldFrame; + stat->oldFrame = stat->newFrame; + } + + struct window { unsigned int width; unsigned int height; #ifdef _WIN32 HWND hwnd; #endif - } window; + }; void window_open(window* w) { @@ -26,8 +41,38 @@ namespace UI #endif } - #ifdef _WIN32 - void window_create_directx(window* w) + #if defined(_WIN32) && defined(DIRECTX) + void window_create_windows(window* w) + { + HINSTANCE hinstance = GetModuleHandle(nullptr); + + WNDCLASSEX wc; + ZeroMemory(&wc, sizeof(WNDCLASSEX)); + + wc.cbSize = sizeof(WNDCLASSEX); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WindowProc; + wc.hInstance = hinstance; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)COLOR_WINDOW; + wc.lpszClassName = L"WindowClass1"; + + RegisterClassEx(&wc); + + RECT wr = {0, 0, 800, 600}; + AdjustWindowRect(&wr, WS_OVERLAPPEDWINDOW, FALSE); + + w->hwnd = CreateWindowEx((DWORD) NULL, + wc.lpszClassName, NULL, + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + wr.right - wr.left, + wr.bottom - wr.top, + NULL, NULL, hinstance, w + ); + } + #else if defined(_WIN32) && defined(OPENGL) + void window_create_opengl(window* w) { HINSTANCE hinstance = GetModuleHandle(nullptr); @@ -58,13 +103,15 @@ namespace UI } #endif - window* window_create(window* w) + void window_create(window* w) { #ifdef _WIN32 - window_create_directx(w); + #if defined(DIRECTX) + window_create_directx(w); + #else if defined(_WIN32) && defined(OPENGL) + window_create_opengl(w); + #endif #endif - - return w; } } diff --git a/Utils/Intrinsics.h b/Utils/Intrinsics.h deleted file mode 100644 index a3316b6..0000000 --- a/Utils/Intrinsics.h +++ /dev/null @@ -1,111 +0,0 @@ -/** - * Jingga - * - * @package Utils - * @copyright Dennis Eichhorn - * @license OMS License 1.0 - * @version 1.0.0 - * @link https://jingga.app - */ -#ifndef UTILS_INTRINSICS_H -#define UTILS_INTRINSICS_H - -#include -#include - -/* -MMX -Introduce eight 64 bit registers (MM0-MM7) and instructions to work with eight signed/unsigned bytes, four -signed/unsigned words, two signed/unsigned dwords. - -3DNow! -Add support for single precision floating point operand to MMX. Few operation supported, for example addition, -subtraction, multiplication. - -SSE -Introduce eight/sixteen 128 bit registers (XMM0-XMM7/15) and instruction to work with four single precision floating -point operands. Add integer operations on MMX registers too. (The MMX-integer part of SSE is sometimes called MMXEXT, -and was implemented on a few non-Intel CPUs without xmm registers and the floating point part of SSE.) - -SSE2 -Introduces instruction to work with 2 double precision floating point operands, and with packed byte/word/dword/qword -integers in 128-bit xmm registers. - -SSE3 -Add a few varied instructions (mostly floating point), including a special kind of unaligned load (lddqu) that was -better on Pentium 4, synchronization instruction, horizontal add/sub. - -SSSE3 -Again a varied set of instructions, mostly integer. The first shuffle that takes its control operand from a register -instead of hard-coded (pshufb). More horizontal processing, shuffle, packing/unpacking, mul+add on bytes, and some -specialized integer add/mul stuff. - -SSE4 (SSE4.1, SSE4.2) -Add a lot of instructions: Filling in a lot of the gaps by providing min and max and other operations for all integer -data types (especially 32-bit integer had been lacking), where previously integer min was only available for unsigned -bytes and signed 16-bit. Also scaling, FP rounding, blending, linear algebra operation, text processing, comparisons. -Also a non temporal load for reading video memory, or copying it back to main memory. (Previously only NT stores were -available.) - -AESNI -Add support for accelerating AES symmetric encryption/decryption. - -AVX Add eight/sixteen 256 bit registers (YMM0-YMM7/15). -Support all previous floating point datatype. Three operand instructions. - -FMA -Add Fused Multiply Add and correlated instructions. - -AVX2 -Add support for integer data types. - -AVX512F -Add eight/thirty-two 512 bit registers (ZMM0-ZMM7/31) and eight 64-bit mask register (k0-k7). Promote most previous -instruction to 512 bit wide. Optional parts of AVX512 add instruction for exponentials & reciprocals (AVX512ER), -scatter/gather prefetching (AVX512PF), scatter conflict detection (AVX512CD), compress, expand. - -IMCI (Intel Xeon Phi) -Early development of AVX512 for the first-gen Intel Xeon Phi (Knight's Corner) coprocessor. -*/ - -#ifndef __AVX__ - #define __AVX__ 0 -#endif - -#ifndef __AVX2__ - #define __AVX2__ 0 -#endif - -#ifndef __SSE__ - #define __SSE__ 0 -#endif - -#ifndef __SSE2__ - #define __SSE2__ 0 -#endif - -#ifndef __SSE2_MATH__ - #define __SSE2_MATH__ 0 -#endif - -#ifndef __SSE3__ - #define __SSE3__ 0 -#endif - -#ifndef __SSE4_1__ - #define __SSE4_1__ 0 -#endif - -#ifndef __SSE4_2__ - #define __SSE4_2__ 0 -#endif - -#ifndef __SSE_MATH__ - #define __SSE_MATH__ 0 -#endif - -#ifndef __SSSE3__ - #define __SSSE3__ 0 -#endif - -#endif \ No newline at end of file diff --git a/Utils/MathUtils.h b/Utils/MathUtils.h index 82bfd3b..6c85876 100755 --- a/Utils/MathUtils.h +++ b/Utils/MathUtils.h @@ -10,6 +10,8 @@ #ifndef UTILS_MATH_UTILS_H #define UTILS_MATH_UTILS_H +#include + #define OMS_PI 3.14159265358979323846 #define oms_max(a, b) ((a) > (b) ? (a) : (b)) @@ -17,5 +19,6 @@ #define oms_abs(a) ((a) > 0 ? (a) : -(a)) #define oms_deg2rad(angle) ((angle) * OMS_PI / 180.0) #define oms_rad2deg(angle) ((angle) * 180.0 / OMS_PI) +#define round_to_nearest(a, b) (((a) + ((b) - 1)) & ~((b) - 1)) #endif diff --git a/Utils/StringUtils.h b/Utils/StringUtils.h index 435cb7f..0e97226 100755 --- a/Utils/StringUtils.h +++ b/Utils/StringUtils.h @@ -14,6 +14,7 @@ #include #include +#include "../Stdlib/Types.h" #include "ArraySort.h" #include "MathUtils.h" @@ -21,8 +22,6 @@ namespace Utils::StringUtils { char *search_replace(const char *haystack, const char *needle, const char *replace) { - const char *haystackT = haystack; - size_t i; size_t match = 0; size_t oldLength = strlen(needle); @@ -178,8 +177,8 @@ namespace Utils::StringUtils fprintf(stderr, "CRITICAL: malloc failed"); } - int i = 0; - int j = 0; + size_t i = 0; + size_t j = 0; /* Handled with calloc for (j = 0; j <= toSize; ++j) { @@ -320,6 +319,57 @@ namespace Utils::StringUtils return token_start; } + + inline + void format_number_render(int length, char* buffer, const char thousands = ',') + { + int count = (int) (length / 3) - (length % 3 == 0 ? 1 : 0); + + int j = -1; + for (int i = length; i > 0; --i) { + ++j; + + if (j % 3 == 0 && j != 0) { + buffer[i + count] = buffer[i]; + --count; + buffer[i + count] = thousands; + } else { + buffer[i + count] = buffer[i]; + } + } + } + + char* format_number(size_t number, char* buffer, const char thousands = ',') + { + int length = snprintf(buffer, 32, "%zu", number); + format_number_render(length, buffer, thousands); + + return buffer; + } + + char * format_number(int number, char* buffer, const char thousands = ',') + { + int length = snprintf(buffer, 32, "%i", number); + format_number_render(length, buffer, thousands); + + return buffer; + } + + void create_const_name(const unsigned char *name, unsigned char* modified_name) + { + // Print block + if (name == NULL) { + modified_name = NULL; + } else { + size_t i; + const size_t length = strlen((const char *) name); + for (i = 0; i < length; ++i) { + modified_name[i] = name[i] == ' ' ? '_' : (unsigned char) toupper(name[i]); + } + + modified_name[i] = '\0'; + } + } } // namespace Utils::StringUtils #endif \ No newline at end of file diff --git a/Utils/WebUtils.h b/Utils/WebUtils.h index 9cd6172..c08f501 100755 --- a/Utils/WebUtils.h +++ b/Utils/WebUtils.h @@ -6,6 +6,10 @@ * @license OMS License 1.0 * @version 1.0.0 * @link https://jingga.app + * + * DEPENDENCIES: + * 1. curl + * 2. libxml */ #ifndef UTILS_WEB_UTILS_H #define UTILS_WEB_UTILS_H diff --git a/tests/Stdlib/SIMD/SIMD_F32Test.cpp b/tests/Stdlib/SIMD/SIMD_F32Test.cpp index b00b213..f423ca0 100644 --- a/tests/Stdlib/SIMD/SIMD_F32Test.cpp +++ b/tests/Stdlib/SIMD/SIMD_F32Test.cpp @@ -50,7 +50,7 @@ int test_operator_plus() { printf("\noperator+:\n"); printf("[4]: "); - if (!Stdlib::SIMD::is_avx_supported()) { + if (!Stdlib::SIMD::is_sse_supported()) { printf("[\033[33mNot supported\033[0m]"); return 0; @@ -69,6 +69,7 @@ int test_operator_plus() expected_array_4[1] = 2.0f; expected_array_4[2] = 4.0f; expected_array_4[3] = 6.0f; + Stdlib::SIMD::f32_4_simd expected_simd_4 = Stdlib::SIMD::load_f32_4_simd(expected_array_4); Stdlib::SIMD::f32_4_simd a_simd_4 = Stdlib::SIMD::load_f32_4_simd(a_array_4); @@ -117,6 +118,7 @@ int test_operator_plus() expected_array_8[5] = 2.0f; expected_array_8[6] = 4.0f; expected_array_8[7] = 6.0f; + Stdlib::SIMD::f32_8_simd expected_simd_8 = Stdlib::SIMD::load_f32_8_simd(expected_array_8); Stdlib::SIMD::f32_8_simd a_simd_8 = Stdlib::SIMD::load_f32_8_simd(a_array_8); @@ -193,6 +195,7 @@ int test_operator_plus() expected_array_16[13] = 2.0f; expected_array_16[14] = 4.0f; expected_array_16[15] = 6.0f; + Stdlib::SIMD::f32_16_simd expected_simd_16 = Stdlib::SIMD::load_f32_16_simd(expected_array_16); Stdlib::SIMD::f32_16_simd a_simd_16 = Stdlib::SIMD::load_f32_16_simd(a_array_16); @@ -226,7 +229,7 @@ int test_operator_minus() { printf("\noperator-:\n"); printf("[4]: "); - if (!Stdlib::SIMD::is_avx_supported()) { + if (!Stdlib::SIMD::is_sse_supported()) { printf("[\033[33mNot supported\033[0m]"); return 0; @@ -245,6 +248,7 @@ int test_operator_minus() expected_array_4[1] = 0.0f; expected_array_4[2] = 1.0f; expected_array_4[3] = 2.0f; + Stdlib::SIMD::f32_4_simd expected_simd_4 = Stdlib::SIMD::load_f32_4_simd(expected_array_4); Stdlib::SIMD::f32_4_simd a_simd_4 = Stdlib::SIMD::load_f32_4_simd(a_array_4); @@ -293,6 +297,7 @@ int test_operator_minus() expected_array_8[5] = 0.0f; expected_array_8[6] = 1.0f; expected_array_8[7] = 2.0f; + Stdlib::SIMD::f32_8_simd expected_simd_8 = Stdlib::SIMD::load_f32_8_simd(expected_array_8); Stdlib::SIMD::f32_8_simd a_simd_8 = Stdlib::SIMD::load_f32_8_simd(a_array_8); @@ -369,6 +374,7 @@ int test_operator_minus() expected_array_16[13] = 0.0f; expected_array_16[14] = 1.0f; expected_array_16[15] = 2.0f; + Stdlib::SIMD::f32_16_simd expected_simd_16 = Stdlib::SIMD::load_f32_16_simd(expected_array_16); Stdlib::SIMD::f32_16_simd a_simd_16 = Stdlib::SIMD::load_f32_16_simd(a_array_16); @@ -402,7 +408,7 @@ int test_operator_mul() { printf("\noperator*:\n"); printf("[4]: "); - if (!Stdlib::SIMD::is_avx_supported()) { + if (!Stdlib::SIMD::is_sse_supported()) { printf("[\033[33mNot supported\033[0m]"); return 0; @@ -421,6 +427,7 @@ int test_operator_mul() expected_array_4[1] = 1.0f; expected_array_4[2] = 4.0f; expected_array_4[3] = 9.0f; + Stdlib::SIMD::f32_4_simd expected_simd_4 = Stdlib::SIMD::load_f32_4_simd(expected_array_4); Stdlib::SIMD::f32_4_simd a_simd_4 = Stdlib::SIMD::load_f32_4_simd(a_array_4); @@ -469,6 +476,7 @@ int test_operator_mul() expected_array_8[5] = 1.0f; expected_array_8[6] = 4.0f; expected_array_8[7] = 9.0f; + Stdlib::SIMD::f32_8_simd expected_simd_8 = Stdlib::SIMD::load_f32_8_simd(expected_array_8); Stdlib::SIMD::f32_8_simd a_simd_8 = Stdlib::SIMD::load_f32_8_simd(a_array_8); @@ -545,6 +553,7 @@ int test_operator_mul() expected_array_16[13] = 1.0f; expected_array_16[14] = 4.0f; expected_array_16[15] = 9.0f; + Stdlib::SIMD::f32_16_simd expected_simd_16 = Stdlib::SIMD::load_f32_16_simd(expected_array_16); Stdlib::SIMD::f32_16_simd a_simd_16 = Stdlib::SIMD::load_f32_16_simd(a_array_16); diff --git a/tests/Stdlib/SIMD/SIMD_HelperTest.cpp b/tests/Stdlib/SIMD/SIMD_HelperTest.cpp index 28ab416..f3cbfe6 100644 --- a/tests/Stdlib/SIMD/SIMD_HelperTest.cpp +++ b/tests/Stdlib/SIMD/SIMD_HelperTest.cpp @@ -17,8 +17,8 @@ int main(int argc, char **argv) { printf("SIMD_Helper:\n"); - if (Stdlib::SIMD::is_avx_supported()) { - printf("\nAVX is supported"); + if (Stdlib::SIMD::is_sse_supported()) { + printf("\nSSE is supported"); } else { printf("\033[33m\nAVX is NOT supported\033[0m"); }