Changeset 15217 for trunk

Timestamp:

Feb 16, 2012, 10:25:12 AM (9 years ago)

Author:

gb

Message:

Define a ref_nrs_function macro.
Alternate entrypoint startup stuff for Android. Needs testing.

Location:

trunk/source/lisp-kernel

Files:

• arm-macros.s (modified) (1 diff)
• arm-spentry.s (modified) (2 diffs)
• pmcl-kernel.c (modified) (4 diffs)

trunk/source/lisp-kernel/arm-macros.s

@@ -172 +172 @@
 ')
 
+define(`ref_nrs_function',`
+        __(mov $1,#nil_value)
+        __(ldr $1,[$1,#((nrs.$2)+(symbol.fcell))])
+')
+        
 define(`ref_nrs_symbol',`
         __(movc16($3,nrs.$2))

trunk/source/lisp-kernel/arm-spentry.s

@@ -4377 +4377 @@
         __(bl _SPfuncall)
         __(mov arg_z,#nil_value)
-        __(mov imm0,fixnum_one)
+        __(mov imm0,#fixnum_one)
         __(bl _SPnthrow1value)
 local_label(test):
@@ -4432 +4432 @@
         __(ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr})
         __(bx lr)
+_endfn
+        
         .align 3
 1:
         .long 0
         .long 0
+
+/* This gets called with r0 = the current thread's TCR.  Should
+   call RESTORE-LISP-POINTERS and return 0 if it returns normally
+   and non-0 if it throws. */
+        
+_exportfn(C(init_lisp))
+        new_local_labels()
+        new_macro_labels()
+        __(stmdb sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr})
+        __(mov rcontext,r0)
+        __(mov r0,sp)
+        __(tst sp,#4)
+        __(strne r0,[sp,#-4]!)
+        __(streq r0,[sp,#-8]!)
+        __(mov arg_z,#0)
+        __(mov arg_y,#0)
+        __(mov arg_x,#0)
+        __(mov temp0,#0)
+        __(mov temp1,#0)
+        __(mov temp2,#0)
+        __(mov allocptr,#VOID_ALLOCPTR)
+        __(mov fn,#0)
+        __(ldr vsp,[rcontext,#tcr.save_vsp])
+        __(ldr imm2,[rcontext,#tcr.last_lisp_frame])
+        __(sub imm0,imm2,sp)
+        __(add imm0,imm0,#node_size)
+        __(mov imm0,imm0,lsl #num_subtag_bits-word_shift)
+        __(orr imm0,imm0,#subtag_u32_vector)
+        __(stmdb sp!,{imm0,imm2})
+        __(push_foreign_fprs())
+        __(adr imm0,1b)
+        __(fldd double_float_zero,[imm0])
+        __(mov imm0,#TCR_STATE_LISP)
+        __(str imm0,[rcontext,#tcr.valence])
+        __(ldr allocptr,[rcontext,#tcr.save_allocptr])
+        __(ref_nrs_function(nfn,restore_lisp_pointers))
+        __(extract_fulltag(imm0,nfn))
+        __(cmp imm0,#subtag_function)
+        __(bne local_label(fail))
+        __(ref_nrs_value(arg_z,toplcatch))
+        __(bl _SPmkcatch1v)
+        __(b local_label(fail)) /* cleanup address */
+        __(set_nargs(0))
+        __(bl _SPfuncall)
+        __(mov arg_z,#0)
+        __(mov imm0,#fixnum_one)
+        __(bl _SPnthrow1value)
+        __(b local_label(done))
+local_label(fail):      
+        __(mov arg_z,#fixnum_one)
+local_label(done):                     
+        __(ldr imm1,[sp,#(9*8)+4])
+        __(mov imm0,#TCR_STATE_FOREIGN)
+        __(str imm1,[rcontext,#tcr.last_lisp_frame])
+        __(str imm0,[rcontext,#tcr.valence])
+        __(pop_foreign_fprs())
+        __(add sp,sp,#2*node_size)
+        __(unbox_fixnum(imm0,arg_z))
+        __(ldr sp,[sp])
+        __(ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr})
+        __(bx lr)
+_endfn
+
+/* Called (on something other than the initial thread) with r0=tcr,
+   r1 = a (void *) arg.  Returns a null pointer/0, but declared to return
+   void.
+*/                
+_exportfn(C(os_main))
+        new_local_labels()
+        new_macro_labels()
+        __(stmdb sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr})
+        __(mov rcontext,r0)
+        __(mov r0,sp)
+        __(tst sp,#4)
+        __(strne r0,[sp,#-4]!)
+        __(streq r0,[sp,#-8]!)
+        __(mov arg_z,#0)
+        __(mov arg_y,#0)
+        __(mov arg_x,#0)
+        __(mov temp0,#0)
+        __(mov temp1,#0)
+        __(mov temp2,#0)
+        __(mov allocptr,#VOID_ALLOCPTR)
+        __(mov fn,#0)
+        __(ldr vsp,[rcontext,#tcr.save_vsp])
+        __(ldr imm2,[rcontext,#tcr.last_lisp_frame])
+        __(sub imm0,imm2,sp)
+        __(add imm0,imm0,#node_size)
+        __(mov imm0,imm0,lsl #num_subtag_bits-word_shift)
+        __(orr imm0,imm0,#subtag_u32_vector)
+        __(stmdb sp!,{imm0,imm2})
+        __(push_foreign_fprs())
+        __(adr imm0,1b)
+        __(fldd double_float_zero,[imm0])
+        __(mov imm0,#TCR_STATE_LISP)
+        __(str imm0,[rcontext,#tcr.valence])
+        __(ldr allocptr,[rcontext,#tcr.save_allocptr])
+        __(movc16(imm0,make_header(macptr.element_count,subtag_macptr)))
+        __(stmdb sp!,{imm0,imm1,arg_z,arg_y})
+        __(add arg_z,sp,#fulltag_misc)
+        __(ref_nrs_function(nfn,os_init_function))
+        __(set_nargs(1))
+        __(bl _SPfuncall)
+        __(add sp,sp,#16)
+        __(ldr imm1,[sp,#(9*8)+4])
+        __(mov imm0,#TCR_STATE_FOREIGN)
+        __(str imm1,[rcontext,#tcr.last_lisp_frame])
+        __(str imm0,[rcontext,#tcr.valence])
+        __(pop_foreign_fprs())
+        __(add sp,sp,#2*node_size)
+        __(mov imm0,#nil_value)
+        __(ldr sp,[sp])
+        __(ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr})
+        __(bx lr)
+_endfn
+                                
         .data
         .globl C(sptab)

trunk/source/lisp-kernel/pmcl-kernel.c

@@ -1748 +1748 @@
 #endif
 
-
-
-
-int
-#ifdef CCLSHARED
-cclmain
-#else
-main
-#endif
-(int argc, char *argv[]
-#if defined(PPC) && defined(LINUX)
-, char *envp[], void *aux
-#endif
-)
-{
-  extern int page_size;
-  natural default_g0_threshold = G0_AREA_THRESHOLD,
-    default_g1_threshold = G1_AREA_THRESHOLD,
-    default_g2_threshold = G2_AREA_THRESHOLD,
-    lisp_heap_threshold_from_image = 0;
-  Boolean egc_enabled =
-#ifdef DISABLE_EGC
-    false
-#else
-    true
-#endif
-    ;
-  Boolean lisp_heap_threshold_set_from_command_line = false;
-  wchar_t **utf_16_argv = NULL;
-
-#ifdef PPC
-  extern int altivec_present;
-#endif
-#ifdef WINDOWS
-  extern LispObj load_image(wchar_t *);
-#else
-  extern LispObj load_image(char *);
-#endif
+natural default_g0_threshold = G0_AREA_THRESHOLD;
+natural default_g1_threshold = G1_AREA_THRESHOLD;
+natural default_g2_threshold = G2_AREA_THRESHOLD;
+natural lisp_heap_threshold_from_image = 0;
+
+void
+init_consing_areas()
+{
   area *a;
-  BytePtr stack_base, current_sp = (BytePtr) current_stack_pointer();
-  TCR *tcr;
-
-  dbgout = stderr;
-
-#ifdef WINDOWS
-  {
-    int wide_argc;
-    extern void init_winsock(void);
-    extern void init_windows_io(void);
-    extern void reserve_tls_slots(void);
-
-    _fmode = O_BINARY;
-    _setmode(1, O_BINARY);
-    _setmode(2, O_BINARY);
-    setvbuf(dbgout, NULL, _IONBF, 0);
-    init_winsock();
-    init_windows_io();
-    reserve_tls_slots();
-    utf_16_argv = CommandLineToArgvW(GetCommandLineW(),&wide_argc);
-  }
-#endif
-
-  check_os_version(argv[0]);
-#ifdef WINDOWS
-  real_executable_name = determine_executable_name();
-#else
-  real_executable_name = determine_executable_name(argv[0]);
-#endif
-  page_size = getpagesize(); /* Implement with GetSystemInfo on Windows w/o MinGW */
-
-  check_bogus_fp_exceptions();
-#ifdef LINUX
-#ifdef X8664
-  ensure_gs_available(real_executable_name);
-#endif
-#endif
-#if (defined(DARWIN) && defined(PPC64)) || (defined(LINUX) && defined(PPC))|| defined(X8664) || (defined(X8632) && !defined(DARWIN))
-  remap_spjump();
-#endif
-
-#ifdef PPC
-#ifdef LINUX
-  {
-    ElfW(auxv_t) *av = aux;
-    int hwcap, done = false;
-    
-    if (av) {
-      do {
-        switch (av->a_type) {
-        case AT_DCACHEBSIZE:
-          cache_block_size = av->a_un.a_val;
-          break;
-
-        case AT_HWCAP:
-          hwcap = av->a_un.a_val;
-          altivec_present = ((hwcap & PPC_FEATURE_HAS_ALTIVEC) != 0);
-          break;
-
-        case AT_NULL:
-          done = true;
-          break;
-        }
-        av++;
-      } while (!done);
-    }
-  }
-#endif
-#ifdef DARWIN
-  {
-    unsigned value = 0;
-    size_t len = sizeof(value);
-    int mib[2];
-    
-    mib[0] = CTL_HW;
-    mib[1] = HW_CACHELINE;
-    if (sysctl(mib,2,&value,&len, NULL, 0) != -1) {
-      if (len == sizeof(value)) {
-        cache_block_size = value;
-      }
-    }
-    mib[1] = HW_VECTORUNIT;
-    value = 0;
-    len = sizeof(value);
-    if (sysctl(mib,2,&value,&len, NULL, 0) != -1) {
-      if (len == sizeof(value)) {
-        altivec_present = value;
-      }
-    }
-  }
-#endif
-#endif
-
-#ifdef X86
-  if (!check_x86_cpu()) {
-    fprintf(dbgout, "CPU doesn't support required features\n");
-    exit(1);
-  }
-#endif
-
-#ifdef ARM
-  if (!check_arm_cpu()) {
-    fprintf(dbgout, "CPU doesn't support required features\n");
-    exit(1);
-  }
-#endif
-
-#ifdef SOLARIS
-#ifdef X8632
-  {
-    extern void solaris_ldt_init(void);
-    solaris_ldt_init();
-  }
-#endif
-#endif
-
-#ifndef WINDOWS
-  main_thread_pid = getpid();
-#endif
-  tcr_area_lock = (void *)new_recursive_lock();
-
-  program_name = argv[0];
-#ifdef SINGLE_ARG_SHORTHAND
-  if ((argc == 2) && (*argv[1] != '-')) {
-#ifdef WINDOWS
-    image_name = utf_16_argv[1];
-#else
-    image_name = argv[1];
-#endif
-    argv[1] = NULL;
-#ifdef WINDOWS
-    utf_16_argv[1] = NULL;
-#endif
-  } else {
-#endif  /* SINGLE_ARG_SHORTHAND */
-    process_options(argc,argv,utf_16_argv);
-#ifdef SINGLE_ARG_SHORTHAND
-  }
-#endif
-  if (lisp_heap_gc_threshold != DEFAULT_LISP_HEAP_GC_THRESHOLD) {
-    lisp_heap_threshold_set_from_command_line = true;
-  }
-
-  initial_stack_size = ensure_stack_limit(initial_stack_size);
-  if (image_name == NULL) {
-    if (check_for_embedded_image(real_executable_name)) {
-      image_name = real_executable_name;
-    } else {
-      image_name = default_image_name(real_executable_name);
-#ifdef DARWIN
-      if (!probe_file(image_name)) {
-        image_name = bundle_image_name(real_executable_name);
-      }
-#endif
-    }
-  }
-
-  while (1) {
-    if (create_reserved_area(reserved_area_size)) {
-      break;
-    }
-    reserved_area_size = reserved_area_size *.9;
-  }
-
-  gc_init();
-
-  set_nil(load_image(image_name));
-  lisp_heap_notify_threshold = GC_NOTIFY_THRESHOLD;
-  lisp_heap_threshold_from_image = lisp_global(LISP_HEAP_THRESHOLD);
-  
-  if (lisp_heap_threshold_from_image) {
-    if ((!lisp_heap_threshold_set_from_command_line) &&
-        (lisp_heap_threshold_from_image != lisp_heap_gc_threshold)) {
-      lisp_heap_gc_threshold = lisp_heap_threshold_from_image;
-      resize_dynamic_heap(active_dynamic_area->active,lisp_heap_gc_threshold);
-    }
-    /* If lisp_heap_threshold_from_image was set, other image params are
-       valid. */
-    default_g0_threshold = lisp_global(G0_THRESHOLD);
-    default_g1_threshold = lisp_global(G1_THRESHOLD);
-    default_g2_threshold = lisp_global(G2_THRESHOLD);
-    egc_enabled = lisp_global(EGC_ENABLED);
-  }
-
-  lisp_global(TCR_AREA_LOCK) = ptr_to_lispobj(tcr_area_lock);
-
-#ifdef X86
-  lisp_global(SUBPRIMS_BASE) = (LispObj)((1<<16)+(5<<10));
-#endif
-#ifdef PPC
-  lisp_global(SUBPRIMS_BASE) = (LispObj)(5<<10);
-#endif
-#ifdef ARM
-  lisp_global(SUBPRIMS_BASE) = (LispObj)(9<<12);
-#endif
-
-  lisp_global(RET1VALN) = (LispObj)&ret1valn;
-  lisp_global(LEXPR_RETURN) = (LispObj)&nvalret;
-  lisp_global(LEXPR_RETURN1V) = (LispObj)&popj;
-  lisp_global(ALL_AREAS) = ptr_to_lispobj(all_areas);
-  lisp_global(DEFAULT_ALLOCATION_QUANTUM) = log2_heap_segment_size << fixnumshift;
-  lisp_global(STACK_SIZE) = thread_stack_size<<fixnumshift;
-
-
-  exception_init();
-
-  
-
-#ifdef WINDOWS
-  lisp_global(IMAGE_NAME) = ptr_to_lispobj(utf_16_to_utf_8(ensure_real_path(image_name)));
-  lisp_global(KERNEL_PATH) = ptr_to_lispobj(utf_16_to_utf_8(real_executable_name));
-  lisp_global(ARGV) = ptr_to_lispobj(wide_argv_to_utf_8(utf_16_argv, argc));
-#else
-  lisp_global(IMAGE_NAME) = ptr_to_lispobj(ensure_real_path(image_name));
-  lisp_global(KERNEL_PATH) = ptr_to_lispobj(real_executable_name);
-  lisp_global(ARGV) = ptr_to_lispobj(argv);
-#endif
-  lisp_global(KERNEL_IMPORTS) = (LispObj)import_ptrs_base;
-
-  lisp_global(GET_TCR) = (LispObj) get_tcr;
-  *(double *) &(lisp_global(DOUBLE_FLOAT_ONE)) = (double) 1.0;
-
-  lisp_global(HOST_PLATFORM) = (LispObj) PLATFORM << fixnumshift;
-
-  lisp_global(BATCH_FLAG) = (batch_flag << fixnumshift);
-
   a = active_dynamic_area;
 
@@ -2050 +1794 @@
     a->threshold = default_g0_threshold;
   }
-
+}
+
+int
+#ifdef CCLSHARED
+cclmain
+#else
+main
+#endif
+(int argc, char *argv[]
+#if defined(PPC) && defined(LINUX)
+, char *envp[], void *aux
+#endif
+)
+{
+  extern int page_size;
+  Boolean egc_enabled =
+#ifdef DISABLE_EGC
+    false
+#else
+    true
+#endif
+    ;
+  Boolean lisp_heap_threshold_set_from_command_line = false;
+  wchar_t **utf_16_argv = NULL;
+
+#ifdef PPC
+  extern int altivec_present;
+#endif
+#ifdef WINDOWS
+  extern LispObj load_image(wchar_t *);
+#else
+  extern LispObj load_image(char *);
+#endif
+  area *a;
+  BytePtr stack_base, current_sp = (BytePtr) current_stack_pointer();
+  TCR *tcr;
+
+  dbgout = stderr;
+
+#ifdef WINDOWS
+  {
+    int wide_argc;
+    extern void init_winsock(void);
+    extern void init_windows_io(void);
+    extern void reserve_tls_slots(void);
+
+    _fmode = O_BINARY;
+    _setmode(1, O_BINARY);
+    _setmode(2, O_BINARY);
+    setvbuf(dbgout, NULL, _IONBF, 0);
+    init_winsock();
+    init_windows_io();
+    reserve_tls_slots();
+    utf_16_argv = CommandLineToArgvW(GetCommandLineW(),&wide_argc);
+  }
+#endif
+
+  check_os_version(argv[0]);
+#ifdef WINDOWS
+  real_executable_name = determine_executable_name();
+#else
+  real_executable_name = determine_executable_name(argv[0]);
+#endif
+  page_size = getpagesize(); /* Implement with GetSystemInfo on Windows w/o MinGW */
+
+  check_bogus_fp_exceptions();
+#ifdef LINUX
+#ifdef X8664
+  ensure_gs_available(real_executable_name);
+#endif
+#endif
+#if (defined(DARWIN) && defined(PPC64)) || (defined(LINUX) && defined(PPC))|| defined(X8664) || (defined(X8632) && !defined(DARWIN))
+  remap_spjump();
+#endif
+
+#ifdef PPC
+#ifdef LINUX
+  {
+    ElfW(auxv_t) *av = aux;
+    int hwcap, done = false;
+    
+    if (av) {
+      do {
+        switch (av->a_type) {
+        case AT_DCACHEBSIZE:
+          cache_block_size = av->a_un.a_val;
+          break;
+
+        case AT_HWCAP:
+          hwcap = av->a_un.a_val;
+          altivec_present = ((hwcap & PPC_FEATURE_HAS_ALTIVEC) != 0);
+          break;
+
+        case AT_NULL:
+          done = true;
+          break;
+        }
+        av++;
+      } while (!done);
+    }
+  }
+#endif
+#ifdef DARWIN
+  {
+    unsigned value = 0;
+    size_t len = sizeof(value);
+    int mib[2];
+    
+    mib[0] = CTL_HW;
+    mib[1] = HW_CACHELINE;
+    if (sysctl(mib,2,&value,&len, NULL, 0) != -1) {
+      if (len == sizeof(value)) {
+        cache_block_size = value;
+      }
+    }
+    mib[1] = HW_VECTORUNIT;
+    value = 0;
+    len = sizeof(value);
+    if (sysctl(mib,2,&value,&len, NULL, 0) != -1) {
+      if (len == sizeof(value)) {
+        altivec_present = value;
+      }
+    }
+  }
+#endif
+#endif
+
+#ifdef X86
+  if (!check_x86_cpu()) {
+    fprintf(dbgout, "CPU doesn't support required features\n");
+    exit(1);
+  }
+#endif
+
+#ifdef ARM
+  if (!check_arm_cpu()) {
+    fprintf(dbgout, "CPU doesn't support required features\n");
+    exit(1);
+  }
+#endif
+
+#ifdef SOLARIS
+#ifdef X8632
+  {
+    extern void solaris_ldt_init(void);
+    solaris_ldt_init();
+  }
+#endif
+#endif
+
+#ifndef WINDOWS
+  main_thread_pid = getpid();
+#endif
+  tcr_area_lock = (void *)new_recursive_lock();
+
+  program_name = argv[0];
+#ifdef SINGLE_ARG_SHORTHAND
+  if ((argc == 2) && (*argv[1] != '-')) {
+#ifdef WINDOWS
+    image_name = utf_16_argv[1];
+#else
+    image_name = argv[1];
+#endif
+    argv[1] = NULL;
+#ifdef WINDOWS
+    utf_16_argv[1] = NULL;
+#endif
+  } else {
+#endif  /* SINGLE_ARG_SHORTHAND */
+    process_options(argc,argv,utf_16_argv);
+#ifdef SINGLE_ARG_SHORTHAND
+  }
+#endif
+  if (lisp_heap_gc_threshold != DEFAULT_LISP_HEAP_GC_THRESHOLD) {
+    lisp_heap_threshold_set_from_command_line = true;
+  }
+
+  initial_stack_size = ensure_stack_limit(initial_stack_size);
+  if (image_name == NULL) {
+    if (check_for_embedded_image(real_executable_name)) {
+      image_name = real_executable_name;
+    } else {
+      image_name = default_image_name(real_executable_name);
+#ifdef DARWIN
+      if (!probe_file(image_name)) {
+        image_name = bundle_image_name(real_executable_name);
+      }
+#endif
+    }
+  }
+
+  while (1) {
+    if (create_reserved_area(reserved_area_size)) {
+      break;
+    }
+    reserved_area_size = reserved_area_size *.9;
+  }
+
+  gc_init();
+
+  set_nil(load_image(image_name));
+  lisp_heap_notify_threshold = GC_NOTIFY_THRESHOLD;
+  lisp_heap_threshold_from_image = lisp_global(LISP_HEAP_THRESHOLD);
+  
+  if (lisp_heap_threshold_from_image) {
+    if ((!lisp_heap_threshold_set_from_command_line) &&
+        (lisp_heap_threshold_from_image != lisp_heap_gc_threshold)) {
+      lisp_heap_gc_threshold = lisp_heap_threshold_from_image;
+      resize_dynamic_heap(active_dynamic_area->active,lisp_heap_gc_threshold);
+    }
+    /* If lisp_heap_threshold_from_image was set, other image params are
+       valid. */
+    default_g0_threshold = lisp_global(G0_THRESHOLD);
+    default_g1_threshold = lisp_global(G1_THRESHOLD);
+    default_g2_threshold = lisp_global(G2_THRESHOLD);
+    egc_enabled = lisp_global(EGC_ENABLED);
+  }
+
+  lisp_global(TCR_AREA_LOCK) = ptr_to_lispobj(tcr_area_lock);
+
+#ifdef X86
+  lisp_global(SUBPRIMS_BASE) = (LispObj)((1<<16)+(5<<10));
+#endif
+#ifdef PPC
+  lisp_global(SUBPRIMS_BASE) = (LispObj)(5<<10);
+#endif
+#ifdef ARM
+  lisp_global(SUBPRIMS_BASE) = (LispObj)(9<<12);
+#endif
+
+  lisp_global(RET1VALN) = (LispObj)&ret1valn;
+  lisp_global(LEXPR_RETURN) = (LispObj)&nvalret;
+  lisp_global(LEXPR_RETURN1V) = (LispObj)&popj;
+  lisp_global(ALL_AREAS) = ptr_to_lispobj(all_areas);
+  lisp_global(DEFAULT_ALLOCATION_QUANTUM) = log2_heap_segment_size << fixnumshift;
+  lisp_global(STACK_SIZE) = thread_stack_size<<fixnumshift;
+
+
+  exception_init();
+
+  
+
+#ifdef WINDOWS
+  lisp_global(IMAGE_NAME) = ptr_to_lispobj(utf_16_to_utf_8(ensure_real_path(image_name)));
+  lisp_global(KERNEL_PATH) = ptr_to_lispobj(utf_16_to_utf_8(real_executable_name));
+  lisp_global(ARGV) = ptr_to_lispobj(wide_argv_to_utf_8(utf_16_argv, argc));
+#else
+  lisp_global(IMAGE_NAME) = ptr_to_lispobj(ensure_real_path(image_name));
+  lisp_global(KERNEL_PATH) = ptr_to_lispobj(real_executable_name);
+  lisp_global(ARGV) = ptr_to_lispobj(argv);
+#endif
+  lisp_global(KERNEL_IMPORTS) = (LispObj)import_ptrs_base;
+
+  lisp_global(GET_TCR) = (LispObj) get_tcr;
+  *(double *) &(lisp_global(DOUBLE_FLOAT_ONE)) = (double) 1.0;
+
+  lisp_global(HOST_PLATFORM) = (LispObj) PLATFORM << fixnumshift;
+
+  lisp_global(BATCH_FLAG) = (batch_flag << fixnumshift);
+
+  init_consing_areas();
   tcr = new_tcr(initial_stack_size, MIN_TSTACK_SIZE);
   stack_base = initial_stack_bottom()-xStackSpace();
@@ -2591 +2595 @@
 #ifdef ANDROID
 #include <jni.h>
+#include <android/log.h>
 #include "android_native_app_glue.h"
+
+extern int init_lisp(TCR *);
+
+JavaVM *android_vm = NULL;
 
 jint
 JNI_OnLoad(JavaVM *vm, void *unused)
 {
+  extern int page_size;
+  Boolean egc_enabled =
+#ifdef DISABLE_EGC
+    false
+#else
+    true
+#endif
+    ;
+  TCR *tcr;
+  BytePtr stack_base, current_sp = (BytePtr) current_stack_pointer();
+  
+#if 1
+  sleep(100);
+#endif
+  android_vm = vm;
+
+  page_size = getpagesize();
+  
+  if (!check_arm_cpu()) {
+    __android_log_print(ANDROID_LOG_FATAL,"nativeCCL","CPU doesn't support required features");
+      return -1;
+  }
+  main_thread_pid = getpid();
+  tcr_area_lock = (void *)new_recursive_lock();
+  image_name = "/data/local/ccl/android.image"; /* need something better. */
+  while (1) {
+    if (create_reserved_area(reserved_area_size)) {
+      break;
+    }
+    reserved_area_size = reserved_area_size *.9;
+  }
+
+  gc_init();
+
+  set_nil(load_image(image_name));
+  lisp_heap_notify_threshold = GC_NOTIFY_THRESHOLD;
+  lisp_heap_threshold_from_image = lisp_global(LISP_HEAP_THRESHOLD);
+  
+  if (lisp_heap_threshold_from_image) {
+    if (lisp_heap_threshold_from_image != lisp_heap_gc_threshold) {
+      lisp_heap_gc_threshold = lisp_heap_threshold_from_image;
+      resize_dynamic_heap(active_dynamic_area->active,lisp_heap_gc_threshold);
+    }
+    /* If lisp_heap_threshold_from_image was set, other image params are
+       valid. */
+    default_g0_threshold = lisp_global(G0_THRESHOLD);
+    default_g1_threshold = lisp_global(G1_THRESHOLD);
+    default_g2_threshold = lisp_global(G2_THRESHOLD);
+    egc_enabled = lisp_global(EGC_ENABLED);
+  }
+  lisp_global(TCR_AREA_LOCK) = ptr_to_lispobj(tcr_area_lock);
+#ifdef ARM
+  lisp_global(SUBPRIMS_BASE) = (LispObj)(9<<12);
+#endif
+  lisp_global(RET1VALN) = (LispObj)&ret1valn;
+  lisp_global(LEXPR_RETURN) = (LispObj)&nvalret;
+  lisp_global(LEXPR_RETURN1V) = (LispObj)&popj;
+  lisp_global(ALL_AREAS) = ptr_to_lispobj(all_areas);
+  lisp_global(DEFAULT_ALLOCATION_QUANTUM) = log2_heap_segment_size << fixnumshift;
+  lisp_global(STACK_SIZE) = thread_stack_size<<fixnumshift;
+
+
+  exception_init();
+
+  lisp_global(IMAGE_NAME) = ptr_to_lispobj(ensure_real_path(image_name));
+  lisp_global(KERNEL_PATH) = ptr_to_lispobj(real_executable_name);
+  lisp_global(ARGV) = (LispObj)NULL;
+  lisp_global(KERNEL_IMPORTS) = (LispObj)import_ptrs_base;
+
+  lisp_global(GET_TCR) = (LispObj) get_tcr;
+  *(double *) &(lisp_global(DOUBLE_FLOAT_ONE)) = (double) 1.0;
+
+  lisp_global(HOST_PLATFORM) = (LispObj) PLATFORM << fixnumshift;
+
+  lisp_global(BATCH_FLAG) = (batch_flag << fixnumshift);
+
+  init_consing_areas();
+  tcr = new_tcr(initial_stack_size, MIN_TSTACK_SIZE);
+  stack_base = initial_stack_bottom()-xStackSpace();
+  init_threads((void *)(stack_base), tcr);
+  thread_init_tcr(tcr, current_sp, current_sp-stack_base);
+
+  if (lisp_global(STATIC_CONSES) == 0) {
+    lisp_global(STATIC_CONSES) = lisp_nil;
+  }
+
+
+  lisp_global(EXCEPTION_LOCK) = ptr_to_lispobj(new_recursive_lock());
+  enable_fp_exceptions();
+  register_user_signal_handler();
+  TCR_AUX(tcr)->prev = TCR_AUX(tcr)->next = tcr;
+  lisp_global(INTERRUPT_SIGNAL) = (LispObj) box_fixnum(SIGNAL_FOR_PROCESS_INTERRUPT);
+#ifdef GC_INTEGRITY_CHECKING
+  (nrs_GC_EVENT_STATUS_BITS.vcell |= gc_integrity_check_bit);
+#endif
+  if (egc_enabled) {
+    egc_control(true, NULL);
+  } else {
+    lisp_global(OLDSPACE_DNODE_COUNT) = area_dnode(managed_static_area->active,managed_static_area->low);
+  }
+
+  if (init_lisp(TCR_TO_TSD(tcr)) == 0) {
+    return JNI_VERSION_1_6;
+  }
   return -1;
 }
@@ -2611 +2724 @@
 android_main(struct android_app* state) 
 {
-}
-#endif
-
+  TCR *tcr = new_tcr(DEFAULT_INITIAL_STACK_SIZE, MIN_TSTACK_SIZE);
+  JNIEnv *env;
+
+  thread_init_tcr(tcr, current_stack_pointer,DEFAULT_INITIAL_STACK_SIZE);
+  (*android_vm)->AttachCurrentThread(android_vm, &env, NULL);
+
+  os_main(tcr, state);
+  (*android_vm)->DetachCurrentThread(android_vm);
+}
+#endif
+