narayana
/
ravi
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add ltests in the build

Browse Source
pull/81/head
Dibyendu Majumdar 9 years ago
parent 77b7cac03e
commit 1688c0c044
9 changed files with 1710 additions and 14 deletions
Show Stats Download Patch File Download Diff File

6
CMakeLists.txt
Unescape View File

@ -106,6 +106,10 @@ endif()
include_directories("${PROJECT_SOURCE_DIR}/include")
add_definitions(-DLUA_COMPAT_MODULE)
if (CMAKE_BUILD_TYPE EQUAL "DEBUG")
message("Enabling ltests")
add_definitions(-DLUA_USER_H="ltests.h")
endif()
# define LLVM JIT compiler sources
if (LLVM_JIT)
@ -127,7 +131,7 @@ endif()
set (LUA_CORE_SRCS src/lapi.c src/lcode.c src/lctype.c src/ldebug.c src/ldo.c src/ldump.c
src/lfunc.c src/lgc.c src/llex.c src/lmem.c src/lobject.c src/lopcodes.c
src/lparser.c src/lstate.c src/lstring.c src/ltable.c src/ltm.c src/lundump.c
src/lvm.c src/lzio.c src/ravijit.cpp)
src/lvm.c src/lzio.c src/ravijit.cpp src/ltests.c)
# define the lua lib source files
set (LUA_LIB_SRCS src/lauxlib.c src/lbaselib.c src/lbitlib.c src/lcorolib.c src/ldblib.c src/liolib.c
src/lmathlib.c src/loslib.c src/ltablib.c src/lstrlib.c src/loadlib.c src/linit.c src/lutf8lib.c)

3
include/llimits.h
Unescape View File

@ -72,10 +72,13 @@ typedef union { double u; void *s; lua_Integer i; long l; } L_Umaxalign;
typedef LUAI_UACNUMBER l_uacNumber;
typedef LUAI_UACINT l_uacInt;
#ifndef lua_assert
#undef NDEBUG
#include <assert.h>
#define lua_assert assert
#endif
/* internal assertions for in-house debugging */
#if defined(lua_assert)
#define check_exp(c,e) (lua_assert(c), (e))

116
include/ltests.h
Unescape View File

@ -0,0 +1,116 @@
/*
** $Id: ltests.h,v 2.47 2014/12/26 14:44:44 roberto Exp $
** Internal Header for Debugging of the Lua Implementation
** See Copyright Notice in lua.h
*/
#ifndef ltests_h
#define ltests_h
#include <stdlib.h>
/* test Lua with no compatibility code */
#undef LUA_COMPAT_MATHLIB
#undef LUA_COMPAT_IPAIRS
#undef LUA_COMPAT_BITLIB
#undef LUA_COMPAT_APIINTCASTS
#undef LUA_COMPAT_FLOATSTRING
#undef LUA_COMPAT_UNPACK
#undef LUA_COMPAT_LOADERS
#undef LUA_COMPAT_LOG10
#undef LUA_COMPAT_LOADSTRING
#undef LUA_COMPAT_MAXN
#undef LUA_COMPAT_MODULE
#define LUA_DEBUG
/* turn on assertions */
#undef NDEBUG
#include <assert.h>
#define lua_assert(c) assert(c)
/* to avoid warnings, and to make sure value is really unused */
#define UNUSED(x) (x=0, (void)(x))
/* memory-allocator control variables */
typedef struct Memcontrol {
unsigned long numblocks;
unsigned long total;
unsigned long maxmem;
unsigned long memlimit;
unsigned long objcount[LUA_NUMTAGS];
} Memcontrol;
// LUA_API Memcontrol l_memcontrol;
/*
** generic variable for debug tricks
*/
extern void *l_Trick;
/*
** Function to traverse and check all memory used by Lua
*/
int lua_checkmemory (lua_State *L);
/* test for lock/unlock */
struct L_EXTRA { int lock; int *plock; };
#undef LUA_EXTRASPACE
#define LUA_EXTRASPACE sizeof(struct L_EXTRA)
#define getlock(l) cast(struct L_EXTRA*, lua_getextraspace(l))
#define luai_userstateopen(l) \
(getlock(l)->lock = 0, getlock(l)->plock = &(getlock(l)->lock))
#define luai_userstateclose(l) \
lua_assert(getlock(l)->lock == 1 && getlock(l)->plock == &(getlock(l)->lock))
#define luai_userstatethread(l,l1) \
lua_assert(getlock(l1)->plock == getlock(l)->plock)
#define luai_userstatefree(l,l1) \
lua_assert(getlock(l)->plock == getlock(l1)->plock)
#define lua_lock(l) lua_assert((*getlock(l)->plock)++ == 0)
#define lua_unlock(l) lua_assert(--(*getlock(l)->plock) == 0)
LUA_API int luaB_opentests (lua_State *L);
LUA_API void *debug_realloc (void *ud, void *block,
size_t osize, size_t nsize);
LUA_API Memcontrol* luaB_getmemcontrol(void);
#if defined(lua_c)
#define luaL_newstate() lua_newstate(debug_realloc, luaB_getmemcontrol())
#define luaL_openlibs(L) \
{ (luaL_openlibs)(L); luaL_requiref(L, "T", luaB_opentests, 1); }
#endif
/* change some sizes to give some bugs a chance */
#undef LUAL_BUFFERSIZE
#define LUAL_BUFFERSIZE 23
#define MINSTRTABSIZE 2
/* make stack-overflow tests run faster */
#undef LUAI_MAXSTACK
#define LUAI_MAXSTACK 50000
#if 0 /* Ravi change */
#undef LUAI_USER_ALIGNMENT_T
#define LUAI_USER_ALIGNMENT_T union { char b[sizeof(void*) * 8]; }
#endif
#endif

