Date: Mon, 26 May 2014 13:35:54 GMT From: pedrosouza@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r268634 - in soc2014/pedrosouza/lua_loader/head/sys/boot: . amd64/efi arm/uboot common i386/loader ia64/common lua lua/src mips/beri/loader pc98/loader powerpc/uboot sparc64/loader Message-ID: <201405261335.s4QDZs2h062775@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pedrosouza Date: Mon May 26 13:35:54 2014 New Revision: 268634 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268634 Log: Make lua compile properly Added: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstd.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstd.h Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/Makefile soc2014/pedrosouza/lua_loader/head/sys/boot/amd64/efi/Makefile soc2014/pedrosouza/lua_loader/head/sys/boot/arm/uboot/Makefile soc2014/pedrosouza/lua_loader/head/sys/boot/common/Makefile.inc soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp.c soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp.h soc2014/pedrosouza/lua_loader/head/sys/boot/i386/loader/Makefile soc2014/pedrosouza/lua_loader/head/sys/boot/ia64/common/Makefile soc2014/pedrosouza/lua_loader/head/sys/boot/lua/Makefile soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/Makefile soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lapi.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lcode.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lctype.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldebug.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldo.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldump.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lfunc.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lgc.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/llex.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/llimits.h soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lmem.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lmem.h soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lobject.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lobject.h soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lparser.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstate.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstring.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ltable.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ltm.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lua.h soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/luaconf.h soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lundump.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lvm.c soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lzio.c soc2014/pedrosouza/lua_loader/head/sys/boot/mips/beri/loader/Makefile soc2014/pedrosouza/lua_loader/head/sys/boot/pc98/loader/Makefile soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/uboot/Makefile soc2014/pedrosouza/lua_loader/head/sys/boot/sparc64/loader/Makefile Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -8,6 +8,8 @@ SUBDIR+= ficl .endif +SUBDIR+= lua + # Pick the machine-dependent subdir based on the target architecture. ADIR= ${MACHINE:S/powerpc64/powerpc/} .if exists(${.CURDIR}/${ADIR}/.) Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/amd64/efi/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/amd64/efi/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/amd64/efi/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -41,6 +41,9 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif +CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src +LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a + # Include bcache code. HAVE_BCACHE= yes Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/arm/uboot/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/arm/uboot/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/arm/uboot/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -82,6 +82,9 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif +CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src +LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a + # Always add MI sources .PATH: ${.CURDIR}/../../common .include "${.CURDIR}/../../common/Makefile.inc" Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/common/Makefile.inc ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/common/Makefile.inc Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/common/Makefile.inc Mon May 26 13:35:54 2014 (r268634) @@ -71,6 +71,10 @@ MAN+= ../forth/version.4th.8 .endif +#.if defined(BOOT_LUA) +SRCS+= interp_lua.c +#.endif + .if defined(BOOT_PROMPT_123) CFLAGS+= -DBOOT_PROMPT_123 .endif Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp.c Mon May 26 13:35:54 2014 (r268634) @@ -42,7 +42,9 @@ #define MAXARGS 20 /* maximum number of arguments allowed */ struct interp *interp = -#ifdef BOOT_FORTH +#if defined(BOOT_LUA) + &boot_interp_lua; +#elif defined(BOOT_FORTH) &boot_interp_forth; #else &boot_interp_simple; Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp.h ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp.h Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/common/interp.h Mon May 26 13:35:54 2014 (r268634) @@ -52,10 +52,8 @@ extern struct interp boot_interp_simple; extern struct interp boot_interp_forth; -/* -extern struct interp boot_interp_tcl; -extern struct interp boot_interp_lua; -*/ +extern struct interp boot_interp_lua; + extern struct interp *interp; Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/i386/loader/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/i386/loader/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/i386/loader/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -48,6 +48,10 @@ .endif .endif +#Lua +CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src +LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a + .if defined(LOADER_BZIP2_SUPPORT) CFLAGS+= -DLOADER_BZIP2_SUPPORT .endif @@ -123,8 +127,8 @@ # XXX crt0.o needs to be first for pxeboot(8) to work OBJS= ${BTXCRT} -DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND} +DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND} ${LIBLUA} +LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND} ${LIBLUA} .include <bsd.prog.mk> Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/ia64/common/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/ia64/common/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/ia64/common/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -20,6 +20,9 @@ CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH} .endif +CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src +LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a + .PATH: ${.CURDIR}/../../common .include "${.CURDIR}/../../common/Makefile.inc" Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -1,114 +1,3 @@ -# Makefile for installing Lua -# See doc/readme.html for installation and customization instructions. +SUBDIR= src -# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= - -# Your platform. See PLATS for possible values. -PLAT= none - -# Where to install. The installation starts in the src and doc directories, -# so take care if INSTALL_TOP is not an absolute path. See the local target. -# You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with -# LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. -INSTALL_TOP= /usr/local -INSTALL_BIN= $(INSTALL_TOP)/bin -INSTALL_INC= $(INSTALL_TOP)/include -INSTALL_LIB= $(INSTALL_TOP)/lib -INSTALL_MAN= $(INSTALL_TOP)/man/man1 -INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V -INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V - -# How to install. If your install program does not support "-p", then -# you may have to run ranlib on the installed liblua.a. -INSTALL= install -p -INSTALL_EXEC= $(INSTALL) -m 0755 -INSTALL_DATA= $(INSTALL) -m 0644 -# -# If you don't have "install" you can use "cp" instead. -# INSTALL= cp -p -# INSTALL_EXEC= $(INSTALL) -# INSTALL_DATA= $(INSTALL) - -# Other utilities. -MKDIR= mkdir -p -RM= rm -f - -# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - -# Convenience platforms targets. -PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - -# What to install. -TO_BIN= lua luac -TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp -TO_LIB= liblua.a -TO_MAN= lua.1 luac.1 - -# Lua version and release. -V= 5.2 -R= $V.3 - -# Targets start here. -all: $(PLAT) - -$(PLATS) clean: - cd src && $(MAKE) $@ - -test: dummy - src/lua -v - -install: dummy - cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) - cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) - cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) - -uninstall: - cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) - cd src && cd $(INSTALL_INC) && $(RM) $(TO_INC) - cd src && cd $(INSTALL_LIB) && $(RM) $(TO_LIB) - cd doc && cd $(INSTALL_MAN) && $(RM) $(TO_MAN) - -local: - $(MAKE) install INSTALL_TOP=../install - -none: - @echo "Please do 'make PLATFORM' where PLATFORM is one of these:" - @echo " $(PLATS)" - @echo "See doc/readme.html for complete instructions." - -# make may get confused with test/ and install/ -dummy: - -# echo config parameters -echo: - @cd src && $(MAKE) -s echo - @echo "PLAT= $(PLAT)" - @echo "V= $V" - @echo "R= $R" - @echo "TO_BIN= $(TO_BIN)" - @echo "TO_INC= $(TO_INC)" - @echo "TO_LIB= $(TO_LIB)" - @echo "TO_MAN= $(TO_MAN)" - @echo "INSTALL_TOP= $(INSTALL_TOP)" - @echo "INSTALL_BIN= $(INSTALL_BIN)" - @echo "INSTALL_INC= $(INSTALL_INC)" - @echo "INSTALL_LIB= $(INSTALL_LIB)" - @echo "INSTALL_MAN= $(INSTALL_MAN)" - @echo "INSTALL_LMOD= $(INSTALL_LMOD)" - @echo "INSTALL_CMOD= $(INSTALL_CMOD)" - @echo "INSTALL_EXEC= $(INSTALL_EXEC)" - @echo "INSTALL_DATA= $(INSTALL_DATA)" - -# echo pkg-config data -pc: - @echo "version=$R" - @echo "prefix=$(INSTALL_TOP)" - @echo "libdir=$(INSTALL_LIB)" - @echo "includedir=$(INSTALL_INC)" - -# list targets that do not create files (but not all makes understand .PHONY) -.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho - -# (end of Makefile) +.include <bsd.subdir.mk> Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -1,187 +1,11 @@ -# Makefile for building Lua -# See ../doc/readme.html for installation and customization instructions. +.include "../../Makefile.inc" -# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= +SRCS= lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c lstd.c -# Your platform. See PLATS for possible values. -PLAT= none +CFLAGS+= -I. +CFLAGS+= -DBOOT_LUA -ffreestanding -nostdlib -fno-stack-protector -CC= gcc -CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) -LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) -LIBS= -lm $(SYSLIBS) $(MYLIBS) - -AR= ar rcu -RANLIB= ranlib -RM= rm -f - -SYSCFLAGS= -SYSLDFLAGS= -SYSLIBS= - -MYCFLAGS= -MYLDFLAGS= -MYLIBS= -MYOBJS= - -# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - -PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - -LUA_A= liblua.a -CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ - ltm.o lundump.o lvm.o lzio.o -LIB_O= lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \ - lmathlib.o loslib.o lstrlib.o ltablib.o loadlib.o linit.o -BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) - -LUA_T= lua -LUA_O= lua.o - -LUAC_T= luac -LUAC_O= luac.o - -ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -ALL_A= $(LUA_A) - -# Targets start here. -default: $(PLAT) - -all: $(ALL_T) - -o: $(ALL_O) - -a: $(ALL_A) - -$(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ - -$(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - -$(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) - -clean: - $(RM) $(ALL_T) $(ALL_O) - -depend: - @$(CC) $(CFLAGS) -MM l*.c - -echo: - @echo "PLAT= $(PLAT)" - @echo "CC= $(CC)" - @echo "CFLAGS= $(CFLAGS)" - @echo "LDFLAGS= $(SYSLDFLAGS)" - @echo "LIBS= $(LIBS)" - @echo "AR= $(AR)" - @echo "RANLIB= $(RANLIB)" - @echo "RM= $(RM)" - -# Convenience targets for popular platforms -ALL= all - -none: - @echo "Please do 'make PLATFORM' where PLATFORM is one of these:" - @echo " $(PLATS)" - -aix: - $(MAKE) $(ALL) CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl" SYSLDFLAGS="-brtl -bexpall" - -ansi: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_ANSI" - -bsd: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-Wl,-E" - -freebsd: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -lreadline" - -generic: $(ALL) - -linux: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" - -macosx: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc - -mingw: - $(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \ - "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \ - "SYSCFLAGS=-DLUA_BUILD_AS_DLL" "SYSLIBS=" "SYSLDFLAGS=-s" lua.exe - $(MAKE) "LUAC_T=luac.exe" luac.exe - -posix: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX" - -solaris: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl" - -# list targets that do not create files (but not all makes understand .PHONY) -.PHONY: all $(PLATS) default o a clean depend echo none - -# DO NOT DELETE - -lapi.o: lapi.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h ltm.h \ - lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h lstring.h ltable.h lundump.h \ - lvm.h -lauxlib.o: lauxlib.c lua.h luaconf.h lauxlib.h -lbaselib.o: lbaselib.c lua.h luaconf.h lauxlib.h lualib.h -lbitlib.o: lbitlib.c lua.h luaconf.h lauxlib.h lualib.h -lcode.o: lcode.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \ - lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h lgc.h \ - lstring.h ltable.h lvm.h -lcorolib.o: lcorolib.c lua.h luaconf.h lauxlib.h lualib.h -lctype.o: lctype.c lctype.h lua.h luaconf.h llimits.h -ldblib.o: ldblib.c lua.h luaconf.h lauxlib.h lualib.h -ldebug.o: ldebug.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h \ - ltm.h lzio.h lmem.h lcode.h llex.h lopcodes.h lparser.h ldebug.h ldo.h \ - lfunc.h lstring.h lgc.h ltable.h lvm.h -ldo.o: ldo.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h ltm.h \ - lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h lopcodes.h lparser.h \ - lstring.h ltable.h lundump.h lvm.h -ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h \ - lzio.h lmem.h lundump.h -lfunc.o: lfunc.c lua.h luaconf.h lfunc.h lobject.h llimits.h lgc.h \ - lstate.h ltm.h lzio.h lmem.h -lgc.o: lgc.c 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 lua.h luaconf.h lualib.h lauxlib.h -liolib.o: liolib.c lua.h luaconf.h lauxlib.h lualib.h -llex.o: llex.c lua.h luaconf.h lctype.h llimits.h ldo.h lobject.h \ - lstate.h ltm.h lzio.h lmem.h llex.h lparser.h lstring.h lgc.h ltable.h -lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h -lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ - ltm.h lzio.h lmem.h ldo.h lgc.h -loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h -lobject.o: lobject.c lua.h luaconf.h lctype.h llimits.h ldebug.h lstate.h \ - lobject.h ltm.h lzio.h lmem.h ldo.h lstring.h lgc.h lvm.h -lopcodes.o: lopcodes.c lopcodes.h llimits.h lua.h luaconf.h -loslib.o: loslib.c lua.h luaconf.h lauxlib.h lualib.h -lparser.o: lparser.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \ - lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h lfunc.h \ - lstring.h lgc.h ltable.h -lstate.o: lstate.c lua.h luaconf.h lapi.h llimits.h lstate.h lobject.h \ - ltm.h lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h llex.h lstring.h \ - ltable.h -lstring.o: lstring.c lua.h luaconf.h lmem.h llimits.h lobject.h lstate.h \ - ltm.h lzio.h lstring.h lgc.h -lstrlib.o: lstrlib.c lua.h luaconf.h lauxlib.h lualib.h -ltable.o: ltable.c 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 lua.h luaconf.h lauxlib.h lualib.h -ltm.o: ltm.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h lzio.h \ - lmem.h lstring.h lgc.h ltable.h -lua.o: lua.c lua.h luaconf.h lauxlib.h lualib.h -luac.o: luac.c lua.h luaconf.h lauxlib.h lobject.h llimits.h lstate.h \ - ltm.h lzio.h lmem.h lundump.h ldebug.h lopcodes.h -lundump.o: lundump.c 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 -lvm.o: lvm.c 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 -lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \ - lzio.h +LIB= lua +INTERNALLIB= +.include <bsd.lib.mk> Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lapi.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lapi.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lapi.c Mon May 26 13:35:54 2014 (r268634) @@ -4,9 +4,12 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stdarg.h> #include <string.h> +#endif #define lapi_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lcode.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lcode.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lcode.c Mon May 26 13:35:54 2014 (r268634) @@ -4,8 +4,11 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stdlib.h> +#endif #define lcode_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lctype.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lctype.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lctype.c Mon May 26 13:35:54 2014 (r268634) @@ -11,7 +11,11 @@ #if !LUA_USE_CTYPE /* { */ +#ifdef BOOT_LUA +#include <stand.h> +#else #include <limits.h> +#endif LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = { 0x00, /* EOZ */ Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldebug.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldebug.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldebug.c Mon May 26 13:35:54 2014 (r268634) @@ -4,10 +4,13 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stdarg.h> #include <stddef.h> #include <string.h> +#endif #define ldebug_c Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldo.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldo.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldo.c Mon May 26 13:35:54 2014 (r268634) @@ -4,10 +4,13 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <setjmp.h> #include <stdlib.h> #include <string.h> +#endif #define ldo_c #define LUA_CORE @@ -116,7 +119,9 @@ lua_unlock(L); G(L)->panic(L); /* call it (last chance to jump out) */ } +#ifndef BOOT_LUA abort(); +#endif } } } Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldump.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldump.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ldump.c Mon May 26 13:35:54 2014 (r268634) @@ -3,8 +3,11 @@ ** save precompiled Lua chunks ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stddef.h> +#endif #define ldump_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lfunc.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lfunc.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lfunc.c Mon May 26 13:35:54 2014 (r268634) @@ -4,8 +4,11 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stddef.h> +#endif #define lfunc_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lgc.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lgc.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lgc.c Mon May 26 13:35:54 2014 (r268634) @@ -3,8 +3,11 @@ ** Garbage Collector ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <string.h> +#endif #define lgc_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/llex.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/llex.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/llex.c Mon May 26 13:35:54 2014 (r268634) @@ -4,9 +4,12 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <locale.h> #include <string.h> +#endif #define llex_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/llimits.h ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/llimits.h Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/llimits.h Mon May 26 13:35:54 2014 (r268634) @@ -7,9 +7,12 @@ #ifndef llimits_h #define llimits_h - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <limits.h> #include <stddef.h> +#endif #include "lua.h" @@ -98,6 +101,7 @@ #define cast_uchar(i) cast(unsigned char, (i)) +#ifndef BOOT_LUA /* ** non-return type */ @@ -109,6 +113,10 @@ #define l_noret void #endif +#else +#define l_noret void +#endif + /* Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lmem.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lmem.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lmem.c Mon May 26 13:35:54 2014 (r268634) @@ -4,8 +4,11 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stddef.h> +#endif #define lmem_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lmem.h ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lmem.h Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lmem.h Mon May 26 13:35:54 2014 (r268634) @@ -7,8 +7,11 @@ #ifndef lmem_h #define lmem_h - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stddef.h> +#endif #include "llimits.h" #include "lua.h" Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lobject.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lobject.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lobject.c Mon May 26 13:35:54 2014 (r268634) @@ -3,11 +3,14 @@ ** Some generic functions over Lua objects ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#endif #define lobject_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lobject.h ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lobject.h Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lobject.h Mon May 26 13:35:54 2014 (r268634) @@ -8,8 +8,11 @@ #ifndef lobject_h #define lobject_h - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stdarg.h> +#endif #include "llimits.h" Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lparser.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lparser.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lparser.c Mon May 26 13:35:54 2014 (r268634) @@ -4,8 +4,11 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <string.h> +#endif #define lparser_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstate.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstate.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstate.c Mon May 26 13:35:54 2014 (r268634) @@ -4,9 +4,12 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stddef.h> #include <string.h> +#endif #define lstate_c #define LUA_CORE Added: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstd.c Mon May 26 13:35:54 2014 (r268634) @@ -0,0 +1,48 @@ +#include "lstd.h" + + + +int abs(int v) +{ + return v < 0 ? -v : v; +} + +double floor(double v) +{ + long long int a = (long long int)v; + return (double)a; +} + +char * strpbrk (const char * str1, const char * str2) +{ + while (*str1) + { + const char * tmp = str2; + while (*tmp) + if (*str1 == *tmp++) return str1; + ++str1; + } + return 0; +} + +double ldexp (double x, int exp) +{ + printf("ldexp with no overflow/underflow check!\n"); + if (exp >= 0) + return x * (1 << exp); + else + return x / (1 << (-exp)); +} + + +double pow(double a, double b) +{ + printf("pow not implemented!\n"); + return 1.; +} + +double strtod(const char *string, char **endPtr) +{ + printf("strtod not implemented!\n"); + return 0.; +} Added: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstd.h Mon May 26 13:35:54 2014 (r268634) @@ -0,0 +1,19 @@ +#include <stand.h> +#include <sys/types.h> +#include <sys/stddef.h> +#include <sys/stdint.h> +#include <limits.h> +#include <string.h> +#include <machine/stdarg.h> + +#include <setjmp.h> + +typedef __ptrdiff_t ptrdiff_t; + +#define getlocaledecpoint() ('.') + +#define strcoll strcmp + +int abs(int v); + + Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstring.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstring.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lstring.c Mon May 26 13:35:54 2014 (r268634) @@ -4,8 +4,11 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <string.h> +#endif #define lstring_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ltable.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ltable.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ltable.c Mon May 26 13:35:54 2014 (r268634) @@ -18,7 +18,11 @@ ** Hence even when the load factor reaches 100%, performance remains good. */ +#ifdef BOOT_LUA +#include <stand.h> +#else #include <string.h> +#endif #define ltable_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ltm.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ltm.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/ltm.c Mon May 26 13:35:54 2014 (r268634) @@ -4,8 +4,11 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <string.h> +#endif #define ltm_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lua.h ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lua.h Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lua.h Mon May 26 13:35:54 2014 (r268634) @@ -9,8 +9,12 @@ #ifndef lua_h #define lua_h +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stdarg.h> #include <stddef.h> +#endif #include "luaconf.h" Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/luaconf.h ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/luaconf.h Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/luaconf.h Mon May 26 13:35:54 2014 (r268634) @@ -8,9 +8,18 @@ #ifndef lconfig_h #define lconfig_h +#ifdef BOOT_LUA +#include <stand.h> +#else #include <limits.h> #include <stddef.h> +#endif +/* + c std functions needed by lua and not present + in FreeBSD libstand. +*/ +#include "lstd.h" /* ** ================================================================== @@ -210,7 +219,9 @@ ** avoids including 'stdio.h' everywhere.) */ #if defined(LUA_LIB) || defined(lua_c) +#ifndef BOOT_LUA #include <stdio.h> +#endif #define luai_writestring(s,l) fwrite((s), sizeof(char), (l), stdout) #define luai_writeline() (luai_writestring("\n", 1), fflush(stdout)) #endif @@ -400,7 +411,7 @@ @@ LUAI_MAXNUMBER2STR is maximum size of previous conversion. */ #define LUA_NUMBER_SCAN "%lf" -#define LUA_NUMBER_FMT "%.14g" +#define LUA_NUMBER_FMT "%f" #define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n)) #define LUAI_MAXNUMBER2STR 32 /* 16 digits, sign, point, and \0 */ Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lundump.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lundump.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lundump.c Mon May 26 13:35:54 2014 (r268634) @@ -3,8 +3,11 @@ ** load precompiled Lua chunks ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <string.h> +#endif #define lundump_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lvm.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lvm.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lvm.c Mon May 26 13:35:54 2014 (r268634) @@ -4,10 +4,13 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <stdio.h> #include <stdlib.h> #include <string.h> +#endif #define lvm_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lzio.c ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lzio.c Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/lua/src/lzio.c Mon May 26 13:35:54 2014 (r268634) @@ -4,8 +4,11 @@ ** See Copyright Notice in lua.h */ - +#ifdef BOOT_LUA +#include <stand.h> +#else #include <string.h> +#endif #define lzio_c #define LUA_CORE Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/mips/beri/loader/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/mips/beri/loader/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/mips/beri/loader/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -75,6 +75,9 @@ LIBFICL= ${.OBJDIR}/../../../ficl/libficl.a .endif +CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src +LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a + # Common code across BERI boot loader parts .PATH: ${.CURDIR}/../common CFLAGS+= -I${.CURDIR}/../common Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/pc98/loader/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/pc98/loader/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/pc98/loader/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -33,6 +33,9 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif +CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src +LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a + .if defined(LOADER_BZIP2_SUPPORT) CFLAGS+= -DLOADER_BZIP2_SUPPORT .endif Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/uboot/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/uboot/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/powerpc/uboot/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -72,6 +72,9 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif +CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src +LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a + # Always add MI sources .PATH: ${.CURDIR}/../../common ${.CURDIR}/../../../libkern .include "${.CURDIR}/../../common/Makefile.inc" Modified: soc2014/pedrosouza/lua_loader/head/sys/boot/sparc64/loader/Makefile ============================================================================== --- soc2014/pedrosouza/lua_loader/head/sys/boot/sparc64/loader/Makefile Mon May 26 13:05:54 2014 (r268633) +++ soc2014/pedrosouza/lua_loader/head/sys/boot/sparc64/loader/Makefile Mon May 26 13:35:54 2014 (r268634) @@ -63,6 +63,9 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif +CFLAGS+= -DBOOT_LUA -I${.CURDIR}/../../lua/src +LIBLUA= ${.OBJDIR}/../../lua/src/liblua.a + # Always add MI sources .PATH: ${.CURDIR}/../../common .include "${.CURDIR}/../../common/Makefile.inc"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405261335.s4QDZs2h062775>