Lua support

.gitignore

@@ -5,6 +5,7 @@
 *.obj
 *.elf
 *.map
+*.dis
 
 # Precompiled Headers
 *.gch
@@ -35,6 +36,7 @@
 
 # OS leftovers
 desktop.ini
+.DS_Store
 
 # Sublime files
 *.sublime-*

Makefile

@@ -17,10 +17,10 @@ export COMMON_DIR := ../common
 
 # Definitions for initial RAM disk
 VRAM_TAR    := $(OUTDIR)/vram0.tar
-VRAM_DATA   := data
+VRAM_DATA   := data/*
 VRAM_FLAGS  := --make-new --path-limit 99
 ifeq ($(NTRBOOT),1)
-	VRAM_SCRIPTS := resources/gm9/scripts
+	VRAM_SCRIPTS := resources/gm9/scripts/*
 endif
 
 # Definitions for translation files
@@ -52,7 +52,7 @@ export CFLAGS  := -DDBUILTS="\"$(DBUILTS)\"" -DDBUILTL="\"$(DBUILTL)\"" -DVERSIO
                   -fomit-frame-pointer -ffast-math -std=gnu11 -MMD -MP \
                   -Wno-unused-function -Wno-format-truncation -Wno-format-nonliteral $(INCLUDE) -ffunction-sections -fdata-sections
 export LDFLAGS := -Tlink.ld -nostartfiles -Wl,--gc-sections,-z,max-page-size=4096
-ELF := arm9/arm9.elf arm11/arm11.elf
+ELF := arm9/arm9_code.elf arm9/arm9_data.elf arm11/arm11.elf
 
 .PHONY: all firm $(VRAM_TAR) elf release clean
 all: firm
@@ -93,7 +93,7 @@ release: clean unmarked_readme
 $(VRAM_TAR): $(SPLASH) $(OVERRIDE_FONT) $(VRAM_DATA) $(VRAM_SCRIPTS)
 	@mkdir -p "$(@D)"
 	@echo "Creating $@"
-	@$(PY3) utils/add2tar.py $(VRAM_FLAGS) $(VRAM_TAR) $(shell find $^ -type f)
+	$(PY3) utils/add2tar.py $(VRAM_FLAGS) $(VRAM_TAR) $(shell ls -d -1 $^)
 
 $(LANGUAGE_INL): $(SOURCE_JSON)
 	@echo "Creating $@"
@@ -104,19 +104,23 @@ $(TRF_FOLDER)/%.trf: $(JSON_FOLDER)/%.json
 
 %.elf: .FORCE
 	@echo "Building $@"
-	@$(MAKE) --no-print-directory -C $(@D)
+	@$(MAKE) --no-print-directory -C $(@D) $(@F)
 
-arm9/arm9.elf: $(VRAM_TAR) $(LANGUAGE_INL)
+# Indicate a few explicit dependencies:
+# The ARM9 data section depends on the VRAM drive
+arm9/arm9_data.elf: $(VRAM_TAR) $(LANGUAGE_INL)
+# And the code section depends on the data section being built already
+arm9/arm9_code.elf: arm9/arm9_data.elf
 
 firm: $(ELF) $(TRF_FILES)
 	@mkdir -p $(call dirname,"$(FIRM)") $(call dirname,"$(FIRMD)")
 	@echo "[FLAVOR] $(FLAVOR)"
 	@echo "[VERSION] $(VERSION)"
 	@echo "[BUILD] $(DBUILTL)"
 	@echo "[FIRM] $(FIRM)"
-	@$(PY3) -m firmtool build $(FIRM) $(FTFLAGS) -g -D $(ELF) -C NDMA XDMA
+	@$(PY3) -m firmtool build $(FIRM) $(FTFLAGS) -g -D $(ELF) -C NDMA NDMA XDMA
 	@echo "[FIRM] $(FIRMD)"
-	@$(PY3) -m firmtool build $(FIRMD) $(FTDFLAGS) -g -D $(ELF) -C NDMA XDMA
+	@$(PY3) -m firmtool build $(FIRMD) $(FTDFLAGS) -g -D $(ELF) -C NDMA NDMA XDMA
 
 vram0: $(VRAM_TAR) .FORCE # legacy target name
 

Makefile.build

@@ -1,4 +1,6 @@
 
+LIBS ?= 
+
 OBJECTS := $(patsubst $(SOURCE)/%.s, $(BUILD)/%.o, \
           $(patsubst $(SOURCE)/%.c, $(BUILD)/%.o, \
           $(call rwildcard, $(SOURCE), *.s *.c)))
@@ -11,11 +13,12 @@ all: $(TARGET).elf
 
 .PHONY: clean
 clean:
-	@rm -rf $(BUILD) $(TARGET).elf $(TARGET).map
+	@rm -rf $(BUILD) $(TARGET).elf $(TARGET).dis $(TARGET).map
 
 $(TARGET).elf: $(OBJECTS) $(OBJECTS_COMMON)
 	@mkdir -p "$(@D)"
-	@$(CC) $(LDFLAGS) $^ -o $@
+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+	@$(OBJDUMP) -S $@ > $@.dis
 
 $(BUILD)/%.cmn.o: $(COMMON_DIR)/%.c
 	@mkdir -p "$(@D)"

Makefile.common

@@ -1,3 +1,4 @@
+export OBJDUMP	:=	arm-none-eabi-objdump
 
 dirname   = $(shell dirname $(1))
 
@@ -67,6 +68,10 @@ ifdef SD_TIMEOUT
     CFLAGS += -DSD_TIMEOUT=$(SD_TIMEOUT)
 endif
 
+ifeq ($(NO_LUA),1)
+    CFLAGS += -DNO_LUA
+endif
+
 ifdef N_PANES
     CFLAGS += -DN_PANES=$(N_PANES)
 endif

arm9/Makefile

@@ -6,12 +6,19 @@ SOURCE := source
 BUILD  := build
 
 SUBARCH := -D$(PROCESSOR) -march=armv5te -mtune=arm946e-s -mthumb -mfloat-abi=soft
-INCDIRS := source source/common source/filesys source/crypto source/fatfs source/nand source/virtual source/game source/gamecart source/lodepng source/qrcodegen source/system source/utils
+INCDIRS := source source/common source/filesys source/crypto source/fatfs source/nand source/virtual source/game source/gamecart source/lodepng source/lua source/qrcodegen source/system source/utils
 INCLUDE := $(foreach dir,$(INCDIRS),-I"$(shell pwd)/$(dir)")
 
 ASFLAGS += $(SUBARCH) $(INCLUDE)
 CFLAGS  += $(SUBARCH) $(INCLUDE) -fno-builtin-memcpy -flto
 LDFLAGS += $(SUBARCH) -Wl,--use-blx,-Map,$(TARGET).map -flto
+LIBS    += -lm
 
 include ../Makefile.common
 include ../Makefile.build
+
+arm9_data.elf: arm9.elf
+	$(OBJCOPY) -O elf32-littlearm -j .rodata* -j .data* -j .bss* $< $@
+
+arm9_code.elf: arm9.elf
+	$(OBJCOPY) -O elf32-littlearm -j .text* -j .vectors* $< $@

arm9/link.ld

@@ -5,7 +5,9 @@ ENTRY(_start)
 MEMORY
 {
     VECTORS (RX) : ORIGIN = 0x08000000, LENGTH = 64
-    AHBWRAM (RWX) : ORIGIN = 0x08000040, LENGTH = 512K - 64
+    CODEMEM (RX) : ORIGIN = 0x08000040, LENGTH = 512K - 64
+    BOOTROM (R)  : ORIGIN = 0x08080000, LENGTH = 128K /* BootROM mirrors, don't touch! */
+    DATAMEM (RW) : ORIGIN = 0x080A0000, LENGTH = 384K
 }
 
 SECTIONS
