luajit: revert all holylib changes since here we want to match gmod!

Author: RaphaelIT7

.github/workflows/buildjit.yml

@@ -30,13 +30,6 @@ jobs:
           path: LuaJIT-2.1/src/lua51_64.lib
           retention-days: 1
 
-      - uses: actions/upload-artifact@v4
-        name: Upload luajit executable (64x)
-        with:
-          name: luajit.exe (64x)
-          path: LuaJIT-2.1/src/luajit.exe
-          retention-days: 1
-
       - uses: actions/upload-artifact@v4
         if: false
         name: Upload luajit.lib
@@ -69,18 +62,11 @@ jobs:
           path: LuaJIT-2.1/src/lua51_32.lib
           retention-days: 1
 
-      - uses: actions/upload-artifact@v4
-        name: Upload luajit executable (32x)
-        with:
-          name: luajit.exe
-          path: LuaJIT-2.1/src/luajit.exe
-          retention-days: 1
-
       - uses: actions/upload-artifact@v4
         if: false
         name: Upload luajit.lib
         with:
-          name: luajit_32.lib (32x)
+          name: luajit_32.lib
           path: LuaJIT-2.1/src/luajit_32.lib
           retention-days: 1
 
@@ -110,13 +96,6 @@ jobs:
           path: LuaJIT-2.1/src/libluajit_64.a
           retention-days: 1
 
-      - uses: actions/upload-artifact@v4
-        name: Upload luajit executable (64x)
-        with:
-          name: luajit (64x)
-          path: LuaJIT-2.1/src/luajit
-          retention-days: 1
-
   build-linux-32:
     runs-on: ubuntu-latest
     container: debian:bullseye
@@ -142,11 +121,4 @@ jobs:
         with:
           name: libluajit_32.a
           path: LuaJIT-2.1/src/libluajit_32.a
-          retention-days: 1
-
-      - uses: actions/upload-artifact@v4
-        name: Upload luajit executable (32x)
-        with:
-          name: luajit (32x)
-          path: LuaJIT-2.1/src/luajit
           retention-days: 1

.gitignore

@@ -9,5 +9,4 @@ development/
 lua-shared.vpc.sentinel
 Bootil/projects/Makefile
 Bootil/projects/**/*.lib
-Bootil/projects/**/*.a
-LuaJIT-2.1/src/.vs/**
+Bootil/projects/**/*.a

LuaJIT-2.1/src/gmod.cpp

@@ -1,9 +1,4 @@
-extern "C"
-{
-	#include "gmod.h"
-	#include "lua.h"
-}
-#include "stdio.h"
+#include "gmod.h"
 
 namespace std
 {
@@ -205,37 +200,18 @@ extern "C" void lua_init_stack_gmod(lua_State* L1, lua_State* L)
 	}
 }
 
-extern "C" void GMOD_LuaPrint(const char* str, lua_State* L) // Should be how gmod does it
+extern "C" void GMOD_LuaPrint(const char* str, lua_State* L) // Idk how gmod does it
 {
-	if (!L->luabase) // except for this, gmod doesn't do this, but we do making testing jit less of a pain
-	{
-		printf(str);
-		return;
-	}
-
 	((ILuaInterface*)L->luabase)->Msg("%s", str);
 }
 
-struct UserData {
-	void* data;
-	unsigned char type;
-};
-
 extern "C" void GMOD_LuaCreateEmptyUserdata(lua_State* L)
 {
 	//ILuaBase::UserData* udata = (ILuaBase::UserData*)((ILuaBase*)L->luabase)->NewUserdata(sizeof(ILuaBase::UserData)); // Gmod uses CLuaInterface::PushUserType(NULL, 7) Instead
 	//udata->data = nullptr;
 	//udata->type = 7; // 7 = Userdata
 
 	//return udata;
-
-	if (!L->luabase) // just to make testing easier. Gmod doesn't have this.
-	{
-		UserData* pData = (UserData*)lua_newuserdata(L, sizeof(ILuaBase::UserData));
-		pData->data = nullptr;
-		pData->type = 7;
-		return;
-	}
 
 
 	((ILuaBase*)L->luabase)->PushUserType(NULL, 7);

LuaJIT-2.1/src/lib_base.c

@@ -141,7 +141,6 @@ LJLIB_ASM(setmetatable)		LJLIB_REC(.)
   return FFH_RES(1);
 }
 
