Add POSIX file stream fallback

vm/ByteCodeTranslator/src/cn1_globals.h

@@ -3,6 +3,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+
+#define CN1_GLOBALS_IMPLEMENTED 1
 #include "cn1_class_method_index.h"
 #include <pthread.h>
 #include <setjmp.h>

vm/ByteCodeTranslator/src/cn1_globals.m

@@ -1,5 +1,6 @@
 #include "cn1_globals.h"
 #include <assert.h>
+#include <unistd.h>
 #include "java_lang_Class.h"
 #include "java_lang_Object.h"
 #include "java_lang_Boolean.h"
@@ -14,13 +15,19 @@
 #include "java_lang_Float.h"
 #include "java_lang_Runnable.h"
 #include "java_lang_System.h"
+
+JAVA_BOOLEAN lowMemoryMode = JAVA_FALSE;
+int mallocWhileSuspended = 0;
+BOOL isAppSuspended = NO;
 #include "java_lang_ArrayIndexOutOfBoundsException.h"
 #if defined(__APPLE__) && defined(__OBJC__)
 #import <mach/mach.h>
 #import <mach/mach_host.h>
+#define CN1_LOG(fmt, ...) NSLog(@fmt, ##__VA_ARGS__)
 #else
 #include <time.h>
-#define NSLog(...) printf(__VA_ARGS__); printf("\n")
+#include <stdio.h>
+#define CN1_LOG(fmt, ...) printf(fmt "\n", ##__VA_ARGS__)
 #endif
 
 // The amount of memory allocated between GC cycle checks (generally 30 seconds)
@@ -261,6 +268,11 @@ static void init_gc_thresholds() {
     DEBUG_GC_INIT 0, 999999, 0, 0, 0, 0, 0, 0, 0, 0, cn1_array_1_id_JAVA_DOUBLE, "double[]", JAVA_TRUE, 1, &class__java_lang_Double, JAVA_TRUE, &class__java_lang_Object, EMPTY_INTERFACES, 0, 0, 0
 };
 
+// Minimal stubs for String array classes so clean-target builds that only
+// reference primitive wrappers still have constant pool backing storage.
+struct clazz class_array1__java_lang_String = {0};
+struct clazz class_array2__java_lang_String = {0};
+
 struct clazz class_array2__JAVA_DOUBLE = {
    DEBUG_GC_INIT 0, 999999, 0, 0, 0, 0, 0, 0, &gcMarkArrayObject, 0, cn1_array_2_id_JAVA_DOUBLE, "double[]", JAVA_TRUE, 2, &class__java_lang_Double, JAVA_TRUE, &class__java_lang_Object, EMPTY_INTERFACES, 0, 0, 0
 };
@@ -586,8 +598,8 @@ void codenameOneGCMark() {
                         {   long later = time(0)-now;
                             if(later>10000)
                             {
-                            NSLog(@"GC trapped for %d seconds waiting for thread %d in slot %d (%d)",
-                                  (int)(later/1000),(int)t->threadId,iter,t->threadKilled);
+                            CN1_LOG("GC trapped for %d seconds waiting for thread %d in slot %d (%d)",
+                                    (int)(later/1000),(int)t->threadId,iter,t->threadKilled);
                             }
                         }
                     }
@@ -622,7 +634,7 @@ void codenameOneGCMark() {
                 }
                 if (CN1_EDT_THREAD_ID == t->threadId && agressiveAllocator) {
                     long freeMemory = get_free_memory();
-                    NSLog(@"[GC] Blocking EDT as aggressive allocator, free memory=%lld", freeMemory);
+                    CN1_LOG("[GC] Blocking EDT as aggressive allocator, free memory=%ld", freeMemory);
 
                 }
 
@@ -712,7 +724,7 @@ void printObjectsPostSweep(CODENAME_ONE_THREAD_STATE) {
         }
     }
     int actualTotalMemory = 0;