@@ -16,32 +18,36 @@ SECTIONS
         KEEP(*(.vectors));
         . = ALIGN(4);
         __vectors_len = ABSOLUTE(.) - __vectors_vma;
-    } >VECTORS AT>AHBWRAM
+    } >VECTORS AT>CODEMEM
 
     .text : ALIGN(4) {
         __text_s = ABSOLUTE(.);
         *(.text.start);
         *(.text*);
         . = ALIGN(4);
         __text_e = ABSOLUTE(.);
-    } >AHBWRAM
+    } >CODEMEM
 
     .rodata : ALIGN(4) {
         *(.rodata*);
         . = ALIGN(4);
-    } >AHBWRAM
+        __exidx_start = .;
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+        __exidx_end = .;
+        . = ALIGN(4);
+    } >DATAMEM
 
     .data : ALIGN(4) {
         *(.data*);
         . = ALIGN(4);
-    } >AHBWRAM
+    } >DATAMEM
 
-    .bss : ALIGN(4) {
+    .bss (NOLOAD) : ALIGN(4) {
         __bss_start = .;
         *(.bss*);
         . = ALIGN(4);
         __bss_end = .;
-    } >AHBWRAM
+    } >DATAMEM
 
     __end__ = ABSOLUTE(.);
 }

arm9/source/filesys/filetype.c