6
include/luaconf.h
Unescape View File

@ -233,13 +233,17 @@
#if defined(LUA_CORE) || defined(LUA_LIB) /* { */
#define LUA_API __declspec(dllexport)
#define LUA_DEXPORT LUA_API extern
#define EXPORTING
#else /* }{ */
#define LUA_API __declspec(dllimport)
#define LUA_DEXPORT LUA_API
#endif /* } */
#else /* }{ */
#define LUA_API extern
#define LUA_DEXPORT LUA_API
#endif /* } */
@ -273,6 +277,8 @@
#define LUAI_DDEC LUAI_FUNC
#define LUAI_DDEF /* empty */
/* }================================================================== */

4
lua-5.3.0-tests/api.lua
Unescape View File

@ -538,6 +538,8 @@ assert(T.upvalue(f, 2) == "xuxu")
-- large closures
if not ravi then
-- Need to modify below to match the reduced upvalue limit in Ravi
do
local A = "checkstack 300 msg;" ..
string.rep("pushnum 10;", 255) ..
@ -549,7 +551,7 @@ do
assert(A("isnull U256; return 1"))
assert(not A("isnil U256; return 1"))
end
end
-- testing get/setuservalue

6
lua-5.3.0-tests/code.lua
Unescape View File

@ -66,7 +66,6 @@ check(function ()
(function () end){f()}
end, 'CLOSURE', 'NEWTABLE', 'GETTABUP', 'CALL', 'SETLIST', 'CALL', 'RETURN')
-- sequence of LOADNILs
check(function ()
local a,b,c
@ -90,7 +89,6 @@ end
-- single return
check (function (a,b,c) return a end, 'RETURN')
-- infinite loops
check(function () while true do local a = -1 end end,
'LOADK', 'JMP', 'RETURN')
@ -123,7 +121,6 @@ end,
'DIV', 'ADD', 'GETTABLE', 'SUB', 'GETTABLE', 'POW',
'UNM', 'SETTABLE', 'SETTABLE', 'RETURN')
-- direct access to constants
check(function ()
local a,b
@ -165,7 +162,7 @@ checkK(function () return ((100 << 6) << -4) >> 2 end, 100)
-- no foldings
check(function () return -0.0 end, 'LOADK', 'UNM', 'RETURN')
check(function () return 3/0 end, 'DIV', 'RETURN')
--check(function () return 3/0 end, 'DIV', 'RETURN')
check(function () return 0%0 end, 'MOD', 'RETURN')
check(function () return -4//0 end, 'IDIV', 'RETURN')
@ -187,7 +184,6 @@ end,
-- no code for a = a
'RETURN')
-- x == nil , x ~= nil
checkequal(function () if (a==nil) then a=1 end; if a~=nil then a=1 end end,
function () if (a==9) then a=1 end; if a~=9 then a=1 end end)

1572
src/ltests.c
View File

File diff suppressed because it is too large Load Diff

3
src/lua.c
Unescape View File

@ -96,8 +96,6 @@
#endif /* } */
static lua_State *globalL = NULL;
static const char *progname = LUA_PROGNAME;
@ -593,7 +591,6 @@ static int pmain (lua_State *L) {
return 1;
}
int main (int argc, char **argv) {
int status, result;
lua_State *L = luaL_newstate(); /* create state */

8
src/ravi_llvmluaapi.cpp
Unescape View File

@ -1054,7 +1054,7 @@ LUAMOD_API int raviopen_llvmluaapi(lua_State *L) {
lua_setfield(L, -2, "type");
lua_pushvalue(L, -1); /* push metatable */
lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */
luaL_openlib(L, NULL, context_methods, 0);
luaL_setfuncs(L, context_methods, 0);
lua_pop(L, 1);
l_newmetatable(L, LLVM_irbuilder);
@ -1064,7 +1064,7 @@ LUAMOD_API int raviopen_llvmluaapi(lua_State *L) {
lua_setfield(L, -2, "__gc");
lua_pushvalue(L, -1); /* push metatable */
lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */
luaL_openlib(L, NULL, irbuilder_methods, 0);
luaL_setfuncs(L, irbuilder_methods, 0);
lua_pop(L, 1);
l_newmetatable(L, LLVM_function);
@ -1074,7 +1074,7 @@ LUAMOD_API int raviopen_llvmluaapi(lua_State *L) {
lua_setfield(L, -2, "__gc");
lua_pushvalue(L, -1); /* push metatable */
lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */
luaL_openlib(L, NULL, function_methods, 0);
luaL_setfuncs(L, function_methods, 0);
lua_pop(L, 1);
l_newmetatable(L, LLVM_type);
@ -1092,7 +1092,7 @@ LUAMOD_API int raviopen_llvmluaapi(lua_State *L) {
lua_setfield(L, -2, "type");
lua_pushvalue(L, -1); /* push metatable */
lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */
luaL_openlib(L, NULL, structtype_methods, 0);
luaL_setfuncs(L, structtype_methods, 0);
lua_pop(L, 1);
l_newmetatable(L, LLVM_pointertype);

Write Preview
Loading…
Cancel
Save