Harmony fixes

codehaus · Mar 17, 2009 · e2d03c9 · e2d03c9
1 parent e0a140e
commit e2d03c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/tools/bootloader/main.c b/tools/bootloader/main.c
@@ -504,6 +504,11 @@ static void* mapImageFile(const char *fileName, const void *targetAddress,
   void *bootRegion = 0;
   SYS_START();
   TRACE_PRINTF("%s: mapImageFile \"%s\" to %p\n", Me, fileName, targetAddress);
+  /* TODO: respect access protection when mapping. Problems, need to
+   * write over memory for Harmony when reading from file.
+   */
+  writable = JNI_TRUE;
+  executable = JNI_TRUE;
 #ifdef RVM_FOR_HARMONY
   IDATA fin = hyfile_open(fileName, HyOpenRead, 0);
   if (fin < 0) {
@@ -534,9 +539,9 @@ static void* mapImageFile(const char *fileName, const void *targetAddress,
   *roundedImageSize = pageRoundUp(actualImageSize);
   fseek (fin, 0L, SEEK_SET);
   int prot = PROT_READ;
-  if (1 || writable)
+  if (writable)
     prot |= PROT_WRITE;
-  if (1 || executable)
+  if (executable)
     prot |= PROT_EXEC;
   bootRegion = mmap((void*)targetAddress, *roundedImageSize,
 		    prot,
@@ -764,8 +769,8 @@ int main(int argc, const char **argv)
 
   TRACE_PRINTF("\nRunBootImage.main(): VM variable settings\n");
   TRACE_PRINTF("initialHeapSize %lu\nmaxHeapSize %lu\n"
-               "bootCodeFileName |%s|\nbootDataFileName |%s|\n"
-               "bootRmapFileName |%s|\n"
+               "bootCodeFileName \"%s\"\nbootDataFileName \"%s\"\n"
+               "bootRmapFileName \"%s\"\n"
                "verbose %d\n",
                (unsigned long) initialHeapSize,
                (unsigned long) maximumHeapSize,

diff --git a/tools/bootloader/sysSignal.c b/tools/bootloader/sysSignal.c
@@ -171,6 +171,7 @@ static void softwareSignalHandler(int signo, siginfo_t UNUSED *si, void *context
  */
 EXTERNAL void* sysStartMainThreadSignals()
 {
+  SYS_START();
   /* install a stack for hardwareTrapHandler() to run on */
   stack_t stack;
   char *stackBuf;

diff --git a/tools/bootloader/sysThread.c b/tools/bootloader/sysThread.c
@@ -12,13 +12,13 @@
  */
 
 #include "sys.h"
+#include <setjmp.h>
 #include <stdlib.h>
 #include <string.h>
 
 #ifndef RVM_FOR_HARMONY
 #include <errno.h>
 #include <pthread.h>
-#include <setjmp.h>
 #include <sys/sysinfo.h>
 #include <sys/ucontext.h>
 #endif