@@ -8,6 +8,7 @@
 #include "keydb.h"
 #include "ctrtransfer.h"
 #include "scripting.h"
+#include "gm9lua.h"
 #include "png.h"
 #include "ui.h" // only for font file detection
 
@@ -165,6 +166,9 @@ u64 IdentifyFileType(const char* path) {
         u64 type = 0;
         if ((fsize < SCRIPT_MAX_SIZE) && (strcasecmp(ext, SCRIPT_EXT) == 0))
             type |= TXT_SCRIPT; // should be a script (which is also generic text)
+	    // this should check if it's compiled lua bytecode (done with luac), which is NOT text
+	    else if ((fsize < LUASCRIPT_MAX_SIZE) && (strcasecmp(ext, LUASCRIPT_EXT) == 0))
+            type |= TXT_LUA;
         if (fsize < STD_BUFFER_SIZE) type |= TXT_GENERIC;
         return type;
     } else if ((strncmp(path + 2, "/Nintendo DSiWare/", 18) == 0) &&

arm9/source/filesys/filetype.h

@@ -40,6 +40,7 @@
 #define NOIMG_NAND  (1ULL<<35)
 #define HDR_NAND    (1ULL<<36)
 #define TRANSLATION (1ULL<<37)
+#define TXT_LUA     (1ULL<<38)
 #define TYPE_BASE   0xFFFFFFFFFFULL // 40 bit reserved for base types
 
 // #define FLAG_FIRM   (1ULL<<58) // <--- for CXIs containing FIRMs
@@ -77,6 +78,7 @@
 #define FTYPE_KEYINIT(tp)       (tp&(BIN_KEYDB))
 #define FTYPE_KEYINSTALL(tp)    (tp&(BIN_KEYDB))
 #define FTYPE_SCRIPT(tp)        (tp&(TXT_SCRIPT))
+#define FTYPE_LUA(tp)           (tp&(TXT_LUA))
 #define FTYPE_FONT(tp)          (tp&(FONT_PBM|FONT_RIFF))
 #define FTYPE_TRANSLATION(tp)   (tp&(TRANSLATION))
 #define FTYPE_GFX(tp)           (tp&(GFX_PNG))

arm9/source/filesys/support.h

@@ -5,6 +5,7 @@
 // scripts / payloads dir names
 #define LANGUAGES_DIR   "languages"
 #define SCRIPTS_DIR     "scripts"
+#define LUASCRIPTS_DIR  "luascripts"
 #define PAYLOADS_DIR    "payloads"
 
 bool CheckSupportFile(const char* fname);

arm9/source/filesys/vff.h

@@ -8,6 +8,7 @@
 
 #define fvx_tell(fp) ((fp)->fptr)
 #define fvx_size(fp) ((fp)->obj.objsize)
+#define fvx_eof(fp) (fvx_tell(fp) == fvx_size(fp))
 
 #define FN_ANY      0x00
 #define FN_HIGHEST  0x01

arm9/source/godmode.c

@@ -26,6 +26,7 @@
 #include "i2c.h"
 #include "pxi.h"
 #include "language.h"
+#include "gm9lua.h"
 
 #ifndef N_PANES
 #define N_PANES 3
@@ -1198,6 +1199,7 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan
     bool installable = (FTYPE_INSTALLABLE(filetype));
     bool agbexportable = (FTYPE_AGBSAVE(filetype) && (drvtype & DRV_VIRTUAL) && (drvtype & DRV_SYSNAND));
     bool agbimportable = (FTYPE_AGBSAVE(filetype) && (drvtype & DRV_VIRTUAL) && (drvtype & DRV_SYSNAND));
+    bool luascriptable = (FTYPE_LUA(filetype));
 
     char cxi_path[256] = { 0 }; // special options for TMD
     if ((filetype & GAME_TMD) &&
@@ -1213,7 +1215,8 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan
         cxi_dumpable || tik_buildable || key_buildable || titleinfo || renamable || trimable || transferable ||
         hsinjectable || restorable || xorpadable || ebackupable || ncsdfixable || extrcodeable || keyinitable ||
         keyinstallable || bootable || scriptable || fontable || translationable || viewable || installable ||
-        agbexportable || agbimportable || cia_installable || tik_installable || tik_dumpable || cif_installable;
+        agbexportable || agbimportable || cia_installable || tik_installable || tik_dumpable || cif_installable ||
+	luascriptable;
 
     char pathstr[UTF_BUFFER_BYTESIZE(32)];
     TruncateString(pathstr, file_path, 32, 8);
@@ -1296,6 +1299,7 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan
         (filetype & BIN_LEGKEY) ? buildkeydb_str           :
         (filetype & BIN_NCCHNFO)? STR_NCCHINFO_OPTIONS     :
         (filetype & TXT_SCRIPT) ? STR_EXECUTE_GM9_SCRIPT   :
+        (filetype & TXT_LUA)    ? STR_EXECUTE_LUA_SCRIPT   :
         (FTYPE_FONT(filetype))  ? STR_FONT_OPTIONS         :
         (filetype & TRANSLATION)? STR_LANGUAGE_OPTIONS     :
         (filetype & GFX_PNG)    ? STR_VIEW_PNG_FILE        :
@@ -1459,6 +1463,7 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan
     int install = (installable) ? ++n_opt : -1;
     int boot = (bootable) ? ++n_opt : -1;
     int script = (scriptable) ? ++n_opt : -1;
+    int luascript = (luascriptable) ? ++n_opt : -1;
     int font = (fontable) ? ++n_opt : -1;
     int translation = (translationable) ? ++n_opt : -1;
     int view = (viewable) ? ++n_opt : -1;
@@ -1496,6 +1501,7 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan
     if (install > 0) optionstr[install-1] = STR_INSTALL_FIRM;
     if (boot > 0) optionstr[boot-1] = STR_BOOT_FIRM;
     if (script > 0) optionstr[script-1] = STR_EXECUTE_GM9_SCRIPT;
+    if (luascript > 0) optionstr[luascript-1] = STR_EXECUTE_LUA_SCRIPT;
     if (view > 0) optionstr[view-1] = STR_VIEW_PNG_FILE;
     if (font > 0) optionstr[font-1] = STR_SET_AS_ACTIVE_FONT;
     if (translation > 0) optionstr[translation-1] = STR_SET_AS_ACTIVE_LANGUAGE;
@@ -2143,6 +2149,20 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan
         ClearScreenF(true, true, COLOR_STD_BG);
         return 0;
     }
+    else if (user_select == luascript) { // execute lua script
+#ifndef NO_LUA
+        if (ShowPrompt(true, "%s\n%s", pathstr, STR_WARNING_DO_NOT_RUN_UNTRUSTED_SCRIPTS))
+            ShowPrompt(false, "%s\n%s", pathstr, ExecuteLuaScript(file_path) ? STR_SCRIPT_EXECUTE_SUCCESS : STR_SCRIPT_EXECUTE_FAILURE);
+#else
+	// instead of outright removing the option, i think
+	// having it display an error would be useful
+	// so the user knows their issue exactly
+	ShowPrompt(false, "%s", STR_LUA_NOT_INCLUDED);
+#endif
+        GetDirContents(current_dir, current_path);
+        ClearScreenF(true, true, COLOR_STD_BG);
+        return 0;
+    }
     else if (user_select == font) { // set font
         u8* font = (u8*) malloc(0x20000); // arbitrary, should be enough by far
         if (!font) return 1;
@@ -2492,6 +2512,7 @@ u32 GodMode(int entrypoint) {
         }
     }
 
+    // note: this is kinda duplicated in arm9/source/lua/gm9internalsys.c as well
     // check internal clock
     if (IS_UNLOCKED) { // we could actually do this on any entrypoint
         DsTime dstime;
@@ -2919,7 +2940,7 @@ u32 GodMode(int entrypoint) {
             exit_mode = (switched || (pad_state & BUTTON_LEFT)) ? GODMODE_EXIT_POWEROFF : GODMODE_EXIT_REBOOT;
             break;
         } else if (pad_state & (BUTTON_HOME|BUTTON_POWER)) { // Home menu
-            const char* optionstr[8];
+            const char* optionstr[9];
             bool buttonhome = (pad_state & BUTTON_HOME);
             u32 n_opt = 0;
             int poweroff = ++n_opt;
@@ -2928,6 +2949,9 @@ u32 GodMode(int entrypoint) {
             int brick = (HID_ReadState() & BUTTON_R1) ? ++n_opt : 0;
             int titleman = ++n_opt;
             int scripts = ++n_opt;
+#ifndef NO_LUA
+            int luascripts = ++n_opt;
+#endif
             int payloads = ++n_opt;
             int more = ++n_opt;
             if (poweroff > 0) optionstr[poweroff - 1] = STR_POWEROFF_SYSTEM;
@@ -2936,6 +2960,9 @@ u32 GodMode(int entrypoint) {
             if (language > 0) optionstr[language - 1] = STR_LANGUAGE;
             if (brick > 0) optionstr[brick - 1] = STR_BRICK_MY_3DS;
             if (scripts > 0) optionstr[scripts - 1] = STR_SCRIPTS;
+#ifndef NO_LUA
+            if (luascripts > 0) optionstr[luascripts - 1] = STR_LUA_SCRIPTS;
+#endif
             if (payloads > 0) optionstr[payloads - 1] = STR_PAYLOADS;
             if (more > 0) optionstr[more - 1] = STR_MORE;
 
@@ -3013,6 +3040,17 @@ u32 GodMode(int entrypoint) {
                         ClearScreenF(true, true, COLOR_STD_BG);
                         break;
                     }
+#ifndef NO_LUA
+                } else if (user_select == luascripts) {
+                    if (!CheckSupportDir(LUASCRIPTS_DIR)) {
+                        ShowPrompt(false, STR_LUA_SCRIPTS_DIRECTORY_NOT_FOUND, LUASCRIPTS_DIR);
+                    } else if (FileSelectorSupport(loadpath, STR_HOME_LUA_SCRIPTS_MENU_SELECT_SCRIPT, LUASCRIPTS_DIR, "*.lua")) {
+                        ExecuteLuaScript(loadpath);
+                        GetDirContents(current_dir, current_path);
+                        ClearScreenF(true, true, COLOR_STD_BG);
+                        break;
+                    }
+#endif
                 } else if (user_select == payloads) {
                     if (!CheckSupportDir(PAYLOADS_DIR)) ShowPrompt(false, STR_PAYLOADS_DIRECTORY_NOT_FOUND, PAYLOADS_DIR);
                     else if (FileSelectorSupport(loadpath, STR_HOME_PAYLOADS_MENU_SELECT_PAYLOAD, PAYLOADS_DIR, "*.firm"))
@@ -3096,12 +3134,21 @@ u32 ScriptRunner(int entrypoint) {
     if (PathExist("V:/" VRAM0_AUTORUN_GM9)) {
         ClearScreenF(true, true, COLOR_STD_BG); // clear splash
         ExecuteGM9Script("V:/" VRAM0_AUTORUN_GM9);
+    } else if (PathExist("V:/" VRAM0_AUTORUN_LUA)) {
+        ClearScreenF(true, true, COLOR_STD_BG); // clear splash
+        ExecuteLuaScript("V:/" VRAM0_AUTORUN_LUA);
     } else if (PathExist("V:/" VRAM0_SCRIPTS)) {
         char loadpath[256];
         char title[256];
         snprintf(title, sizeof(title), STR_FLAVOR_SCRIPTS_MENU_SELECT_SCRIPT, FLAVOR);
         if (FileSelector(loadpath, title, "V:/" VRAM0_SCRIPTS, "*.gm9", HIDE_EXT, false))
             ExecuteGM9Script(loadpath);
+    } else if (PathExist("V:/" VRAM0_LUASCRIPTS)) {
+        char loadpath[256];
+        char title[256];
+        snprintf(title, sizeof(title), STR_FLAVOR_SCRIPTS_MENU_SELECT_SCRIPT, FLAVOR);
+        if (FileSelector(loadpath, title, "V:/" VRAM0_LUASCRIPTS, "*.lua", HIDE_EXT, false))
+            ExecuteLuaScript(loadpath);
     } else ShowPrompt(false, STR_COMPILED_AS_SCRIPT_AUTORUNNER_BUT_NO_SCRIPT_DERP);
 
     // deinit