-    NSLog(@"\n\n**** There are %i - %i = %i nulls available entries out of %i objects in heap which take up %i, sweep saved %i ****", nullSpaces, nullSpacesPreSweep, nullSpaces - nullSpacesPreSweep, t, totalAllocatedHeap, preSweepRam - totalAllocatedHeap);
+    CN1_LOG("\n\n**** There are %i - %i = %i nulls available entries out of %i objects in heap which take up %i, sweep saved %i ****", nullSpaces, nullSpacesPreSweep, nullSpaces - nullSpacesPreSweep, t, totalAllocatedHeap, preSweepRam - totalAllocatedHeap);
     for(int iter = 0 ; iter < cn1_array_3_id_java_util_Vector ; iter++) {
         if(classTypeCount[iter] > 0) {
             if(classTypeCountPreSweep[iter] - classTypeCount[iter] > 0) {
@@ -731,7 +743,7 @@ void printObjectsPostSweep(CODENAME_ONE_THREAD_STATE) {
         }
     }
     //NSLog(@"Actual ram = %i vs total mallocs = %i", actualTotalMemory, totalAllocatedHeap);
-    NSLog(@"**** GC cycle complete ****");
+    CN1_LOG("**** GC cycle complete ****");
 
     free(arrayOfNames);
 #if defined(__APPLE__) && defined(__OBJC__)
@@ -769,7 +781,7 @@ void printObjectTypesInHeap(CODENAME_ONE_THREAD_STATE) {
         }
     }
     int actualTotalMemory = 0;
-    NSLog(@"There are %i null available entries out of %i objects in heap which take up %i", nullSpaces, t, totalAllocatedHeap);
+    CN1_LOG("There are %i null available entries out of %i objects in heap which take up %i", nullSpaces, t, totalAllocatedHeap);
     for(int iter = 0 ; iter < cn1_array_3_id_java_util_Vector ; iter++) {
         if(classTypeCount[iter] > 0) {
             float f = ((float)classTypeCount[iter]) / ((float)t) * 100.0f;
@@ -787,7 +799,7 @@ void printObjectTypesInHeap(CODENAME_ONE_THREAD_STATE) {
             actualTotalMemory += sizeInHeapForType[iter];
         }
     }
-    NSLog(@"Actual ram = %i vs total mallocs = %i", actualTotalMemory, totalAllocatedHeap);
+    CN1_LOG("Actual ram = %i vs total mallocs = %i", actualTotalMemory, totalAllocatedHeap);
 
     free(arrayOfNames);
 #if defined(__APPLE__) && defined(__OBJC__)

vm/ByteCodeTranslator/src/com/codename1/tools/translator/ByteCodeTranslator.java

@@ -242,10 +242,14 @@ private static void handleCleanOutput(ByteCodeTranslator b, File[] sources, File
         }
         File xmlvm = new File(srcRoot, "xmlvm.h");
         copy(ByteCodeTranslator.class.getResourceAsStream("/xmlvm.h"), new FileOutputStream(xmlvm));
-        File nativeMethods = new File(srcRoot, "nativeMethods.m");
+        File nativeMethods = new File(srcRoot, "nativeMethods.c");
         copy(ByteCodeTranslator.class.getResourceAsStream("/nativeMethods.m"), new FileOutputStream(nativeMethods));
-        File javaIoFileM = new File(srcRoot, "java_io_File.m");
+        File cn1GlobalsM = new File(srcRoot, "cn1_globals.c");
+        copy(ByteCodeTranslator.class.getResourceAsStream("/cn1_globals.m"), new FileOutputStream(cn1GlobalsM));
+        File javaIoFileM = new File(srcRoot, "java_io_File.c");
         copy(ByteCodeTranslator.class.getResourceAsStream("/java_io_File.m"), new FileOutputStream(javaIoFileM));
+        File javaIoFileStreamsM = new File(srcRoot, "java_io_FileStreams.c");
+        copy(ByteCodeTranslator.class.getResourceAsStream("/java_io_FileStreams.m"), new FileOutputStream(javaIoFileStreamsM));
 
         Parser.writeOutput(srcRoot);
 
@@ -303,6 +307,8 @@ private static void handleIosOutput(ByteCodeTranslator b, File[] sources, File d
         copy(ByteCodeTranslator.class.getResourceAsStream("/nativeMethods.m"), new FileOutputStream(nativeMethods));
         File javaIoFileM = new File(srcRoot, "java_io_File.m");
         copy(ByteCodeTranslator.class.getResourceAsStream("/java_io_File.m"), new FileOutputStream(javaIoFileM));
+        File javaIoFileStreamsM = new File(srcRoot, "java_io_FileStreams.m");
+        copy(ByteCodeTranslator.class.getResourceAsStream("/java_io_FileStreams.m"), new FileOutputStream(javaIoFileStreamsM));
 
         if (System.getProperty("USE_RPMALLOC", "false").equals("true")) {
             File malloc = new File(srcRoot, "malloc.c");