From 5ad28fbcafb4e04eceb53f98d2115fc36b00497d Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 31 Jan 2011 11:50:40 +0000
Subject: [PATCH] Fix some wrong C code, LuaJIT1.1 should now work again to
speedup the game!
git-svn-id: http://svn.net-core.org/repos/t-engine4@2580 51575b47-30f0-44d4-a5cc-537603b46e54
---
premake4.lua | 8 ++--
src/core_lua.c | 2 +-
src/lua/loadlib.c | 3 +-
src/lua/ltablib.c | 22 ----------
src/lua_externs.h | 2 +
src/lualanes/lanes.c | 1 +
src/luaprofiler/lua50_profiler.c | 2 +-
src/main.c | 70 ++++++++++++++++++++++----------
src/map.c | 1 +
src/music.c | 1 -
src/particles.c | 2 -
src/particles_gas.c | 29 ++-----------
src/physfs/zlib123/mzip.c | 3 +-
13 files changed, 67 insertions(+), 79 deletions(-)
diff --git a/premake4.lua b/premake4.lua
index 16181fc9ca..6e27489766 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -10,19 +10,20 @@ newoption {
}
newoption {
trigger = "force32bits",
- value = "VM_Type",
description = "Forces compilation in 32bits mode, allowing to use the lua jit",
}
newoption {
trigger = "relpath",
- value = "VM_Type",
description = "Links libraries relative to the application path for redistribution",
}
newoption {
trigger = "luaassert",
- value = "VM_Type",
description = "Enable lua asserts to debug lua C code",
}
+newoption {
+ trigger = "pedantic",
+ description = "Enables compiling with all pedantic options",
+}
_OPTIONS.lua = _OPTIONS.lua or "default"
@@ -75,6 +76,7 @@ configuration "Debug"
buildoptions { "-ggdb" }
targetdir "bin/Debug"
if _OPTIONS.luaassert then defines {"LUA_USE_APICHECK"} end
+ if _OPTIONS.pedantic then buildoptions { "-Wall" } end
configuration "Release"
defines { "NDEBUG=1" }
diff --git a/src/core_lua.c b/src/core_lua.c
index 3aebf0d78d..aced6a4c4a 100644
--- a/src/core_lua.c
+++ b/src/core_lua.c
@@ -1406,7 +1406,7 @@ static int get_text_aa(lua_State *L)
return 1;
}
-static sdl_get_modes_list(lua_State *L)
+static int sdl_get_modes_list(lua_State *L)
{
SDL_PixelFormat format;
SDL_Rect **modes;
diff --git a/src/lua/loadlib.c b/src/lua/loadlib.c
index c60bf4216e..7e1f2a4317 100644
--- a/src/lua/loadlib.c
+++ b/src/lua/loadlib.c
@@ -394,6 +394,7 @@ static int loader_Physfs (lua_State *L) {
return 1; /* library loaded successfully */
}
+#if 0 // UNUSED
static int loader_Lua (lua_State *L) {
const char *filename;
const char *name = luaL_checkstring(L, 1);
@@ -403,7 +404,7 @@ static int loader_Lua (lua_State *L) {
loaderror(L, filename);
return 1; /* library loaded successfully */
}
-
+#endif
static const char *mkfuncname (lua_State *L, const char *modname) {
const char *funcname;
diff --git a/src/lua/ltablib.c b/src/lua/ltablib.c
index 61e88922dd..64051fc5bb 100644
--- a/src/lua/ltablib.c
+++ b/src/lua/ltablib.c
@@ -169,28 +169,6 @@ static int tconcat (lua_State *L) {
** Addison-Wesley, 1993.)
*/
-static void stackDump (lua_State *L) {
- int i=lua_gettop(L);
- printf(" ---------------- Stack Dump ----------------\n" );
- while( i ) {
- int t = lua_type(L, i);
- switch (t) {
- case LUA_TSTRING:
- printf("%d:`%s'\n", i, lua_tostring(L, i));
- break;
- case LUA_TBOOLEAN:
- printf("%d: %s\n",i,lua_toboolean(L, i) ? "true" : "false");
- break;
- case LUA_TNUMBER:
- printf("%d: %g\n", i, lua_tonumber(L, i));
- break;
- default: printf("%d: %s\n", i, lua_typename(L, t)); break;
- }
- i--;
- }
- printf("--------------- Stack Dump Finished ---------------\n" );
-}
-
static void set2 (lua_State *L, int i, int j) {
lua_rawseti(L, 1, i);
lua_rawseti(L, 1, j);
diff --git a/src/lua_externs.h b/src/lua_externs.h
index aa96960b05..b0504d87bc 100644
--- a/src/lua_externs.h
+++ b/src/lua_externs.h
@@ -4,6 +4,8 @@ int luaopen_mime_core(lua_State *L);
int luaopen_profiler(lua_State *L);
int luaopen_lpeg(lua_State *L);
int luaopen_map(lua_State *L);
+int luaopen_fov(lua_State *L);
+int luaopen_gas(lua_State *L);
int luaopen_particles(lua_State *L);
int luaopen_sound(lua_State *L);
int luaopen_lanes(lua_State *L);
diff --git a/src/lualanes/lanes.c b/src/lualanes/lanes.c
index de4e123500..ddd183ee83 100644
--- a/src/lualanes/lanes.c
+++ b/src/lualanes/lanes.c
@@ -1,3 +1,4 @@
+ #include <pthread.h>
/*
* LANES.C Copyright (c) 2007-08, Asko Kauppi
*
diff --git a/src/luaprofiler/lua50_profiler.c b/src/luaprofiler/lua50_profiler.c
index 2fe49e3064..a679a1aee7 100644
--- a/src/luaprofiler/lua50_profiler.c
+++ b/src/luaprofiler/lua50_profiler.c
@@ -200,7 +200,7 @@ static float calcCallTime(lua_State *L) {
";
lprofC_start_timer(&timer);
- luaL_dostring(L, lua_code);
+ (void)luaL_dostring(L, lua_code);
return lprofC_get_seconds(timer) / (float) 100000;
}
diff --git a/src/main.c b/src/main.c
index 56424101db..fed455ca59 100644
--- a/src/main.c
+++ b/src/main.c
@@ -82,6 +82,28 @@ static int traceback (lua_State *L) {
return 1;
}
+static void stackDump (lua_State *L) {
+ int i=lua_gettop(L);
+ printf(" ---------------- Stack Dump ----------------\n" );
+ while( i ) {
+ int t = lua_type(L, i);
+ switch (t) {
+ case LUA_TSTRING:
+ printf("%d:`%s'\n", i, lua_tostring(L, i));
+ break;
+ case LUA_TBOOLEAN:
+ printf("%d: %s\n",i,lua_toboolean(L, i) ? "true" : "false");
+ break;
+ case LUA_TNUMBER:
+ printf("%d: %g\n", i, lua_tonumber(L, i));
+ break;
+ default: printf("%d: %s\n", i, lua_typename(L, t)); break;
+ }
+ i--;
+ }
+ printf("--------------- Stack Dump Finished ---------------\n" );
+}
+
int docall (lua_State *L, int narg, int nret)
{
// printf("<===%d\n", lua_gettop(L));
@@ -92,8 +114,13 @@ int docall (lua_State *L, int narg, int nret)
status = lua_pcall(L, narg, nret, base);
lua_remove(L, base); /* remove traceback function */
/* force a complete garbage collection in case of errors */
- if (status != 0) lua_gc(L, LUA_GCCOLLECT, 0);
+ if (status != 0) { lua_pop(L, 1); lua_gc(L, LUA_GCCOLLECT, 0); }
// printf(">===%d\n", lua_gettop(L));
+ if (lua_gettop(L) != nret)
+ {
+ stackDump(L);
+// assert(0);
+ }
return status;
}
@@ -103,16 +130,6 @@ int noprint(lua_State *L)
return 0;
}
-void display_utime()
-{
- struct timeval tv;
- struct timezone tz;
- struct tm *tm;
- gettimeofday(&tv, &tz);
- tm=localtime(&tv.tv_sec);
- printf(" %d:%02d:%02d %d \n", tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec);
-}
-
// define our data that is passed to our redraw function
typedef struct {
Uint32 color;
@@ -650,14 +667,17 @@ void boot_lua(int state, bool rebooting, int argc, char *argv[])
// Could not load bootstrap! Try to mount the engine from working directory as last resort
else
{
+ lua_pop(L, 1);
printf("WARNING: No bootstrap code found, defaulting to working directory for engine code!\n");
PHYSFS_mount("game/thirdparty", "/", 1);
PHYSFS_mount("game/", "/", 1);
}
// And run the lua engine pre init scripts
- luaL_loadfile(L, "/loader/pre-init.lua");
- docall(L, 0, 0);
+ if (!luaL_loadfile(L, "/loader/pre-init.lua"))
+ docall(L, 0, 0);
+ else
+ lua_pop(L, 1);
}
else if (state == 2)
{
@@ -667,15 +687,21 @@ void boot_lua(int state, bool rebooting, int argc, char *argv[])
luaopen_lanes(L);
// And run the lua engine scripts
- luaL_loadfile(L, "/loader/init.lua");
- if (reboot_engine) lua_pushstring(L, reboot_engine); else lua_pushnil(L);
- if (reboot_engine_version) lua_pushstring(L, reboot_engine_version); else lua_pushnil(L);
- if (reboot_module) lua_pushstring(L, reboot_module); else lua_pushnil(L);
- if (reboot_name) lua_pushstring(L, reboot_name); else lua_pushnil(L);
- lua_pushboolean(L, reboot_new);
- if (reboot_einfo) lua_pushstring(L, reboot_einfo); else lua_pushnil(L);
- if (request_profile) lua_pushstring(L, request_profile); else lua_pushnil(L);
- docall(L, 7, 0);
+ if (!luaL_loadfile(L, "/loader/init.lua"))
+ {
+ if (reboot_engine) lua_pushstring(L, reboot_engine); else lua_pushnil(L);
+ if (reboot_engine_version) lua_pushstring(L, reboot_engine_version); else lua_pushnil(L);
+ if (reboot_module) lua_pushstring(L, reboot_module); else lua_pushnil(L);
+ if (reboot_name) lua_pushstring(L, reboot_name); else lua_pushnil(L);
+ lua_pushboolean(L, reboot_new);
+ if (reboot_einfo) lua_pushstring(L, reboot_einfo); else lua_pushnil(L);
+ if (request_profile) lua_pushstring(L, request_profile); else lua_pushnil(L);
+ docall(L, 7, 0);
+ }
+ else
+ {
+ lua_pop(L, 1);
+ }
}
}
diff --git a/src/map.c b/src/map.c
index d9eb6e724b..d8a82b8e11 100644
--- a/src/map.c
+++ b/src/map.c
@@ -167,6 +167,7 @@ static int map_object_reset_move_anim(lua_State *L)
{
map_object *obj = (map_object*)auxiliar_checkclass(L, "core{mapobj}", 1);
obj->move_max = 0;
+ return 0;
}
static int map_object_set_move_anim(lua_State *L)
diff --git a/src/music.c b/src/music.c
index cc33c88369..36092bdb48 100644
--- a/src/music.c
+++ b/src/music.c
@@ -66,7 +66,6 @@ static int music_play(lua_State *L)
int loop = lua_isnumber(L, 2) ? lua_tonumber(L, 2) : 1;
int fadein = lua_isnumber(L, 3) ? lua_tonumber(L, 3) : 0;
- printf("play music %x %d %d\n", (unsigned int)(*m), loop, fadein);
lua_pushboolean(L, (Mix_FadeInMusic(*m, loop, fadein) == -1) ? FALSE : TRUE);
return 1;
}
diff --git a/src/particles.c b/src/particles.c
index 62a233c2b3..e05be65975 100644
--- a/src/particles.c
+++ b/src/particles.c
@@ -282,7 +282,6 @@ static int particles_to_screen(lua_State *L)
int y = luaL_checknumber(L, 3);
bool show = lua_toboolean(L, 4);
float zoom = luaL_checknumber(L, 5);
- int kf;
int w = 0;
int i, j;
bool alive = FALSE;
@@ -383,7 +382,6 @@ static int particles_update(lua_State *L)
{
particles_type *ps = (particles_type*)auxiliar_checkclass(L, "core{particles}", 1);
int w = 0;
- int i, j;
bool alive = FALSE;
for (w = 0; w < ps->nb; w++)
diff --git a/src/particles_gas.c b/src/particles_gas.c
index 0480195bfd..793f2fc2a9 100644
--- a/src/particles_gas.c
+++ b/src/particles_gas.c
@@ -31,26 +31,6 @@
#define rng(x, y) (x + rand_div(1 + y - x))
-static void getinitfield(lua_State *L, const char *key, int *min, int *max)
-{
- lua_pushstring(L, key);
- lua_gettable(L, -2);
-
- lua_pushnumber(L, 1);
- lua_gettable(L, -2);
- *min = (int)lua_tonumber(L, -1);
- lua_pop(L, 1);
-
- lua_pushnumber(L, 2);
- lua_gettable(L, -2);
- *max = (int)lua_tonumber(L, -1);
- lua_pop(L, 1);
-
-// printf("%s :: %d %d\n", key, (int)*min, (int)*max);
-
- lua_pop(L, 1);
-}
-
static void getparticulefield(lua_State *L, const char *k, float *v)
{
lua_pushstring(L, k);
@@ -64,7 +44,7 @@ static int gas_new(lua_State *L)
{
int w = luaL_checknumber(L, 1);
int h = luaL_checknumber(L, 2);
- int density = luaL_checknumber(L, 3);
+// int density = luaL_checknumber(L, 3);
GLuint *t = (GLuint*)auxiliar_checkclass(L, "gl{texture}", 5);
int t_ref = luaL_ref(L, LUA_REGISTRYINDEX);
int p_ref = luaL_ref(L, LUA_REGISTRYINDEX);
@@ -343,7 +323,7 @@ void update(gaszone_type *gz, float elapsed) {
static int gas_emit(lua_State *L)
{
- gaszone_type *gz = (gaszone_type*)auxiliar_checkclass(L, "core{gas}", 1);
+// gaszone_type *gz = (gaszone_type*)auxiliar_checkclass(L, "core{gas}", 1);
return 0;
}
@@ -353,9 +333,8 @@ static int gas_to_screen(lua_State *L)
gaszone_type *gz = (gaszone_type*)auxiliar_checkclass(L, "core{gas}", 1);
int x = luaL_checknumber(L, 2);
int y = luaL_checknumber(L, 3);
- bool show = lua_toboolean(L, 4);
- float zoom = luaL_checknumber(L, 5);
- int w = 0;
+// bool show = lua_toboolean(L, 4);
+// float zoom = luaL_checknumber(L, 5);
int i, j, dx, dy;
int vert_idx = 0, col_idx = 0;
diff --git a/src/physfs/zlib123/mzip.c b/src/physfs/zlib123/mzip.c
index e9f783ce92..1eecda2303 100644
--- a/src/physfs/zlib123/mzip.c
+++ b/src/physfs/zlib123/mzip.c
@@ -189,13 +189,14 @@ local void init_linkedlist(ll)
ll->first_block = ll->last_block = NULL;
}
+/* UNUSED
local void free_linkedlist(ll)
linkedlist_data* ll;
{
free_datablock(ll->first_block);
ll->first_block = ll->last_block = NULL;
}
-
+*/
local int add_data_in_datablock(ll,buf,len)
linkedlist_data* ll;
--
GitLab