Changeset 1015

Timestamp:

01/02/11 10:05:19 (2 years ago)

Author:

reyalP

Message:

experimental support for alternate memory allocator, see ​http://chdk.setepontos.com/index.php?topic=5980.msg59128#msg59128

Location:

trunk

Files:

• buildconf.inc (modified) (1 diff)
• core/Makefile (modified) (1 diff)
• core/main.c (modified) (1 diff)
• core/suba.c (added)
• include/lolevel.h (modified) (1 diff)
• include/platform.h (modified) (1 diff)
• makefile.inc (modified) (1 diff)
• platform/d10/sub/100a/stubs_entry_2.S (modified) (1 diff)
• platform/generic/wrappers.c (modified) (3 diffs)

trunk/buildconf.inc

@@ -12 +12 @@
 OPT_EDGEOVERLAY=1
 OPT_LUA_STRLIB=1
-
+# experimental - allocate memory from alternate heap. Default 2MB from EXMEM_RAMDISK
+# See exmem_malloc_init in generic/wrappers.c
+#OPT_EXMEM_MALLOC=1
 # experimental PTP/USB interface
 #OPT_PTP=1

trunk/core/Makefile

@@ -61 +61 @@
 OPT_OBJS+=ptp.o 
 endif 
+ifdef OPT_EXMEM_MALLOC
+#CFLAGS+=-DOPT_EXMEM_MALLOC
+OPT_OBJS+=suba.o
+endif
 
 OBJS=entry.o nothumb.o main.o gui_draw.o gui_menu.o gui_palette.o gui_mbox.o \

trunk/core/main.c

@@ -70 +70 @@
     spytask_can_start=0;
 
+#ifdef OPT_EXMEM_MALLOC
+        exmem_malloc_init();
+#endif
+
 #ifdef CAM_CHDK_PTP
     init_chdk_ptp_task();

trunk/include/lolevel.h

@@ -289 +289 @@
 #endif
 
-#endif
+#ifdef OPT_EXMEM_MALLOC
+extern void *_exmem_alloc(int pool_id,int size,int unk);
+#endif
+
+#endif

trunk/include/platform.h

@@ -548 +548 @@
 void ExitTask();
 
-#endif
+#ifdef OPT_EXMEM_MALLOC
+void exmem_malloc_init(void);
+#endif
+
+#endif

trunk/makefile.inc

@@ -405 +405 @@
 endif
 
+ifdef OPT_EXMEM_MALLOC
+CFLAGS+=-DOPT_EXMEM_MALLOC
+endif
+
 ifdef OPT_WARNINGS
      ifeq ($(GCC_VERSION_MAJOR),3)

trunk/platform/d10/sub/100a/stubs_entry_2.S

@@ -43 +43 @@
 // useful for debugging with uart redirect or crash log
 NHSTUB(LogPrintf,0xFF86EF38)
+// allocate from given EXMEM pool
+NHSTUB(exmem_alloc, 0xFF86C810)
+// not needed yet
+//NHSTUB(exmem_free, 0xFF86C7B0)

trunk/platform/generic/wrappers.c

@@ -484 +484 @@
 }
 
+#ifdef OPT_EXMEM_MALLOC
+// I set this up to 16 mb and it still booted...
+#define EXMEM_HEAP_SIZE (1024*1024*2)
+// these aren't currently needed elsewhere
+/*
+void * exmem_alloc(unsigned pool_id, unsigned size)
+{
+        return _exmem_alloc(pool_id,size,0);
+}
+
+void exmem_free(unsigned pool_id)
+{
+        _exmem_free(pool_id);
+}
+*/
+
+static void *exmem_heap;
+
+void *suba_init(void *heap, unsigned size, unsigned rst, unsigned mincell);
+void *suba_alloc(void *heap, unsigned size, unsigned zero);
+int suba_free(void *heap, void *p);
+
+void exmem_malloc_init() {
+        // pool zero is EXMEM_RAMDISK on d10
+        void *mem = _exmem_alloc(0,EXMEM_HEAP_SIZE,0);
+        if(mem) {
+                exmem_heap = suba_init(mem,EXMEM_HEAP_SIZE,1,1024);
+        }
+}
+
+void *malloc(unsigned size) {
+        if(exmem_heap)
+                return suba_alloc(exmem_heap,size,0);
+        else
+                return _malloc(size);
+}
+void free(void *p) {
+        if(exmem_heap)
+                suba_free(exmem_heap,p);
+        else
+                free(p);
+}
+// regular malloc
+#else
 void *malloc(long size) {
     return _malloc(size);
@@ -491 +535 @@
     return _free(p);
 }
+#endif
 
 void *memcpy(void *dest, const void *src, long n) {
@@ -1017 +1062 @@
 }
 */
+