CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-30 14:53:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2196 from aliaspider/master

Browse Source 
(CTR/3DS) allow access for more RAM.
This commit is contained in:
Twinaphex 2015-10-02 00:29:49 +02:00
commit 87622f052b
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.ctr
View File

@ -20,6 +20,9 @@ APP_CIA_RSF = ctr/tools/template-cia.rsf
APP_3DS_RSF = ctr/tools/template-3ds.rsf APP_3DS_RSF = ctr/tools/template-3ds.rsf
O3DS_80MB_APPMEM = 0
ifeq ($(BIG_STACK),1) ifeq ($(BIG_STACK),1)
CTR_STACK_SIZE = 0x400000 CTR_STACK_SIZE = 0x400000
else else
@ -30,6 +33,15 @@ CTR_LINEAR_HEAP_SIZE = 0x600000
include ctr/Makefile.cores include ctr/Makefile.cores
ifeq ($(O3DS_80MB_APPMEM), 1)
APP_SYSTEM_MODE = 3
else
APP_SYSTEM_MODE = 0
endif
APP_SYSTEM_MODE_EXT = 6
OBJS := OBJS :=
OBJS += gfx/drivers/ctr_sprite.o OBJS += gfx/drivers/ctr_sprite.o
@ -394,7 +406,9 @@ $(TARGET)_stripped.elf: $(TARGET).elf
$(STRIP) $@ $(STRIP) $@
$(TARGET).cia: $(TARGET)_stripped.elf $(TARGET).bnr $(TARGET).icn $(APP_CIA_RSF) $(TARGET).cia: $(TARGET)_stripped.elf $(TARGET).bnr $(TARGET).icn $(APP_CIA_RSF)
$(MAKEROM) -f cia -o $@ -rsf $(APP_CIA_RSF) -target t -exefslogo -elf $(TARGET)_stripped.elf -icon $(TARGET).icn -banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID) $(MAKEROM) -f cia -o $@ -rsf $(APP_CIA_RSF) -target t -exefslogo -elf $(TARGET)_stripped.elf -icon $(TARGET).icn\
-banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID)\
-DAPP_SYSTEM_MODE=$(APP_SYSTEM_MODE) -DAPP_SYSTEM_MODE_EXT=$(APP_SYSTEM_MODE_EXT)
clean: clean:
rm -f $(OBJS) rm -f $(OBJS)

2
ctr/Makefile.cores
View File

@ -159,6 +159,7 @@ else ifeq ($(LIBRETRO), fb_alpha_neo)
APP_ICON = ctr/fb_alpha_neo.png APP_ICON = ctr/fb_alpha_neo.png
#APP_BANNER = ctr/libretro_banner.png #APP_BANNER = ctr/libretro_banner.png
#APP_AUDIO = ctr/silent.wav #APP_AUDIO = ctr/silent.wav
O3DS_80MB_APPMEM = 1
else ifeq ($(LIBRETRO), fb_alpha_cps1) else ifeq ($(LIBRETRO), fb_alpha_cps1)
APP_TITLE = Final Burn Alpha - CPS-1 APP_TITLE = Final Burn Alpha - CPS-1
@ -179,6 +180,7 @@ else ifeq ($(LIBRETRO), fb_alpha_cps2)
APP_ICON = ctr/fb_alpha_cps2.png APP_ICON = ctr/fb_alpha_cps2.png
#APP_BANNER = ctr/libretro_banner.png #APP_BANNER = ctr/libretro_banner.png
#APP_AUDIO = ctr/silent.wav #APP_AUDIO = ctr/silent.wav
O3DS_80MB_APPMEM = 1
else ifeq ($(LIBRETRO), catsfc_plus) else ifeq ($(LIBRETRO), catsfc_plus)
APP_TITLE = CATSFC Plus Libretro APP_TITLE = CATSFC Plus Libretro

2
ctr/tools/template-cia.rsf
View File

@ -92,6 +92,8 @@ AccessControlInfo:
MaxCpu : 0x9E # Default MaxCpu : 0x9E # Default
CpuSpeed : 804mhz CpuSpeed : 804mhz
EnableL2Cache : true EnableL2Cache : true
SystemMode : $(APP_SYSTEM_MODE)
SystemModeExt : $(APP_SYSTEM_MODE_EXT)
DisableDebug : false DisableDebug : false
EnableForceDebug : false EnableForceDebug : false

5
frontend/drivers/platform_ctr.c
View File

@ -43,6 +43,8 @@ void wait_for_input(void);
#define DEBUG_HOLD() do{printf("%s@%s:%d.\n",__FUNCTION__, __FILE__, __LINE__);fflush(stdout);wait_for_input();}while(0) #define DEBUG_HOLD() do{printf("%s@%s:%d.\n",__FUNCTION__, __FILE__, __LINE__);fflush(stdout);wait_for_input();}while(0)
#define CTR_APPMEMALLOC_PTR ((u32*)0x1FF80040)
#ifndef CTR_STACK_SIZE #ifndef CTR_STACK_SIZE
#define CTR_STACK_SIZE 0x100000 #define CTR_STACK_SIZE 0x100000
#endif #endif
@ -68,10 +70,11 @@ void __libc_fini_array(void);
void __system_allocateHeaps() { void __system_allocateHeaps() {
u32 tmp=0; u32 tmp=0;
int64_t mem_used; int64_t mem_used;
u32 app_memory = *CTR_APPMEMALLOC_PTR;
svcGetSystemInfo(&mem_used, 0, 1); svcGetSystemInfo(&mem_used, 0, 1);
__linear_heap_size_local = CTR_LINEAR_HEAP_SIZE; __linear_heap_size_local = CTR_LINEAR_HEAP_SIZE;
__heap_size_local = (0x4000000 - mem_used - __linear_heap_size_local - 0x1000) & 0xFFFFF000; __heap_size_local = (app_memory - mem_used - __linear_heap_size_local - 0x10000) & 0xFFFFF000;
// Allocate the application heap // Allocate the application heap
__heapBase = 0x08000000; __heapBase = 0x08000000;