clean up.

author: Li Jin <dragon-fly@qq.com> 2020-06-22 17:10:43 +0800
committer: Li Jin <dragon-fly@qq.com> 2020-06-22 17:10:43 +0800
commit: f335d19cdf76d6ce515600b51ef8e620a57f2d52 (patch)
tree: b6221c00c140f61a43df1828b2d714e0c8810113
parent: cd2b60b101a398cb9356d746364e70eaed1860f1 (diff)
download: yuescript-f335d19cdf76d6ce515600b51ef8e620a57f2d52.tar.gz
yuescript-f335d19cdf76d6ce515600b51ef8e620a57f2d52.tar.bz2
yuescript-f335d19cdf76d6ce515600b51ef8e620a57f2d52.zip
2 files changed, 42 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore
index a1e491d..17620dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,5 @@ moonplus-*.rock*
 !moonplus-dev-1.rockspec
 .vs
 bin
-src/lua-5.3/*.o
+src/lua/*.o
-src/lua-5.3/*.a
+src/lua/*.a
diff --git a/src/lua/makefile b/src/lua/makefile
index 397c817..f21773e 100644
--- a/src/lua/makefile
+++ b/src/lua/makefile
@@ -6,7 +6,7 @@
 # Warnings valid for both C and C++
 CWARNSCPP= \
-        -pedantic \
+        -fmax-errors=5 \
        -Wextra \
        -Wshadow \
        -Wsign-compare \
@@ -14,14 +14,15 @@ CWARNSCPP= \
        -Wwrite-strings \
        -Wredundant-decls \
        -Wdisabled-optimization \
-        -Waggregate-return \
        -Wdouble-promotion \
-        #-Wno-aggressive-loop-optimizations   # not accepted by clang \
+        -Wlogical-op \
-        #-Wlogical-op   # not accepted by clang \
+        -Wno-aggressive-loop-optimizations \
-        # the next warnings generate too much noise, so they are disabled
+        # the next warnings might be useful sometimes,
-        # -Wconversion  -Wno-sign-conversion \
+        # but usually they generate too much noise
+        # -Werror \
+        # -pedantic   # warns if we use jump tables \
+        # -Wconversion  \
        # -Wsign-conversion \
-        # -Wconversion \
        # -Wstrict-overflow=2 \
        # -Wformat=2 \
        # -Wcast-qual \
@@ -35,12 +36,20 @@ CWARNSC= -Wdeclaration-after-statement \
        -Wold-style-definition \
-CWARNS= $(CWARNSCPP)  $(CWARNSC)
+CWARNS= $(CWARNSCPP) $(CWARNSC)
-# -mtune=native -fomit-frame-pointer
-# -fno-stack-protector
-LOCAL = $(TESTS) $(CWARNS) -g
+# -DEXTERNMEMCHECK -DHARDSTACKTESTS -DHARDMEMTESTS -DTRACEMEM='"tempmem"'
+# -DMAXINDEXRK=1 -DLUA_COMPAT_5_3
+# -g -DLUA_USER_H='"ltests.h"'
+# -pg -malign-double
+# -DLUA_USE_CTYPE -DLUA_USE_APICHECK
+# ('-ftrapv' for runtime checks of integer overflows)
+# -fsanitize=undefined -ftrapv -fno-inline
+# TESTS= -DLUA_USER_H='"ltests.h"' -O0 -g
+LOCAL = $(CWARNS)
 # enable Linux goodies
@@ -48,9 +57,15 @@ MYCFLAGS= $(LOCAL) -std=c99
 MYLDFLAGS= $(LOCAL) -Wl
 MYLIBS= -ldl -lreadline
+UNAME_S:=$(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+        MYCFLAGS += -DLUA_USE_MACOS
+else
+        MYCFLAGS += -DLUA_USE_LINUX
+endif
 CC= gcc
-CFLAGS= -Wall -O2 $(MYCFLAGS)
+CFLAGS= -Wall -O2 $(MYCFLAGS) -fno-stack-protector -fno-common -march=native
 AR= ar rc
 RANLIB= ranlib
 RM= rm -f
@@ -75,6 +90,7 @@ ALL_O= $(CORE_O) $(AUX_O) $(LIB_O)
 ALL_A= $(CORE_T)
 all:    $(ALL_T)
+        touch all
 o:      $(ALL_O)
@@ -84,11 +100,15 @@ $(CORE_T): $(CORE_O) $(AUX_O) $(LIB_O)
        $(AR) $@ $?
        $(RANLIB) $@
-$(LUA_T): $(LUA_O) $(CORE_T)
+llex.o:
-        $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(CORE_T) $(LIBS) $(MYLIBS) $(DL)
+        $(CC) $(CFLAGS) -Os -c llex.c
+lparser.o:
+        $(CC) $(CFLAGS) -Os -c lparser.c
+lcode.o:
+        $(CC) $(CFLAGS) -Os -c lcode.c
-$(LUAC_T): $(LUAC_O) $(CORE_T)
-        $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(CORE_T) $(LIBS) $(MYLIBS)
 clean:
        $(RM) $(ALL_T) $(ALL_O)
@@ -131,8 +151,8 @@ ldo.o: ldo.c lprefix.h lua.h luaconf.h lapi.h llimits.h lstate.h \
 lparser.h lstring.h ltable.h lundump.h lvm.h
 ldump.o: ldump.c lprefix.h lua.h luaconf.h lobject.h llimits.h lstate.h \
 ltm.h lzio.h lmem.h lundump.h
-lfunc.o: lfunc.c lprefix.h lua.h luaconf.h lfunc.h lobject.h llimits.h \
+lfunc.o: lfunc.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
- lgc.h lstate.h ltm.h lzio.h lmem.h
+ llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h
 lgc.o: lgc.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
 llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h
 linit.o: linit.c lprefix.h lua.h luaconf.h lualib.h lauxlib.h
@@ -162,14 +182,14 @@ ltable.o: ltable.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
 llimits.h ltm.h lzio.h lmem.h ldo.h lgc.h lstring.h ltable.h lvm.h
 ltablib.o: ltablib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
 ltm.o: ltm.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
- llimits.h ltm.h lzio.h lmem.h ldo.h lstring.h lgc.h ltable.h lvm.h
+ llimits.h ltm.h lzio.h lmem.h ldo.h lgc.h lstring.h ltable.h lvm.h
 lundump.o: lundump.c lprefix.h lua.h luaconf.h ldebug.h lstate.h \
 lobject.h llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lstring.h lgc.h \
 lundump.h
 lutf8lib.o: lutf8lib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
 lvm.o: lvm.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
 llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lstring.h \
- ltable.h lvm.h
+ ltable.h lvm.h ljumptab.h
 lzio.o: lzio.c lprefix.h lua.h luaconf.h llimits.h lmem.h lstate.h \
 lobject.h ltm.h lzio.h
author	Li Jin <dragon-fly@qq.com>	2020-06-22 17:10:43 +0800
committer	Li Jin <dragon-fly@qq.com>	2020-06-22 17:10:43 +0800
commit	f335d19cdf76d6ce515600b51ef8e620a57f2d52 (patch)
tree	b6221c00c140f61a43df1828b2d714e0c8810113
parent	cd2b60b101a398cb9356d746364e70eaed1860f1 (diff)
download	yuescript-f335d19cdf76d6ce515600b51ef8e620a57f2d52.tar.gz yuescript-f335d19cdf76d6ce515600b51ef8e620a57f2d52.tar.bz2 yuescript-f335d19cdf76d6ce515600b51ef8e620a57f2d52.zip