lacpi: Loader compilation

These bindings have two conditions:
(1) Must be built on `amd64`
(2) Must be building `loader_lua`

If these conditions are met:
- Add liblua as a subdir in EFI
- Include liblua/acpi/include in loader/Makefile
- Add set_lua_acpi_modules to the loader compile set
- Add 'lacpi.h' to loader/main.c and reference the bindings

Author: kpowkitty

stand/efi/Makefile

@@ -7,6 +7,7 @@ SUBDIR.${MK_LOADER_IA32}+=	libefi32
 SUBDIR.${MK_FDT}+=	fdt
 SUBDIR.yes+=	libacpi
 SUBDIR.${MK_LOADER_IA32}+=	libacpi32
+SUBDIR.yes+= ../liblua
 SUBDIR.yes+=	.WAIT
 
 SUBDIR.yes+=	boot1 gptboot
@@ -16,8 +17,4 @@ SUBDIR.${MK_LOADER_LUA}+= loader_lua
 SUBDIR.${MK_LOADER_IA32}+= loader_ia32
 SUBDIR.yes+=	loader_simp
 
-.if !defined(MK_FORTH) && !defined(MK_LOADER_IA32) && defined(MK_LOADER_LUA)
-SUBDIR.yes+=	liblua
-.endif
-
 .include <bsd.subdir.mk>

stand/efi/loader/Makefile

@@ -72,6 +72,7 @@ CFLAGS+=	-DEFI
 
 .if ${MACHINE} == "amd64" && ${DO32:U0} == 0
 CFLAGS+=	-I${EFISRC}/libacpi/acpi/include
+CFLAGS+=	-I${EFISRC}/../liblua/acpi/include
 .endif
 
 .if defined(HAVE_FDT) && ${MK_FDT} != "no"
@@ -127,6 +128,20 @@ LDFLAGS+=	-Wl,--threads=1
 
 CLEANFILES+=	${LOADER}.efi
 
+# ACPI Lua bindings compile set
+.if ${__arch} == "amd64" && ${DO32:U0} == 0 && ${LOADER} == "loader_lua"
+LACPI_COMPILE_SET= -j set_lua_acpi_modules
+.else
+LACPI_COMPILE_SET=
+.endif
+
+# To protect ACPI init and lua bindings
+.if ${LOADER} == "loader_lua"
+CFLAGS+= -DLACPI=1
+.else
+CFLAGS+= -DLACPI=0
+.endif
+
 ${LOADER}.efi: ${PROG}
 	@if ${NM} ${.ALLSRC} | grep ' U '; then \
 		echo "Undefined symbols in ${.ALLSRC}"; \
@@ -137,6 +152,7 @@ ${LOADER}.efi: ${PROG}
 		-j .dynamic -j .dynsym -j .rel.dyn \
 		-j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \
 		-j set_X${LOADER_INTERP}_compile_set \
+		${LACPI_COMPILE_SET} \
 		--output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
 
 LIBEFI=		${BOOTOBJ}/efi/libefi/libefi.a
@@ -154,9 +170,4 @@ LDADD=		${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} \
 		${LIBACPI}
 .endif
 
-.if ${__arch} == "amd64" && ${DO32:U0} == 0
-DPADD+=		${LIBLUA}
-LDADD+=		${LIBLUA}
-.endif
-
 .include <bsd.prog.mk>

stand/efi/loader/main.c

@@ -68,7 +68,7 @@
 #define ACPI_SYSTEM_XFACE
 
 // If defined amd64 && loader_lua
-#if defined(__amd64__) && defined(MK_LOADER_LUA)
+#if defined(__amd64__) && LACPI
 #include <init_acpi.h>
 #include <lacpi.h>
 #else
@@ -1237,11 +1237,13 @@ main(int argc, CHAR16 *argv[])
 
 	devinit();
 
-#if defined(__amd64__) && defined(MK_LOADER_LUA)
+#if defined(__amd64__) && LACPI
 	/* Initialize ACPI Subsystem and Tables. */
 	if ((ret = init_acpi()) != 0) {
 		printf("Failed to initialize ACPI\n.");
 	}
+
+	lacpi_interp_ref();
 #endif
 
 	/*