更新tolua#到1.0.6.289版

jarjin2000 · jarjin2000 · commit 31781a94111c · 2017-03-01T01:14:42.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,4 @@
 *.dSYM/
 /window
 /Plugins
+/android/libs
diff --git a/android/jni/libluajit.a b/android/jni/libluajit.a
diff --git a/build_ios.sh b/build_ios.sh
@@ -27,18 +27,18 @@ rm "$DESTDIR"/*.a
 cd $SRCDIR
 
 make clean
-ISDKF="-arch armv7 -isysroot $ISDK/SDKs/$ISDKVER"
-make HOST_CC="gcc -m32" CROSS="$ISDKP" TARGET_FLAGS="$ISDKF" TARGET=armv7 TARGET_SYS=iOS CFLAGS="-fembed-bitcode"
+ISDKF="-arch armv7 -isysroot $ISDK/SDKs/$ISDKVER -miphoneos-version-min=7.0"
+make HOST_CC="gcc -m32" TARGET_FLAGS="$ISDKF" TARGET=armv7 TARGET_SYS=iOS
 mv "$SRCDIR"/src/libluajit.a "$DESTDIR"/libluajit-armv7.a
 
 make clean
-ISDKF="-arch armv7s -isysroot $ISDK/SDKs/$ISDKVER"
-make HOST_CC="gcc -m32" CROSS="$ISDKP" TARGET_FLAGS="$ISDKF" TARGET=armv7s TARGET_SYS=iOS CFLAGS="-fembed-bitcode"
+ISDKF="-arch armv7s -isysroot $ISDK/SDKs/$ISDKVER -miphoneos-version-min=7.0"
+make HOST_CC="gcc -m32" TARGET_FLAGS="$ISDKF" TARGET=armv7s TARGET_SYS=iOS
 mv "$SRCDIR"/src/libluajit.a "$DESTDIR"/libluajit-armv7s.a
 
 make clean
-ISDKF="-arch arm64 -isysroot $ISDK/SDKs/$ISDKVER"
-make HOST_CC="gcc " CROSS="$ISDKP" TARGET_FLAGS="$ISDKF" TARGET=arm64 TARGET_SYS=iOS CFLAGS="-fembed-bitcode"
+ISDKF="-arch arm64 -isysroot $ISDK/SDKs/$ISDKVER -miphoneos-version-min=7.0"
+make HOST_CC="gcc " TARGET_FLAGS="$ISDKF" TARGET=arm64 TARGET_SYS=iOS
 mv "$SRCDIR"/src/libluajit.a "$DESTDIR"/libluajit-arm64.a
 make clean
 
diff --git a/int64.c b/int64.c
@@ -183,15 +183,15 @@ static int64_t tolua_checkint64(lua_State* L, int pos)
 
 static int _int64add(lua_State* L)
 {
-    int64_t lhs = *(int64_t*)lua_touserdata(L, 1);    
+    int64_t lhs = tolua_checkint64(L, 1);    
     int64_t rhs = tolua_checkint64(L, 2);
     tolua_pushint64(L, lhs + rhs);
     return 1;
 }
 
 static int _int64sub(lua_State* L)
 {
-    int64_t lhs = *(int64_t*)lua_touserdata(L, 1);    
+    int64_t lhs = tolua_checkint64(L, 1);    
     int64_t rhs = tolua_checkint64(L, 2);
     tolua_pushint64(L, lhs - rhs);
     return 1;
@@ -200,23 +200,23 @@ static int _int64sub(lua_State* L)
 
 static int _int64mul(lua_State* L)
 {
-    int64_t lhs = *(int64_t*)lua_touserdata(L, 1);    
+    int64_t lhs = tolua_checkint64(L, 1);    
     int64_t rhs = tolua_checkint64(L, 2);
     tolua_pushint64(L, lhs * rhs);
     return 1;    
 }
 
 static int _int64div(lua_State* L)
 {
-    int64_t lhs = *(int64_t*)lua_touserdata(L, 1);    
+    int64_t lhs = tolua_checkint64(L, 1);    
     int64_t rhs = tolua_checkint64(L, 2);
     tolua_pushint64(L, lhs / rhs);
     return 1;
 }
 
 static int _int64mod(lua_State* L)
 {
-    int64_t lhs = *(int64_t*)lua_touserdata(L, 1);    
+    int64_t lhs = tolua_checkint64(L, 1);    
     int64_t rhs = tolua_checkint64(L, 2);
 
     if (rhs == 0) 
@@ -237,7 +237,7 @@ static int _int64unm(lua_State* L)
 
 static int _int64pow(lua_State* L)
 {
-    int64_t lhs = *(int64_t*)lua_touserdata(L, 1);    
+    int64_t lhs = tolua_checkint64(L, 1);    
     int64_t rhs = tolua_checkint64(L, 2);
     int64_t ret;
     
@@ -278,15 +278,15 @@ static int _int64equals(lua_State* L)
 
 static int _int64lt(lua_State* L)
 {
-    int64_t lhs = *(int64_t*)lua_touserdata(L, 1); 
+    int64_t lhs = tolua_checkint64(L, 1); 
     int64_t rhs = tolua_checkint64(L, 2);
     lua_pushboolean(L, lhs < rhs);
     return 1;
 }
 
 static int _int64le(lua_State* L)
 {
-    int64_t lhs = *(int64_t*)lua_touserdata(L, 1); 
+    int64_t lhs = tolua_checkint64(L, 1); 
     int64_t rhs = tolua_checkint64(L, 2);
     lua_pushboolean(L, lhs <= rhs);
     return 1;
diff --git a/luajit-2.1/src/Makefile b/luajit-2.1/src/Makefile
@@ -168,7 +168,7 @@ else
   endif
   # Use Clang for OSX host.
   ifeq (Darwin,$(HOST_SYS))
-    DEFAULT_CC= gcc
+    DEFAULT_CC= clang
   endif
 endif
 
diff --git a/tolua.h b/tolua.h
@@ -51,6 +51,6 @@ int  tolua_newint64(lua_State* L);
 void tolua_openuint64(lua_State* L);
 int  tolua_newuint64(lua_State* L);
 
-int toluaflags;
+extern int toluaflags;
 
 #endif
diff --git a/uint64.c b/uint64.c
@@ -184,39 +184,39 @@ static uint64_t tolua_checkuint64(lua_State *L, int pos)
 
 static int _uint64add(lua_State *L)
 {
-    uint64_t lhs = *(uint64_t*)lua_touserdata(L, 1);    
+    uint64_t lhs = tolua_checkuint64(L, 1);    
     uint64_t rhs = tolua_checkuint64(L, 2);
     tolua_pushuint64(L, lhs + rhs);
     return 1;
 }
 
 static int _uint64sub(lua_State *L)
 {
-    uint64_t lhs = *(uint64_t*)lua_touserdata(L, 1);    
+    uint64_t lhs = tolua_checkuint64(L, 1);    
     uint64_t rhs = tolua_checkuint64(L, 2);
     tolua_pushuint64(L, lhs - rhs);
     return 1;
 }
 
 static int _uint64mul(lua_State *L)
 {
-    uint64_t lhs = *(uint64_t*)lua_touserdata(L, 1);    
+    uint64_t lhs = tolua_checkuint64(L, 1);    
     uint64_t rhs = tolua_checkuint64(L, 2);
     tolua_pushuint64(L, lhs * rhs);
     return 1;    
 }
 
 static int _uint64div(lua_State *L)
 {
-    uint64_t lhs = *(uint64_t*)lua_touserdata(L, 1);    
+    uint64_t lhs = tolua_checkuint64(L, 1);    
     uint64_t rhs = tolua_checkuint64(L, 2);
     tolua_pushuint64(L, lhs / rhs);
     return 1;
 }
 
 static int _uint64mod(lua_State *L)
 {
-    uint64_t lhs = *(uint64_t*)lua_touserdata(L, 1);    
+    uint64_t lhs = tolua_checkuint64(L, 1);    
     uint64_t rhs = tolua_checkuint64(L, 2);
 
     if (rhs == 0) 
@@ -237,7 +237,7 @@ static int _uint64unm(lua_State *L)
 
 static int _uint64pow(lua_State *L)
 {
-    uint64_t lhs = *(uint64_t*)lua_touserdata(L, 1);    
+    uint64_t lhs = tolua_checkuint64(L, 1);    
     uint64_t rhs = tolua_checkuint64(L, 2);
     uint64_t ret;
     
@@ -278,15 +278,15 @@ static int _uint64equals(lua_State *L)
 
 static int _uint64lt(lua_State *L)
 {
-    uint64_t lhs = *(uint64_t*)lua_touserdata(L, 1); 
+    uint64_t lhs = tolua_checkuint64(L, 1); 
     uint64_t rhs = tolua_checkuint64(L, 2);
     lua_pushboolean(L, lhs < rhs);
     return 1;
 }
 
 static int _uint64le(lua_State *L)
 {
-    uint64_t lhs = *(uint64_t*)lua_touserdata(L, 1); 
+    uint64_t lhs = tolua_checkuint64(L, 1); 
     uint64_t rhs = tolua_checkuint64(L, 2);
     lua_pushboolean(L, lhs <= rhs);
     return 1;

Original file line number	Diff line number	Diff line change
`@@ -183,15 +183,15 @@ static int64_t tolua_checkint64(lua_State* L, int pos)`
`183`	`183`
`184`	`184`	`static int _int64add(lua_State* L)`
`185`	`185`	`{`
`186`		`- int64_t lhs = (int64_t)lua_touserdata(L, 1);`
	`186`	`+ int64_t lhs = tolua_checkint64(L, 1);`
`187`	`187`	`int64_t rhs = tolua_checkint64(L, 2);`
`188`	`188`	`tolua_pushint64(L, lhs + rhs);`
`189`	`189`	`return 1;`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`static int _int64sub(lua_State* L)`
`193`	`193`	`{`
`194`		`- int64_t lhs = (int64_t)lua_touserdata(L, 1);`
	`194`	`+ int64_t lhs = tolua_checkint64(L, 1);`
`195`	`195`	`int64_t rhs = tolua_checkint64(L, 2);`
`196`	`196`	`tolua_pushint64(L, lhs - rhs);`
`197`	`197`	`return 1;`
`@@ -200,23 +200,23 @@ static int _int64sub(lua_State* L)`
`200`	`200`
`201`	`201`	`static int _int64mul(lua_State* L)`
`202`	`202`	`{`
`203`		`- int64_t lhs = (int64_t)lua_touserdata(L, 1);`
	`203`	`+ int64_t lhs = tolua_checkint64(L, 1);`
`204`	`204`	`int64_t rhs = tolua_checkint64(L, 2);`
`205`	`205`	`tolua_pushint64(L, lhs * rhs);`
`206`	`206`	`return 1;`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`static int _int64div(lua_State* L)`
`210`	`210`	`{`
`211`		`- int64_t lhs = (int64_t)lua_touserdata(L, 1);`
	`211`	`+ int64_t lhs = tolua_checkint64(L, 1);`
`212`	`212`	`int64_t rhs = tolua_checkint64(L, 2);`
`213`	`213`	`tolua_pushint64(L, lhs / rhs);`
`214`	`214`	`return 1;`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`static int _int64mod(lua_State* L)`
`218`	`218`	`{`
`219`		`- int64_t lhs = (int64_t)lua_touserdata(L, 1);`
	`219`	`+ int64_t lhs = tolua_checkint64(L, 1);`
`220`	`220`	`int64_t rhs = tolua_checkint64(L, 2);`
`221`	`221`
`222`	`222`	`if (rhs == 0)`
`@@ -237,7 +237,7 @@ static int _int64unm(lua_State* L)`
`237`	`237`
`238`	`238`	`static int _int64pow(lua_State* L)`
`239`	`239`	`{`
`240`		`- int64_t lhs = (int64_t)lua_touserdata(L, 1);`
	`240`	`+ int64_t lhs = tolua_checkint64(L, 1);`
`241`	`241`	`int64_t rhs = tolua_checkint64(L, 2);`
`242`	`242`	`int64_t ret;`
`243`	`243`
`@@ -278,15 +278,15 @@ static int _int64equals(lua_State* L)`
`278`	`278`
`279`	`279`	`static int _int64lt(lua_State* L)`
`280`	`280`	`{`
`281`		`- int64_t lhs = (int64_t)lua_touserdata(L, 1);`
	`281`	`+ int64_t lhs = tolua_checkint64(L, 1);`
`282`	`282`	`int64_t rhs = tolua_checkint64(L, 2);`
`283`	`283`	`lua_pushboolean(L, lhs < rhs);`
`284`	`284`	`return 1;`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`static int _int64le(lua_State* L)`
`288`	`288`	`{`
`289`		`- int64_t lhs = (int64_t)lua_touserdata(L, 1);`
	`289`	`+ int64_t lhs = tolua_checkint64(L, 1);`
`290`	`290`	`int64_t rhs = tolua_checkint64(L, 2);`
`291`	`291`	`lua_pushboolean(L, lhs <= rhs);`
`292`	`292`	`return 1;`
Original file line number	Diff line number	Diff line change
`@@ -184,39 +184,39 @@ static uint64_t tolua_checkuint64(lua_State *L, int pos)`
`184`	`184`
`185`	`185`	`static int _uint64add(lua_State *L)`
`186`	`186`	`{`
`187`		`- uint64_t lhs = (uint64_t)lua_touserdata(L, 1);`
	`187`	`+ uint64_t lhs = tolua_checkuint64(L, 1);`
`188`	`188`	`uint64_t rhs = tolua_checkuint64(L, 2);`
`189`	`189`	`tolua_pushuint64(L, lhs + rhs);`
`190`	`190`	`return 1;`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`static int _uint64sub(lua_State *L)`
`194`	`194`	`{`
`195`		`- uint64_t lhs = (uint64_t)lua_touserdata(L, 1);`
	`195`	`+ uint64_t lhs = tolua_checkuint64(L, 1);`
`196`	`196`	`uint64_t rhs = tolua_checkuint64(L, 2);`
`197`	`197`	`tolua_pushuint64(L, lhs - rhs);`
`198`	`198`	`return 1;`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`static int _uint64mul(lua_State *L)`
`202`	`202`	`{`
`203`		`- uint64_t lhs = (uint64_t)lua_touserdata(L, 1);`
	`203`	`+ uint64_t lhs = tolua_checkuint64(L, 1);`
`204`	`204`	`uint64_t rhs = tolua_checkuint64(L, 2);`
`205`	`205`	`tolua_pushuint64(L, lhs * rhs);`
`206`	`206`	`return 1;`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`static int _uint64div(lua_State *L)`
`210`	`210`	`{`
`211`		`- uint64_t lhs = (uint64_t)lua_touserdata(L, 1);`
	`211`	`+ uint64_t lhs = tolua_checkuint64(L, 1);`
`212`	`212`	`uint64_t rhs = tolua_checkuint64(L, 2);`
`213`	`213`	`tolua_pushuint64(L, lhs / rhs);`
`214`	`214`	`return 1;`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`static int _uint64mod(lua_State *L)`
`218`	`218`	`{`
`219`		`- uint64_t lhs = (uint64_t)lua_touserdata(L, 1);`
	`219`	`+ uint64_t lhs = tolua_checkuint64(L, 1);`
`220`	`220`	`uint64_t rhs = tolua_checkuint64(L, 2);`
`221`	`221`
`222`	`222`	`if (rhs == 0)`
`@@ -237,7 +237,7 @@ static int _uint64unm(lua_State *L)`
`237`	`237`
`238`	`238`	`static int _uint64pow(lua_State *L)`
`239`	`239`	`{`
`240`		`- uint64_t lhs = (uint64_t)lua_touserdata(L, 1);`
	`240`	`+ uint64_t lhs = tolua_checkuint64(L, 1);`
`241`	`241`	`uint64_t rhs = tolua_checkuint64(L, 2);`
`242`	`242`	`uint64_t ret;`
`243`	`243`
`@@ -278,15 +278,15 @@ static int _uint64equals(lua_State *L)`
`278`	`278`
`279`	`279`	`static int _uint64lt(lua_State *L)`
`280`	`280`	`{`
`281`		`- uint64_t lhs = (uint64_t)lua_touserdata(L, 1);`
	`281`	`+ uint64_t lhs = tolua_checkuint64(L, 1);`
`282`	`282`	`uint64_t rhs = tolua_checkuint64(L, 2);`
`283`	`283`	`lua_pushboolean(L, lhs < rhs);`
`284`	`284`	`return 1;`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`static int _uint64le(lua_State *L)`
`288`	`288`	`{`
`289`		`- uint64_t lhs = (uint64_t)lua_touserdata(L, 1);`
	`289`	`+ uint64_t lhs = tolua_checkuint64(L, 1);`
`290`	`290`	`uint64_t rhs = tolua_checkuint64(L, 2);`
`291`	`291`	`lua_pushboolean(L, lhs <= rhs);`
`292`	`292`	`return 1;`