Merge tag 'v0.10.0' of https://github.com/devkitPro/nds-hb-menu

Author: lifehackerhansol

.gitignore

@@ -8,6 +8,7 @@
 *.dsi
 *.cia
 *.zip
+SCFW.SC
 BootStrap/arm7/build
 BootStrap/arm9/build
 data

Makefile

@@ -10,7 +10,7 @@ endif
 include $(DEVKITARM)/ds_rules
 
 export HBMENU_MAJOR	:= 0
-export HBMENU_MINOR	:= 9
+export HBMENU_MINOR	:= 10
 export HBMENU_PATCH	:= 0
 
 
@@ -127,7 +127,7 @@ endif
 all:	bootloader bootstub exceptionstub $(BUILD)
 
 #---------------------------------------------------------------------------------
-$(BUILD):
+$(BUILD): bootloader bootstub exceptionstub
 	@[ -d $@ ] || mkdir -p $@
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 

bootloader

@@ -0,0 +1,23 @@
+#include <calico.h>
+#include <nds.h>
+
+#include "nds_loader_arm9.h"
+#include "exceptionstub_bin.h"
+
+typedef struct excptStub_t {
+	u32 dummy;
+	void* bss_start;
+	void* bss_end;
+	VoidFn excpt_vector;
+} excptStub_t;
+
+void installExcptStub(void)
+{
+	excptStub_t* exceptionstub = (excptStub_t*)0x2ffa000;
+	armCopyMem32(exceptionstub,exceptionstub_bin,exceptionstub_bin_size);
+	if (exceptionstub->bss_start != exceptionstub->bss_end) {
+		armFillMem32(exceptionstub->bss_start, 0, (char*)exceptionstub->bss_end - (char*)exceptionstub->bss_start);
+	}
+
+	EXCEPTION_VECTOR = exceptionstub->excpt_vector;
+}

nds-exception-stub

@@ -157,7 +157,7 @@ string browseForFile (const vector<string>& extensionList) {
 	getDirectoryContents (dirContents, extensionList);
 	showDirectoryContents (dirContents, screenOffset);
 
-	while (true) {
+	while (pmMainLoop()) {
 		// Clear old cursors
 		for (int i = ENTRIES_START_ROW; i < ENTRIES_PER_SCREEN + ENTRIES_START_ROW; i++) {
 			iprintf ("\x1b[%d;0H ", i);
@@ -172,6 +172,9 @@ string browseForFile (const vector<string>& extensionList) {
 			scanKeys();
 			pressed = keysDownRepeat();
 			swiWaitForVBlank();
+			if (!pmMainLoop()) {
+				return "";
+			}
 		} while (!pressed);
 
 		if (pressed & KEY_UP) 		fileOffset -= 1;
@@ -219,4 +222,6 @@ string browseForFile (const vector<string>& extensionList) {
 			showDirectoryContents (dirContents, screenOffset);
 		}
 	}
+
+	return "";
 }

source/excpt_stub.c

@@ -63,7 +63,7 @@ void InitGUI(void) {
 //---------------------------------------------------------------------------------
 void stop (void) {
 //---------------------------------------------------------------------------------
-	while (1) {
+	while (pmMainLoop()) {
 		swiWaitForVBlank();
 	}
 }
@@ -74,9 +74,13 @@ int main(int argc, char **argv) {
 
 	// overwrite reboot stub identifier
 	// so tapping power on DSi returns to DSi menu
-	extern u64 *fake_heap_end;
-	*fake_heap_end = 0;
+	pmClearResetJumpTarget();
+
+	// install exception stub
+	installExcptStub();
+
 	InitGUI();
+
 	if (!fatInitDefault()) {
 		iprintf ("\n\nfatinitDefault failed!\n");
 		stop();
@@ -91,9 +95,12 @@ int main(int argc, char **argv) {
 		chdir("/");
 	}
 
-	while(1) {
+	while(pmMainLoop()) {
 
 		string filename = browseForFile(extensionList);
+		if (filename.empty()) {
+			continue;
+		}
 
 		// Construct a command line
 		vector<string> argarray;
@@ -115,7 +122,7 @@ int main(int argc, char **argv) {
 
 		argarray.clear();
 
-		while (1) {
+		while (pmMainLoop()) {
 			swiWaitForVBlank();
 			scanKeys();
 			if (!(keysHeld() & KEY_A)) break;