From c9ed392ace7d7f1118a88cd2e682f356aa5144ee Mon Sep 17 00:00:00 2001
From: Ian Rogers <ian.rogers@manchester.ac.uk>
Date: Wed, 4 Mar 2009 23:02:36 +0000
Subject: [PATCH] Switch use of malloc/free to sysMalloc/sysFree. Harmony build
 fix.

---
 build.xml                       |  4 +++-
 tools/bootloader/RunBootImage.C |  5 +----
 tools/bootloader/sys.h          |  2 ++
 tools/bootloader/sysMemory.C    |  5 +++--
 tools/bootloader/sysThread.C    | 18 +++++++++---------
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/build.xml b/build.xml
index 25b750bfa..e864cb857 100644
--- a/build.xml
+++ b/build.xml
@@ -1620,7 +1620,7 @@ Check to make sure all required properties are specified. This includes properti
         <exec executable="${c.exe}" failonerror="true">
           <arg line="-DLINUX=1 ${rvm.c++.args} -lpthread ${c++.librt} -L${harmony.lib.dir} -lhyprt -lhyarchive -lhyzlib"/>
           <arg value="-o"/>
-          <arg value="${vmi.dll}"/>
+          <arg value="${toString:vmi.dll}"/>
           <arg value="${bl.dir}/harmony.c"/>
           <arg value="libraryInterface/Harmony/ASF/native/vmls.c"/>
           <arg value="-Wl,--version-script=${bl.dir}/harmony.exp"/>
@@ -1649,6 +1649,7 @@ Check to make sure all required properties are specified. This includes properti
         <equals arg1="${classlib.provider}" arg2="GNU Classpath"/>
       </conditions>
       <sequential>
+        <echo message="Creating JikesRVM"/>
         <exec executable="${c++.exe}" failonerror="true">
           <arg line="${c++.args} ${rvm.common.args} ${gcspy.lib.dir} -lpthread ${perfctr.lib} ${c++.librt} ${rvm.src} ${c++.rdynamic} -g"/>
           <arg value="-o"/>
@@ -1664,6 +1665,7 @@ Check to make sure all required properties are specified. This includes properti
         <equals arg1="${classlib.provider}" arg2="Harmony"/>
       </conditions>
       <sequential>
+        <echo message="Creating JikesRVM"/>
         <exec executable="${c++.exe}" failonerror="true">
           <arg line="${c++.args} ${rvm.common.args} ${gcspy.lib.dir} -lpthread ${perfctr.lib} ${c++.librt} ${c++.rdynamic} -g"/>
           <arg value="-o"/>
diff --git a/tools/bootloader/RunBootImage.C b/tools/bootloader/RunBootImage.C
index 1083e8105..bc88ca917 100644
--- a/tools/bootloader/RunBootImage.C
+++ b/tools/bootloader/RunBootImage.C
@@ -40,14 +40,11 @@
 #include "RunBootImage.h" /* definitions created during the build */
 #include "sys.h"
 #include <ctype.h> /* isspace */
+#include <errno.h> /* for strtol errors */
 #include <stdlib.h>
 #include <string.h> /* strcmp, ... */
 #include <limits.h> /* INT_MAX, ... */
 
-#ifndef RVM_FOR_HARMONY
-#include <errno.h>
-#endif
-
 uint64_t initialHeapSize;       /* Declared in bootImageRunner.h */
 uint64_t maximumHeapSize;       /* Declared in bootImageRunner.h */
 
diff --git a/tools/bootloader/sys.h b/tools/bootloader/sys.h
index a8fbcdf51..16fe6fb25 100644
--- a/tools/bootloader/sys.h
+++ b/tools/bootloader/sys.h
@@ -87,5 +87,7 @@ extern char *Me;
 EXTERNAL void findMappable();
 EXTERNAL long long sysNanoTime();
 EXTERNAL void sysExit(int) NORETURN;
+EXTERNAL void* sysMalloc(int length);
+EXTERNAL void sysFree(void *location);
 
 #endif // RVM_SYSCALL_DEFINITIONS
diff --git a/tools/bootloader/sysMemory.C b/tools/bootloader/sysMemory.C
index ae9799597..f95216f40 100644
--- a/tools/bootloader/sysMemory.C
+++ b/tools/bootloader/sysMemory.C
@@ -261,7 +261,7 @@ EXTERNAL jboolean sysMemoryFree(char *start, size_t length)
   SYS_START();
   TRACE_PRINTF("%s: sysMemoryFree %p %d\n", Me, start, length);
 #ifdef RVM_FOR_HARMONY
