Changeset 21823 for branches/gcc-kmk/src/odincrt/malloc.cpp

Timestamp:

Nov 25, 2011, 10:18:08 PM (14 years ago)

Author:

dmik

Message:

odincrt: Actually build malloc funciton replacements.

File:

• branches/gcc-kmk/src/odincrt/malloc.cpp (modified) (3 diffs)

branches/gcc-kmk/src/odincrt/malloc.cpp

@@ -5 +5 @@
  */
 
+#include <odin.h>
 #include <os2sel.h>
+
+#include <memory.h>
+
+#ifdef DEBUG
+unsigned long nrcalls_malloc = 0;
+unsigned long nrcalls_free   = 0;
+unsigned long totalmemalloc  = 0;
+
+// currently, it's a dumb stub
+void _LNK_CONV getcrtstat(unsigned long *pnrcalls_malloc,
+                          unsigned long *pnrcalls_free,
+                          unsigned long *ptotalmemalloc)
+{
+    *pnrcalls_malloc = nrcalls_malloc;
+    *pnrcalls_free   = nrcalls_free;
+    *ptotalmemalloc  = totalmemalloc;
+}
+#endif
 
 extern "C"
@@ -11 +30 @@
 
 // these are GCC kLIBC exports
-void _std_malloc(size_t sz);
+void *_std_malloc(size_t sz);
 void *_std_realloc(void *ptr, size_t sz);
 void *_std_calloc(size_t cnt, size_t sz);
 void _std_free(void *ptr);
 
-void malloc(size_t sz)
+void *malloc(size_t sz)
 {
     unsigned short sel = RestoreOS2FS();
@@ -37 +56 @@
     void *ptr = _std_calloc(cnt, sz);
         SetFS(sel);
-        return rc;
+        return ptr;
 }