[fw-isoldr] Added support for extended memory on NAOMI.

Also bump version to 0.8.4

Author: DC-SWAT

firmware/isoldr/loader/Makefile.cfg

@@ -6,7 +6,7 @@
 
 TARGET = 0x8ce00000
 BUILD = build
-VERSION = "0.8.3"
+VERSION = "0.8.4"
 INSTALL_PATH = ../../../build/firmware/isoldr
 # INSTALL_PATH = /Volumes/DREAMSHELL/DS/firmware/isoldr
 

firmware/isoldr/loader/cdda.c

@@ -37,7 +37,9 @@
 /* AICA memory end for PCM buffer */
 #define AICA_MEMORY_START 0x00800000
 #define AICA_MEMORY_END 0x00a00000
+#define AICA_MEMORY_8MB_END 0x01000000
 #define AICA_MEMORY_END_ARM 0x00200000
+#define AICA_MEMORY_8MB_END_ARM 0x00800000
 
 #define aica_dma_in_progress() AICA_DMA_ADST
 #define aica_dma_disable() AICA_DMA_ADEN = 0
@@ -302,10 +304,12 @@ static void setup_pcm_buffer(void) {
 	}
 
 	/* Setup buffer at end of sound memory */
-	cdda->aica_left[0] = AICA_MEMORY_END - cdda->size;
+	const uint32 aica_memory_end = malloc_heap_pos() > RAM_END_ADDR ?
+		AICA_MEMORY_8MB_END : AICA_MEMORY_END;
+	cdda->aica_left[0] = aica_memory_end - cdda->size;
 	cdda->aica_left[1] = cdda->aica_left[0] + (cdda->size >> 2);
 
-	cdda->aica_right[0] = AICA_MEMORY_END - (cdda->size >> 1);
+	cdda->aica_right[0] = aica_memory_end - (cdda->size >> 1);
 	cdda->aica_right[1] = cdda->aica_right[0] + (cdda->size >> 2);
 
 	/* Setup end position for sound buffer */
@@ -386,7 +390,9 @@ static void aica_stop_clean_cdda() {
 static void aica_setup_cdda(int clean) {
 
 	uint32 val;
-	const uint32 smp_ptr = AICA_MEMORY_END_ARM - cdda->size;
+	const uint32 aica_memory_end = malloc_heap_pos() > RAM_END_ADDR ?
+		AICA_MEMORY_8MB_END_ARM : AICA_MEMORY_END_ARM;
+	const uint32 smp_ptr = aica_memory_end - cdda->size;
 	const int smp_size = cdda->size >> 1;
 
 	/* Stop AICA channels */

firmware/isoldr/loader/include/main.h

@@ -33,6 +33,7 @@
 #define FLASH_ROM_ICON_ADDR          (FLASH_ROM_ADDR + 0x1a480)
 #define RAM_START_ADDR               0x0c000000
 #define RAM_END_ADDR                 0x0d000000
+#define RAM_END_32MB_ADDR            0x0e000000
 
 /* Software environment structure in RAM */
 #define SYSCALLS_INFO_ADDR           (RAM_START_ADDR)

firmware/isoldr/loader/malloc.c

@@ -192,14 +192,19 @@ static void internal_malloc_stat(uint32 *free_size, uint32 *max_free_size) {
 
     uint32 exec_addr = CACHED_ADDR(APP_BIN_ADDR);
 
-    if ((uint32)internal_malloc_base < exec_addr) {
+    if((uint32)internal_malloc_base > CACHED_ADDR(RAM_END_ADDR)) {
+        *free_size = CACHED_ADDR(RAM_END_32MB_ADDR) - (uint32)internal_malloc_base;
+    }
+    else if ((uint32)internal_malloc_base < exec_addr) {
         if(IsoInfo->exec.type == BIN_TYPE_KATANA) {
             *free_size = CACHED_ADDR(IP_BIN_BOOTSTRAP_2_ADDR) - (uint32)internal_malloc_pos;
-        } else {
+        }
+        else {
             *free_size = exec_addr - (uint32)internal_malloc_pos;
         }
-    } else {
-        *max_free_size = CACHED_ADDR(RAM_END_ADDR) - (uint32)internal_malloc_base;
+    }
+    else {
+        *free_size = CACHED_ADDR(RAM_END_ADDR) - (uint32)internal_malloc_base;
     }
     *max_free_size = *free_size;
 }