-void blockDebug(lua_State* L, GCfunc* func);
 LJLIB_CF(getfenv)		LJLIB_REC(.)
 {
   GCfunc *fn;
@@ -156,7 +155,6 @@ LJLIB_CF(getfenv)		LJLIB_REC(.)
     if (LJ_FR2) o--;
   }
   fn = &gcval(o)->fn;
-  blockDebug(L, fn);
   settabV(L, L->top++, isluafunc(fn) ? tabref(fn->l.env) : tabref(L->env));
   return 1;
 }
@@ -183,7 +181,6 @@ LJLIB_CF(setfenv)
   fn = &gcval(o)->fn;
   if (!isluafunc(fn))
     lj_err_caller(L, LJ_ERR_SETFENV);
-  blockDebug(L, fn);
   setgcref(fn->l.env, obj2gco(t));
   lj_gc_objbarrier(L, obj2gco(fn), t);
   setfuncV(L, L->top++, fn);

LuaJIT-2.1/src/lib_debug.c

@@ -31,10 +31,7 @@ LJLIB_CF(debug_getregistry)
 
 LJLIB_CF(debug_getmetatable)	LJLIB_REC(.)
 {
-  TValue* o = lj_lib_checkany(L, 1);
-  if (o && tviscdata(o))
-    lj_err_arg(L, 1, LJ_ERR_DENYCDATA);
-
+  lj_lib_checkany(L, 1);
   if (!lua_getmetatable(L, 1)) {
     setnilV(L->top-1);
   }
@@ -43,10 +40,6 @@ LJLIB_CF(debug_getmetatable)	LJLIB_REC(.)
 
 LJLIB_CF(debug_setmetatable)
 {
-  TValue* o = lj_lib_checkany(L, 1);
-  if (o && tviscdata(o))
-    lj_err_arg(L, 1, LJ_ERR_DENYCDATA);
-
   lj_lib_checktabornil(L, 2);
   L->top = L->base+2;
   lua_setmetatable(L, 1);
@@ -56,26 +49,15 @@ LJLIB_CF(debug_setmetatable)
   return 1;
 }
 
-void blockDebug(lua_State* L, GCfunc* func)
-{
-  if (func && isblockdebug(func->c))
-    lj_err_arg(L, 1, LJ_ERR_BLOCKDEBUG);
-}
-
 LJLIB_CF(debug_getfenv)
 {
-  TValue* o = lj_lib_checkany(L, 1);
-  if (o && tvisfunc(o))
-    blockDebug(L, o);
+  lj_lib_checkany(L, 1);
   lua_getfenv(L, 1);
   return 1;
 }
 
 LJLIB_CF(debug_setfenv)
 {
-  TValue* o = lj_lib_checkany(L, 1);
-  if (o && tvisfunc(o))
-    blockDebug(L, o);
   lj_lib_checktab(L, 2);
   L->top = L->base+2;
   if (!lua_setfenv(L, 1))
@@ -220,7 +202,7 @@ static int debug_getupvalue(lua_State *L, int get)
 {
   int32_t n = lj_lib_checkint(L, 2);
   const char *name;
-  blockDebug(L, lj_lib_checkfunc(L, 1));
+  lj_lib_checkfunc(L, 1);
   name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
   if (name) {
     lua_pushstring(L, name);
@@ -246,7 +228,6 @@ LJLIB_CF(debug_setupvalue)
 LJLIB_CF(debug_upvalueid)
 {
   GCfunc *fn = lj_lib_checkfunc(L, 1);
-  blockDebug(L, fn);
   int32_t n = lj_lib_checkint(L, 2) - 1;
   if ((uint32_t)n >= fn->l.nupvalues)
     lj_err_arg(L, 2, LJ_ERR_IDXRNG);
@@ -263,7 +244,6 @@ LJLIB_CF(debug_upvaluejoin)
   for (i = 0; i < 2; i++) {
     int32_t n;
     fn[i] = lj_lib_checkfunc(L, 2*i+1);
-    blockDebug(L, fn[i]);
     if (!isluafunc(fn[i]))
       lj_err_arg(L, 2*i+1, LJ_ERR_NOLFUNC);
     n = lj_lib_checkint(L, 2*i+2) - 1;

LuaJIT-2.1/src/lib_jit.c

@@ -610,7 +610,7 @@ LJLIB_CF(jit_profile_dumpstack)
 
 #include "lj_libdef.h"
 
-LUALIB_API int luaopen_jit_profile(lua_State *L)
+static int luaopen_jit_profile(lua_State *L)
 {
   LJ_LIB_REG(L, NULL, jit_profile);
   return 1;

LuaJIT-2.1/src/lib_table.c

@@ -286,24 +286,6 @@ LJLIB_CF(table_pack)
 }
 #endif
 
-LJLIB_CF(table_setreadonly)
-{
-  GCtab *t = lj_lib_checktab(L, 1);
-  int readOnly = lj_lib_checkint(L, 2) != 0;
-  
-  lj_tab_setreadonly(t, readOnly);
-  return 0;
-}
-
-LJLIB_CF(table_isreadonly)
-{
-  GCtab *t = lj_lib_checktab(L, 1);
-  int readOnly = lj_lib_checkint(L, 2) != 0;
-  
-  lua_pushboolean(L, lj_tab_isreadonly(t));
-  return 1;
-}
-
 LJLIB_NOREG LJLIB_CF(table_new)		LJLIB_REC(.)
 {
   int32_t a = lj_lib_checkint(L, 1);
@@ -314,7 +296,7 @@ LJLIB_NOREG LJLIB_CF(table_new)		LJLIB_REC(.)
 
 LJLIB_NOREG LJLIB_CF(table_clear)	LJLIB_REC(.)
 {
-  lj_tab_clear(L, lj_lib_checktab(L, 1));
+  lj_tab_clear(lj_lib_checktab(L, 1));
   return 0;
 }
 

LuaJIT-2.1/src/lj_api.c

@@ -26,9 +26,6 @@
 #include "lj_strscan.h"
 #include "lj_strfmt.h"
 
-#include "lj_ctype.h"
-#include "lj_cconv.h"
-
 /* -- Common helper functions --------------------------------------------- */
 
 #define lj_checkapi_slot(idx) \
@@ -233,18 +230,16 @@ LUA_API int lua_type(lua_State *L, int idx)
 #endif
   } else if (o == niltv(L)) {
     return LUA_TNONE;
-  } else if(tviscdata(o)) {
-    return LUA_TUSERDATA; // we would return 10 which conflicts with gmod!
-  }  /* Magic internal/external tag conversion. ORDER LJ_T */
-  
-  uint32_t t = ~itype(o);
+  } else {  /* Magic internal/external tag conversion. ORDER LJ_T */
+    uint32_t t = ~itype(o);
 #if LJ_64
-  int tt = (int)((U64x(75a06,98042110) >> 4*t) & 15u);
+    int tt = (int)((U64x(75a06,98042110) >> 4*t) & 15u);
 #else
-  int tt = (int)(((t < 8 ? 0x98042110u : 0x75a06u) >> 4*(t&7)) & 15u);
+    int tt = (int)(((t < 8 ? 0x98042110u : 0x75a06u) >> 4*(t&7)) & 15u);
 #endif
-  lj_assertL(tt != LUA_TNIL || tvisnil(o), "bad tag conversion");
-  return tt;
+    lj_assertL(tt != LUA_TNIL || tvisnil(o), "bad tag conversion");
+    return tt;
+  }
 }
 
 LUALIB_API void luaL_checktype(lua_State *L, int idx, int tt)
@@ -262,37 +257,25 @@ LUALIB_API void luaL_checkany(lua_State *L, int idx)
 // Based off https://github.com/meepen/gluajit/blob/master/src/lj_api.c#L225-L247
 /*extern "C"*/ const char* GMODLUA_GetUserType(lua_State* L, int iStackPos)
 {
-  static char strName[128];
-  const char* strTypeName = "UserData";
-  cTValue *o = index2adr(L, iStackPos);
-  GCtab *mt = NULL;
-  if (tvistab(o))
-    mt = tabref(tabV(o)->metatable);
-  else if (tvisudata(o))
-    mt = tabref(udataV(o)->metatable);
-  else if (tviscdata(o))
-  {
-    strTypeName = "cdata";
-    CTState *cts = ctype_cts(L);
-    CType *ct = ctype_raw(cts, cdataV(o)->ctypeid);
-    mt = tabV(lj_tab_getinth(cts->miscmap, -(int32_t)ctype_typeid(cts, ct)));
-  } else
-    mt = tabref(basemt_obj(G(L), o));
+	static char strName[128];
+	const char* strTypeName = "UserData";
+	if (lua_getmetatable(L, iStackPos))
+	{
+		lua_pushstring(L, "MetaName");
+		lua_gettable(L, -2);
 
-  if (mt)
-  {
-    GCstr* str = lj_str_newlit(L, "MetaName");
-    cTValue* val = lj_tab_getstr(mt, str);
-    // lj_str_free(G(L), str); // Lua GC takes care of our string
+		if (lua_isstring(L, -1))
+		{
+			strncpy(strName, lua_tostring(L, -1), sizeof(strName));
+			strTypeName = strName;
+		}
 
-    if (val && tvisstr(val))
-    {
-      strncpy(strName, strdata(strV(val)), sizeof(strName));
-      strTypeName = strName;
-    }
-  }
+		lua_pop(L, 1);
+	}
+
+	lua_pop(L, 1);
 
-  return strTypeName;
+	return strTypeName;
 }
 
 LUA_API const char *lua_typename(lua_State *L, int t, int stackpos)

LuaJIT-2.1/src/lj_cdata.c

@@ -43,7 +43,7 @@ GCcdata *lj_cdata_newv(lua_State *L, CTypeID id, CTSize sz, CTSize align)
   setgcrefr(cd->nextgc, g->gc.root);
   setgcref(g->gc.root, obj2gco(cd));
   newwhite(g, obj2gco(cd));
-  cd->marked |= LJ_GC_ISCDATA;
+  cd->marked |= 0x80;
   cd->gct = ~LJ_TCDATA;
   cd->ctypeid = id;
   return cd;

LuaJIT-2.1/src/lj_errmsg.h

@@ -21,7 +21,6 @@ ERRDEF(TABOV,	"table overflow")
 ERRDEF(NANIDX,	"table index is NaN")
 ERRDEF(NILIDX,	"table index is nil")
 ERRDEF(NEXTIDX,	"invalid key to " LUA_QL("next"))
-ERRDEF(READONLY, "table is in read only")
 
 /* Metamethod resolving. */
 ERRDEF(BADCALL,	"attempt to call a %s value")
@@ -42,7 +41,6 @@ ERRDEF(BADSELF,	"calling " LUA_QS " on bad self (%s)")
 ERRDEF(BADARG,	"bad argument #%d to " LUA_QS " (%s)")
 ERRDEF(BADTYPE,	"%s expected, got %s")
 ERRDEF(BADVAL,	"invalid value")
-ERRDEF(DENYCDATA, "cdata is not allowed to be used here")
 ERRDEF(NOVAL,	"value expected")
 ERRDEF(NOCORO,	"coroutine expected")
 ERRDEF(NOTABN,	"nil or table expected")
@@ -53,7 +51,6 @@ ERRDEF(NOPROXY,	"boolean or proxy expected")
 ERRDEF(FORINIT,	LUA_QL("for") " initial value must be a number")
 ERRDEF(FORLIM,	LUA_QL("for") " limit must be a number")
 ERRDEF(FORSTEP,	LUA_QL("for") " step must be a number")
-ERRDEF(BLOCKDEBUG, "function is marked to block any debug access")
 
 /* C API checks. */
 ERRDEF(NOENV,	"no calling environment")