bootloader: fix compatibility with thumb DLDI drivers

It cannot be assumed that a driver will always be compiled to ARM code. Use bx instead of ldr pc.
DS-Homebrew · Nov 5, 2024 · 3eff604 · 3eff604
1 parent 257c7f6
commit 3eff604
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 48 deletions.
diff --git a/settings/bootloader/source/io_dldi.s b/settings/bootloader/source/io_dldi.s
@@ -45,20 +45,26 @@ _io_dldi:
 	.word	_DLDI_shutdown			@
 
 _DLDI_startup:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x68]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x68]
+	bx r12
 _DLDI_isInserted:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x6C]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x6C]
+	bx r12
 _DLDI_readSectors:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x70]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x70]
+	bx r12
 _DLDI_writeSectors:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x74]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x74]
+	bx r12
 _DLDI_clearStatus:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x78]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x78]
+	bx r12
 _DLDI_shutdown:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x7C]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x7C]
+	bx r12
diff --git a/title/bootloader/source/io_dldi.s b/title/bootloader/source/io_dldi.s
@@ -45,20 +45,26 @@ _io_dldi:
 	.word	_DLDI_shutdown			@
 
 _DLDI_startup:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x68]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x68]
+	bx r12
 _DLDI_isInserted:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x6C]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x6C]
+	bx r12
 _DLDI_readSectors:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x70]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x70]
+	bx r12
 _DLDI_writeSectors:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x74]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x74]
+	bx r12
 _DLDI_clearStatus:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x78]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x78]
+	bx r12
 _DLDI_shutdown:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x7C]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x7C]
+	bx r12
diff --git a/universal/bootloader_app/source/io_dldi.s b/universal/bootloader_app/source/io_dldi.s
@@ -45,20 +45,26 @@ _io_dldi:
 	.word	_DLDI_shutdown			@
 
 _DLDI_startup:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x68]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x68]
+	bx r12
 _DLDI_isInserted:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x6C]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x6C]
+	bx r12
 _DLDI_readSectors:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x70]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x70]
+	bx r12
 _DLDI_writeSectors:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x74]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x74]
+	bx r12
 _DLDI_clearStatus:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x78]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x78]
+	bx r12
 _DLDI_shutdown:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x7C]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x7C]
+	bx r12
diff --git a/universal/bootloader_menu/source/io_dldi.s b/universal/bootloader_menu/source/io_dldi.s
@@ -45,20 +45,26 @@ _io_dldi:
 	.word	_DLDI_shutdown			@
 
 _DLDI_startup:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x68]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x68]
+	bx r12
 _DLDI_isInserted:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x6C]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x6C]
+	bx r12
 _DLDI_readSectors:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x70]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x70]
+	bx r12
 _DLDI_writeSectors:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x74]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x74]
+	bx r12
 _DLDI_clearStatus:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x78]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x78]
+	bx r12
 _DLDI_shutdown:
-	mov	r12, #0x06000000
-	ldr pc, [r12, #0x7C]
+	mov r12, #0x06000000
+	ldr r12, [r12, #0x7C]
+	bx r12