Drop libnds32

Upstream libnds now allows configurable DLDI allocation size. Since the only reason libnds32 existed was to increase the driver size, it can now be nuked.
lifehackerhansol · Nov 19, 2023 · 7ecb281 · 7ecb281
1 parent e0f6121
commit 7ecb281
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 26 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -6,7 +6,3 @@
 	path = DLDI
 	url = https://github.com/DS-Homebrew/DLDI
 	branch = builds
-[submodule "libnds32"]
-	path = libnds32
-	url = https://github.com/lifehackerhansol/libnds32
-	branch = blocksds
diff --git a/Makefile b/Makefile
@@ -5,8 +5,6 @@
 BLOCKSDS	?= /opt/blocksds/core
 BLOCKSDSEXT	?= /opt/blocksds/external
 
-export TOPDIR := $(shell pwd $(CURDIR))
-
 # User config
 # ===========
 
@@ -229,7 +227,7 @@ dist	:	all
 	@cp N5/_ds_menu.dat bootstrap/N5/_ds_menu.dat
 
 	@cd bootstrap && zip -r bootstrap.zip *
-	@mv bootstrap/bootstrap.zip $(TOPDIR)
+	@mv bootstrap/bootstrap.zip .
 
 _ds_menu.dat:	$(ROM)
 	@echo "Make original R4"

diff --git a/Makefile.arm9 b/Makefile.arm9
@@ -8,8 +8,6 @@ BLOCKSDSEXT	?= /opt/blocksds/external
 WONDERFUL_TOOLCHAIN	?= /opt/wonderful
 ARM_NONE_EABI_PATH	?= $(WONDERFUL_TOOLCHAIN)/toolchain/gcc-arm-none-eabi/bin/
 
-export LIBNDS32	:= $(TOPDIR)/libnds32
-
 # Source code paths
 # -----------------
 
@@ -27,8 +25,8 @@ DEFINES		:= -D_NO_BOOTSTUB_
 # Libraries
 # ---------
 
-LIBS		:= -lnds329
-LIBDIRS		:= $(LIBNDS32)
+LIBS		:= -lnds9
+LIBDIRS		:= $(BLOCKSDS)/libs/libnds
 
 # Build artifacts
 # ---------------

diff --git a/Makefile.arm9_crt0set b/Makefile.arm9_crt0set
@@ -8,8 +8,6 @@ BLOCKSDSEXT	?= /opt/blocksds/external
 WONDERFUL_TOOLCHAIN	?= /opt/wonderful
 ARM_NONE_EABI_PATH	?= $(WONDERFUL_TOOLCHAIN)/toolchain/gcc-arm-none-eabi/bin/
 
-export LIBNDS32	:= $(TOPDIR)/libnds32
-
 # Source code paths
 # -----------------
 
@@ -27,8 +25,8 @@ DEFINES		:= -D_NO_BOOTSTUB_
 # Libraries
 # ---------
 
-LIBS		:= -lnds329
-LIBDIRS		:= $(LIBNDS32)
+LIBS		:= -lnds9
+LIBDIRS		:= $(BLOCKSDS)/libs/libnds
 
 # Build artifacts
 # ---------------

diff --git a/Makefile.arm9_r4ids b/Makefile.arm9_r4ids
@@ -8,8 +8,6 @@ BLOCKSDSEXT	?= /opt/blocksds/external
 WONDERFUL_TOOLCHAIN	?= /opt/wonderful
 ARM_NONE_EABI_PATH	?= $(WONDERFUL_TOOLCHAIN)/toolchain/gcc-arm-none-eabi/bin/
 
-export LIBNDS32	:= $(TOPDIR)/libnds32
-
 # Source code paths
 # -----------------
 
@@ -27,8 +25,8 @@ DEFINES		:= -D_NO_BOOTSTUB_
 # Libraries
 # ---------
 
-LIBS		:= -lnds329
-LIBDIRS		:= $(LIBNDS32)
+LIBS		:= -lnds9
+LIBDIRS		:= $(BLOCKSDS)/libs/libnds
 
 # Build artifacts
 # ---------------

diff --git a/Makefile.arm9_r4isdhc b/Makefile.arm9_r4isdhc
@@ -8,8 +8,6 @@ BLOCKSDSEXT	?= /opt/blocksds/external
 WONDERFUL_TOOLCHAIN	?= /opt/wonderful
 ARM_NONE_EABI_PATH	?= $(WONDERFUL_TOOLCHAIN)/toolchain/gcc-arm-none-eabi/bin/
 
-export LIBNDS32	:= $(TOPDIR)/libnds32
-
 # Source code paths
 # -----------------
 
@@ -27,8 +25,8 @@ DEFINES		:= -D_NO_BOOTSTUB_
 # Libraries
 # ---------
 
-LIBS		:= -lnds329
-LIBDIRS		:= $(LIBNDS32)
+LIBS		:= -lnds9
+LIBDIRS		:= $(BLOCKSDS)/libs/libnds
 
 # Build artifacts
 # ---------------

diff --git a/arm9/source/dldi_size.s b/arm9/source/dldi_size.s
@@ -0,0 +1,11 @@
+@
+@	flashcard-bootstrap
+@	By lifehackerhansol
+@
+@	SPDX-License-Identifier: 0BSD
+@
+
+@ Use 32KB DLDI space, needed for legacy homebrew
+
+.global __dldi_size
+.equ __dldi_size, 32768
diff --git a/arm9_r4isdhc/ds_arm9_r4isdhc.ld b/arm9_r4isdhc/ds_arm9_r4isdhc.ld
@@ -37,6 +37,23 @@ SECTIONS
 		. = ALIGN(4);  /* REQUIRED. LD is flaky without it. */
 	} >ewram :main = 0x00
 
+	/* Create DLDI driver area. It should be zero-byte if DLDI code
+	   is not present, but set to an user-provided size if it is
+           present. */
+	PROVIDE(__dldi_size = 16384);
+	__dldi_log2_size = LOG2CEIL(__dldi_size + 1) - 1;
+	.dldi :
+	{
+		__dldi_start = .;
+		*(.dldi)
+		. = ALIGN(4);
+
+		__dldi_data_end = .;
+		__dldi_end = __dldi_data_end > __dldi_start ? __dldi_start + __dldi_size : __dldi_start;
+		. = __dldi_end;
+		. = ALIGN(4);
+	} >ewram :main = 0x00
+
 	.plt : { *(.plt) } >ewram :main = 0xff
 
 	.init :

diff --git a/build.sh b/build.sh
@@ -2,5 +2,4 @@ clang -o resource/dsbize/dsbize resource/dsbize/dsbize.c
 clang++ -o resource/r4denc/r4denc resource/r4denc/r4denc.cpp
 mkdir -p data
 make -C bootloader LOADBIN=$PWD/data/load.bin
-make -C libnds32 arm9 -j`nproc`
 make dist
diff --git a/clean.sh b/clean.sh
@@ -1,4 +1,3 @@
 make -C bootloader clean
-make -C libnds32 clean
 make clean
 rm resource/dsbize/dsbize resource/r4denc/r4denc
diff --git a/libnds32 b/libnds32