-  if (hyvmem_free_memory(start, length) == 0) {
+  if (hyvmem_free_memory(start, length, NULL) == 0) {
     return JNI_TRUE;
   } else {
     return JNI_FALSE;
@@ -376,11 +376,12 @@ EXTERNAL void findMappable()
   int granularity = 1 << 22; // every 4 megabytes
   int max = (1 << 30) / (granularity >> 2);
   int pageSize = sysGetPageSize();
+  SYS_START();
   for (int i=0; i<max; i++) {
     char *start = (char *) (i * granularity);
     void *result = sysMemoryReserve(start, pageSize, JNI_TRUE, JNI_TRUE, JNI_TRUE, JNI_TRUE);
     if (result == NULL) {
-      CONSOLE_PRINTF("%p FAILED with errno %d: %s\n", start, errno, strerror(errno));
+      CONSOLE_PRINTF("%p FAILED\n", start);
     } else {
       CONSOLE_PRINTF("%p SUCCESS\n", start);
       sysMemoryFree(start, pageSize);
diff --git a/tools/bootloader/sysThread.C b/tools/bootloader/sysThread.C
index 475a1c6a5..fe9b04d9e 100644
--- a/tools/bootloader/sysThread.C
+++ b/tools/bootloader/sysThread.C
@@ -278,7 +278,7 @@ EXTERNAL Address sysThreadCreate(Address tr, Address ip, Address fp)
   TRACE_PRINTF("%s: sysThreadCreate %p %p %p\n", Me, tr, ip, fp);
 
   // create arguments - memory reclaimed in sysThreadStartup
-  sysThreadArguments = (Address *)malloc(sizeof(Address[3]));
+  sysThreadArguments = (Address *)sysMalloc(sizeof(Address[3]));
   sysThreadArguments[0] = tr;
   sysThreadArguments[1] = ip;
   sysThreadArguments[2] = fp;
@@ -336,7 +336,7 @@ static void* sysThreadStartup(void *args)
 
   SYS_START();
   memset (&stack, 0, sizeof stack);
-  stackBuf = (char*)malloc(sizeof(char[SIGSTKSZ]));
+  stackBuf = (char*)sysMalloc(sizeof(char[SIGSTKSZ]));
   stack.ss_sp = stackBuf;
   stack.ss_flags = 0;
   stack.ss_size = SIGSTKSZ;
@@ -348,19 +348,19 @@ static void* sysThreadStartup(void *args)
   tr = ((Address *)args)[0];
   ip = ((Address *)args)[1];
   fp = ((Address *)args)[2];
-  free(args);
+  sysFree(args);
   
-  jb = (jmp_buf*)malloc(sizeof(jmp_buf));
+  jb = (jmp_buf*)sysMalloc(sizeof(jmp_buf));
   if (setjmp(*jb)) {
     // this is where we come to terminate the thread
 #ifdef RVM_FOR_HARMONY
     hythread_detach(NULL);
 #endif
-    free(jb);
+    sysFree(jb);
     *(int*)(tr + RVMThread_execStatus_offset) = RVMThread_TERMINATED;
     stack.ss_flags = SS_DISABLE;
     sigaltstack(&stack, 0);
-    free(stackBuf);
+    sysFree(stackBuf);
   } else {
     setThreadLocal(TerminateJmpBufKey, (void*)jb);
     TRACE_PRINTF("%s: sysThreadStartup: pr=%p ip=%p fp=%p\n", Me, tr, ip, fp);
@@ -418,7 +418,7 @@ EXTERNAL void sysSetupHardwareTrapHandler()
   stack_t stack;
 
   memset (&stack, 0, sizeof stack);
-  stack.ss_sp = (char*)malloc(sizeof(char[SIGSTKSZ]));
+  stack.ss_sp = (char*)sysMalloc(sizeof(char[SIGSTKSZ]));
 
   stack.ss_size = SIGSTKSZ;
   if (sigaltstack (&stack, 0)) {
@@ -582,7 +582,7 @@ EXTERNAL Address sysMonitorCreate()
   hythread_monitor_t monitor;
   hythread_monitor_init_with_name(&monitor, 0, NULL);
 #else
-  vmmonitor_t *monitor = (vmmonitor_t*)malloc(sizeof(vmmonitor_t));
+  vmmonitor_t *monitor = (vmmonitor_t*)sysMalloc(sizeof(vmmonitor_t));
   pthread_mutex_init(&monitor->mutex, NULL);
   pthread_cond_init(&monitor->cond, NULL);
 #endif
@@ -599,7 +599,7 @@ EXTERNAL void sysMonitorDestroy(Address _monitor)
   vmmonitor_t *monitor = (vmmonitor_t*)_monitor;
   pthread_mutex_destroy(&monitor->mutex);
   pthread_cond_destroy(&monitor->cond);
-  free(monitor);
+  sysFree(monitor);
 #endif
 }