Merge branch 'master' into startup

Conflicts:
	core/bootstrap/primitives.factor
	vm/run.hpp

diff --cc basis/bootstrap/stage2.factor
Simple merge

diff --cc basis/channels/remote/remote.factor
Simple merge

diff --cc basis/cocoa/cocoa.factor
Simple merge

diff --cc basis/cocoa/messages/messages.factor
Simple merge

diff --cc basis/core-foundation/fsevents/fsevents.factor
Simple merge

diff --cc basis/core-text/core-text.factor
Simple merge

diff --cc basis/cpu/x86/x86.factor
Simple merge

diff --cc basis/game/input/input.factor
Simple merge

diff --cc basis/io/launcher/launcher.factor
Simple merge

diff --cc basis/io/sockets/unix/unix.factor
index d2df4d9e13947a3bb86d3f93031e6d8ecbaf5c88,6bf62a034e586c075b719fb5fc78f165687d491b..71ad5a57582a91b7aa4866cc4497e01dc6a5953a
--- 1/basis/io/sockets/unix/unix.factor
--- 2/basis/io/sockets/unix/unix.factor
+++ b/basis/io/sockets/unix/unix.factor
@@@ -113,10 -117,10 +117,10 @@@ SYMBOL: receive-buffe
  
  CONSTANT: packet-size 65536
  
 -[ packet-size malloc receive-buffer set-global ] "io.sockets.unix" add-init-hook
 +[ packet-size malloc &free receive-buffer set-global ] "io.sockets.unix" add-startup-hook
  
  :: do-receive ( port -- packet sockaddr )
-     port addr>> empty-sockaddr/size :> len :> sockaddr
+     port addr>> empty-sockaddr/size :> ( sockaddr len )
      port handle>> handle-fd ! s
      receive-buffer get-global ! buf
      packet-size ! nbytes

diff --cc basis/tools/crossref/crossref.factor
Simple merge

diff --cc basis/tools/deploy/shaker/shaker.factor
Simple merge

diff --cc basis/ui/backend/cocoa/cocoa.factor
Simple merge

diff --cc basis/ui/backend/cocoa/tools/tools.factor
Simple merge

diff --cc basis/ui/ui.factor
Simple merge

diff --cc basis/windows/com/wrapper/wrapper.factor
Simple merge

diff --cc basis/windows/dinput/constants/constants.factor
Simple merge

diff --cc core/alien/alien.factor
Simple merge

diff --cc core/alien/strings/strings.factor
Simple merge

diff --cc core/bootstrap/primitives.factor
index 8058707efa186c27cc0f07d7d4e9c3f7397a5716,ae668ed54fe614529323d2e5285c42ecf78b4b97..ca9056805e18bf364ee63827598c36560a527a8d
--- 1/core/bootstrap/primitives.factor
--- 2/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@@ -432,9 -429,9 +429,9 @@@ tupl
      { "set-datastack" "kernel" (( ds -- )) }
      { "set-retainstack" "kernel" (( rs -- )) }
      { "set-callstack" "kernel" (( cs -- )) }
 -    { "exit" "system" (( n -- )) }
 +    { "(exit)" "system" (( n -- )) }
-     { "data-room" "memory" (( -- cards decks generations )) }
-     { "code-room" "memory" (( -- code-total code-used code-free largest-free-block )) }
+     { "data-room" "memory" (( -- data-room )) }
+     { "code-room" "memory" (( -- code-room )) }
      { "micros" "system" (( -- us )) }
      { "modify-code-heap" "compiler.units" (( alist -- )) }
      { "(dlopen)" "alien.libraries" (( path -- dll )) }

diff --cc core/bootstrap/stage1.factor
Simple merge

diff --cc core/compiler/units/units.factor
Simple merge

diff --cc core/destructors/destructors.factor
Simple merge

diff --cc core/source-files/errors/errors.factor
Simple merge

diff --cc vm/factor.cpp
index 2f4994c9a2f73f8e2f09f799a4daf20e31a8f83d,589d1898b15ab83e05b8b83aaf9fc4433bad3a8a..c83e9cdb6b11dcc786b50ad15069ac14686b5984
--- 1/vm/factor.cpp
--- 2/vm/factor.cpp
+++ b/vm/factor.cpp
@@@ -185,16 -171,9 +171,16 @@@ void factor_vm::start_factor(vm_paramet
        unnest_stacks();
  }
  
 +void factor_vm::stop_factor()
 +{
 +      nest_stacks(NULL);
 +      c_to_factor_toplevel(userenv[SHUTDOWN_ENV]);
 +      unnest_stacks();
 +}
 +
  char *factor_vm::factor_eval_string(char *string)
  {
-       char *(*callback)(char *) = (char *(*)(char *))alien_offset(userenv[EVAL_CALLBACK_ENV]);
+       char *(*callback)(char *) = (char *(*)(char *))alien_offset(special_objects[OBJ_EVAL_CALLBACK]);
        return callback(string);
  }
  

diff --cc vm/vm.hpp
Simple merge