vm: fix conflict in image.cpp

diff --cc vm/debug.cpp
Simple merge

diff --cc vm/full_collector.cpp
Simple merge

diff --cc vm/gc.cpp
Simple merge

diff --cc vm/image.cpp
index 527ed3901b2b7dd2a8689b0048988d5ef0acbe46,27da9d5295c947a170f9ed4105999fe954c08997..c6d1ad7aca6ebb80572a0325dcd518ba20765288
--- 1/vm/image.cpp
--- 2/vm/image.cpp
+++ b/vm/image.cpp
@@@ -270,87 -350,7 +270,85 @@@ void factor_vm::load_image(vm_parameter
        relocate_code(h.data_relocation_base);
  
        /* Store image path name */
-       userenv[IMAGE_ENV] = allot_alien(F,(cell)p->image_path);
+       userenv[IMAGE_ENV] = allot_alien(false_object,(cell)p->image_path);
  }
  
-       h.t = T;
 +/* Save the current image to disk */
 +bool factor_vm::save_image(const vm_char *filename)
 +{
 +      FILE* file;
 +      image_header h;
 +
 +      file = OPEN_WRITE(filename);
 +      if(file == NULL)
 +      {
 +              print_string("Cannot open image file: "); print_native_string(filename); nl();
 +              print_string(strerror(errno)); nl();
 +              return false;
 +      }
 +
 +      h.magic = image_magic;
 +      h.version = image_version;
 +      h.data_relocation_base = data->tenured->start;
 +      h.data_size = data->tenured->here - data->tenured->start;
 +      h.code_relocation_base = code->seg->start;
 +      h.code_size = code->heap_size();
 +
-               h.userenv[i] = (save_env_p(i) ? userenv[i] : F);
++      h.true_object = true_object;
 +      h.bignum_zero = bignum_zero;
 +      h.bignum_pos_one = bignum_pos_one;
 +      h.bignum_neg_one = bignum_neg_one;
 +
 +      for(cell i = 0; i < USER_ENV; i++)
-       {
-               if(!save_env_p(i)) userenv[i] = F;
-       }
++              h.userenv[i] = (save_env_p(i) ? userenv[i] : false_object);
 +
 +      bool ok = true;
 +
 +      if(fwrite(&h,sizeof(image_header),1,file) != 1) ok = false;
 +      if(fwrite((void*)data->tenured->start,h.data_size,1,file) != 1) ok = false;
 +      if(fwrite(code->first_block(),h.code_size,1,file) != 1) ok = false;
 +      if(fclose(file)) ok = false;
 +
 +      if(!ok)
 +      {
 +              print_string("save-image failed: "); print_string(strerror(errno)); nl();
 +      }
 +
 +      return ok;
 +}
 +
 +void factor_vm::primitive_save_image()
 +{
 +      /* do a full GC to push everything into tenured space */
 +      primitive_compact_gc();
 +
 +      gc_root<byte_array> path(dpop(),this);
 +      path.untag_check(this);
 +      save_image((vm_char *)(path.untagged() + 1));
 +}
 +
 +void factor_vm::primitive_save_image_and_exit()
 +{
 +      /* We unbox this before doing anything else. This is the only point
 +      where we might throw an error, so we have to throw an error here since
 +      later steps destroy the current image. */
 +      gc_root<byte_array> path(dpop(),this);
 +      path.untag_check(this);
 +
 +      /* strip out userenv data which is set on startup anyway */
 +      for(cell i = 0; i < USER_ENV; i++)
++              if(!save_env_p(i)) userenv[i] = false_object;
 +
 +      gc(collect_full_op,
 +              0, /* requested size */
 +              false, /* discard objects only reachable from stacks */
 +              true /* compact the code heap */);
 +
 +      /* Save the image */
 +      if(save_image((vm_char *)(path.untagged() + 1)))
 +              exit(0);
 +      else
 +              exit(1);
 +}
 +
  }

diff --cc vm/layouts.hpp
Simple merge

diff --cc vm/vm.hpp
Simple merge