[Scummvm-cvs-logs] SF.net SVN: scummvm:[53056] scummvm/branches/branch-1-2-0/backends/platform /ds/arm9
agent-q at users.sourceforge.net
agent-q at users.sourceforge.net
Thu Oct 7 22:36:00 CEST 2010
Revision: 53056
http://scummvm.svn.sourceforge.net/scummvm/?rev=53056&view=rev
Author: agent-q
Date: 2010-10-07 20:35:59 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
DS: A few small memory optimisations
Modified Paths:
--------------
scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/makefile
scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/wordcompletion.cpp
Modified: scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/makefile 2010-10-07 20:18:33 UTC (rev 53055)
+++ scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/makefile 2010-10-07 20:35:59 UTC (rev 53056)
@@ -75,7 +75,7 @@
ifdef DS_BUILD_K
else
- # USE_MAD = 1
+ USE_MAD = 1
endif
endif
endif
@@ -104,6 +104,10 @@
# I actually had to use
# ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork' LDFLAGS='C:/Progra~1/devkitpro/libnds/lib/libnds9.a' --disable-shared --disable-debugging
+
+# handy command to find where the big symbols are in the ELF:
+# arm-eabi-nm -S --radix=d --demangle scummvm.elf |sort -n -r --key=2 |less
+
ARM = 1
USE_ARM_SOUND_ASM = 1
USE_ARM_COSTUME_ASM = 1
@@ -241,7 +245,7 @@
DEFINES += -DUSE_MAD
endif
-DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE -DDISABLE_MASS_ADD
+DEFINES += -DREDUCE_MEMORY_USAGE -DDISABLE_DEBUGGER -DUSE_TEXT_CONSOLE -DDISABLE_MASS_ADD -DDISABLE_NES_APU
LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections
@@ -345,7 +349,7 @@
ndsall:
@[ -d $(BUILD) ] || mkdir -p $(BUILD)
- make -C ./$(BUILD) -f ../makefile scummvm.nds scummvm.ds.gba
+ $(MAKE) -C ./$(BUILD) -f ../makefile scummvm.nds scummvm.ds.gba
include $(srcdir)/Makefile.common
Modified: scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/dsmain.cpp 2010-10-07 20:18:33 UTC (rev 53055)
+++ scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/dsmain.cpp 2010-10-07 20:35:59 UTC (rev 53056)
@@ -2784,7 +2784,7 @@
// Fast Ram
///////////////////
-#define FAST_RAM_SIZE (24000)
+#define FAST_RAM_SIZE (22500)
#define ITCM_DATA __attribute__((section(".itcm")))
u8 *fastRamPointer;
Modified: scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/fat/gba_nds_fat.c 2010-10-07 20:18:33 UTC (rev 53055)
+++ scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/fat/gba_nds_fat.c 2010-10-07 20:35:59 UTC (rev 53056)
@@ -194,7 +194,8 @@
// available: IWRAM on NDS ARM7, EWRAM on NDS ARM9 and GBA
// Files
-_VARS_IN_RAM FAT_FILE openFiles[MAX_FILES_OPEN];
+FAT_FILE openFiles[MAX_FILES_OPEN] __attribute__((section(".itcm")));
+//_VARS_IN_RAM
// Long File names
_VARS_IN_RAM char lfnName[MAX_FILENAME_LENGTH];
Modified: scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/wordcompletion.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/wordcompletion.cpp 2010-10-07 20:18:33 UTC (rev 53055)
+++ scummvm/branches/branch-1-2-0/backends/platform/ds/arm9/source/wordcompletion.cpp 2010-10-07 20:35:59 UTC (rev 53056)
@@ -30,11 +30,11 @@
#ifdef ENABLE_AGI
namespace DS {
-// Default dictionary is about 64Kb, so 128Kb should be enough for future expansion
-#define WORD_BUFFER_SIZE (128 * 1024)
+// Default dictionary is about 64Kb, so 96Kb should be enough for future expansion
+#define WORD_BUFFER_SIZE (96 * 1024)
// Default dictionary has ~8000 words
-#define MAX_WORD_COUNT 16000
+#define MAX_WORD_COUNT 12000
char wordBuffer[WORD_BUFFER_SIZE];
int wordBufferPos = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list