Merge branch 'pan/otp_8332_halfword' into dev

* pan/otp_8332_halfword:
  Teach testcase in driver_suite the new prototype for driver_async
  wx: Correct usage of driver callbacks from wx thread
  Adopt the new (R13B04) Nif functionality to the halfword codebase
  Support monitoring and demonitoring from driver threads
  Fix further test-suite problems
  Correct the VM to work for more test suites
  Teach {wordsize,internal|external} to system_info/1
  Make tracing and distribution work
  Turn on instruction packing in the loader and virtual machine
  Add the BeamInstr data type for loaded BEAM code
  Fix the BEAM dissambler for the half-word emulator
  Store pointers to heap data in 32-bit words
  Add a custom mmap wrapper to force heaps into the lower address range
  Fit all heap data into the 32-bit address range

1 files changed, 125 insertions, 48 deletions

diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index e3094404e2..d465017949 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
  * compliance with the License. You should have received a copy of the
  * Erlang Public License along with this software. If not, it can be
  * retrieved online at http://www.erlang.org/.
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
  * the License for the specific language governing rights and limitations
  * under the License.
- * 
+ *
  * %CopyrightEnd%
  */
 
@@ -228,6 +228,7 @@ int is_node_name_atom(Eterm a)
 
 typedef struct {
     DistEntry *dep;
+    Eterm *lhp;
 } NetExitsContext;
 
 /* 
@@ -253,8 +254,9 @@ static void doit_monitor_net_exits(ErtsMonitor *mon, void *vnecp)
 	    erts_destroy_monitor(rmon);
 	}
     } else {
-	Eterm lhp[3];
+	DeclareTmpHeapNoproc(lhp,3);
 	Eterm watched;
+	UseTmpHeapNoproc(3);
 	ASSERT(mon->type == MON_TARGET);
 	rmon = erts_remove_monitor(&(rp->monitors),mon->ref);
 	/* ASSERT(rmon != NULL); can happen during process exit */
@@ -271,6 +273,7 @@ static void doit_monitor_net_exits(ErtsMonitor *mon, void *vnecp)
 				       watched, am_noconnection);
 	    erts_destroy_monitor(rmon);
 	}
+	UnUseTmpHeapNoproc(3);
     }
     erts_smp_proc_unlock(rp, rp_locks);
  done:
@@ -632,19 +635,27 @@ static void clear_dist_entry(DistEntry *dep)
 int
 erts_dsig_send_link(ErtsDSigData *dsdp, Eterm local, Eterm remote)
 {
-    Eterm ctl_heap[4];
+    DeclareTmpHeapNoproc(ctl_heap,4);
     Eterm ctl = TUPLE3(&ctl_heap[0], make_small(DOP_LINK), local, remote);
+    int res;
+    UseTmpHeapNoproc(4);
 
-    return dsig_send(dsdp, ctl, THE_NON_VALUE, 0);
+    res = dsig_send(dsdp, ctl, THE_NON_VALUE, 0);
+    UnUseTmpHeapNoproc(4);
+    return res;
 }
 
 int
 erts_dsig_send_unlink(ErtsDSigData *dsdp, Eterm local, Eterm remote)
 {
-    Eterm ctl_heap[4];
+    DeclareTmpHeapNoproc(ctl_heap,4);
     Eterm ctl = TUPLE3(&ctl_heap[0], make_small(DOP_UNLINK), local, remote);
+    int res;
 
-    return dsig_send(dsdp, ctl, THE_NON_VALUE, 0);
+    UseTmpHeapNoproc(4);
+    res = dsig_send(dsdp, ctl, THE_NON_VALUE, 0);
+    UnUseTmpHeapNoproc(4);
+    return res;
 }
 
 
@@ -656,7 +667,10 @@ erts_dsig_send_m_exit(ErtsDSigData *dsdp, Eterm watcher, Eterm watched,
 			  Eterm ref, Eterm reason)
 {
     Eterm ctl;
-    Eterm ctl_heap[6];
+    DeclareTmpHeapNoproc(ctl_heap,6);
+    int res;
+
+    UseTmpHeapNoproc(6);
 
     ctl = TUPLE5(&ctl_heap[0], make_small(DOP_MONITOR_P_EXIT),
 		 watched, watcher, ref, reason);
@@ -667,7 +681,9 @@ erts_dsig_send_m_exit(ErtsDSigData *dsdp, Eterm watcher, Eterm watched,
     erts_smp_de_links_unlock(dsdp->dep);
 #endif
 
-    return dsig_send(dsdp, ctl, THE_NON_VALUE, 1);
+    res = dsig_send(dsdp, ctl, THE_NON_VALUE, 1);
+    UnUseTmpHeapNoproc(6);
+    return res;
 }
 
 /* We want to monitor a process (named or unnamed) on another node, we send:
@@ -678,13 +694,17 @@ erts_dsig_send_monitor(ErtsDSigData *dsdp, Eterm watcher, Eterm watched,
 		       Eterm ref)
 {
     Eterm ctl;
-    Eterm ctl_heap[5];
+    DeclareTmpHeapNoproc(ctl_heap,5);
+    int res;
 
+    UseTmpHeapNoproc(5);
     ctl = TUPLE4(&ctl_heap[0],
 		 make_small(DOP_MONITOR_P),
 		 watcher, watched, ref);
 
-    return dsig_send(dsdp, ctl, THE_NON_VALUE, 0);
+    res = dsig_send(dsdp, ctl, THE_NON_VALUE, 0);
+    UnUseTmpHeapNoproc(5);
+    return res;
 }
 
 /* A local process monitoring a remote one wants to stop monitoring, either 
@@ -696,23 +716,29 @@ erts_dsig_send_demonitor(ErtsDSigData *dsdp, Eterm watcher,
 			 Eterm watched, Eterm ref, int force)
 {
     Eterm ctl;
-    Eterm ctl_heap[5];
+    DeclareTmpHeapNoproc(ctl_heap,5);
+    int res;
 
+    UseTmpHeapNoproc(5);
     ctl = TUPLE4(&ctl_heap[0],
 		 make_small(DOP_DEMONITOR_P),
 		 watcher, watched, ref);
 
-    return dsig_send(dsdp, ctl, THE_NON_VALUE, force);
+    res = dsig_send(dsdp, ctl, THE_NON_VALUE, force);
+    UnUseTmpHeapNoproc(5);
+    return res;
 }
 
 int
 erts_dsig_send_msg(ErtsDSigData *dsdp, Eterm remote, Eterm message)
 {
     Eterm ctl;
-    Eterm ctl_heap[5];
+    DeclareTmpHeapNoproc(ctl_heap,5);
     Eterm token = NIL;
     Process *sender = dsdp->proc;
+    int res;
 
+    UseTmpHeapNoproc(5);
     if (SEQ_TRACE_TOKEN(sender) != NIL) {
 	seq_trace_update_send(sender);
 	token = SEQ_TRACE_TOKEN(sender);
@@ -724,17 +750,21 @@ erts_dsig_send_msg(ErtsDSigData *dsdp, Eterm remote, Eterm message)
 		     make_small(DOP_SEND_TT), am_Cookie, remote, token);
     else
 	ctl = TUPLE3(&ctl_heap[0], make_small(DOP_SEND), am_Cookie, remote);
-    return dsig_send(dsdp, ctl, message, 0);
+    res = dsig_send(dsdp, ctl, message, 0);
+    UnUseTmpHeapNoproc(5);
+    return res;
 }
 
 int
 erts_dsig_send_reg_msg(ErtsDSigData *dsdp, Eterm remote_name, Eterm message)
 {
     Eterm ctl;
-    Eterm ctl_heap[6];
+    DeclareTmpHeapNoproc(ctl_heap,6);
     Eterm token = NIL;
     Process *sender = dsdp->proc;
+    int res;
 
+    UseTmpHeapNoproc(6);
     if (SEQ_TRACE_TOKEN(sender) != NIL) {
 	seq_trace_update_send(sender);
 	token = SEQ_TRACE_TOKEN(sender);
@@ -747,7 +777,9 @@ erts_dsig_send_reg_msg(ErtsDSigData *dsdp, Eterm remote_name, Eterm message)
     else
 	ctl = TUPLE4(&ctl_heap[0], make_small(DOP_REG_SEND),
 		     sender->id, am_Cookie, remote_name);
-    return dsig_send(dsdp, ctl, message, 0);
+    res = dsig_send(dsdp, ctl, message, 0);
+    UnUseTmpHeapNoproc(6);
+    return res;
 }
 
 /* local has died, deliver the exit signal to remote */
@@ -756,8 +788,10 @@ erts_dsig_send_exit_tt(ErtsDSigData *dsdp, Eterm local, Eterm remote,
 		       Eterm reason, Eterm token)
 {
     Eterm ctl;
-    Eterm ctl_heap[6];
+    DeclareTmpHeapNoproc(ctl_heap,6);
+    int res;
 
+    UseTmpHeapNoproc(6);
     if (token != NIL) {	
 	seq_trace_update_send(dsdp->proc);
 	seq_trace_output_exit(token, reason, SEQ_TRACE_SEND, remote, local);
@@ -767,38 +801,58 @@ erts_dsig_send_exit_tt(ErtsDSigData *dsdp, Eterm local, Eterm remote,
 	ctl = TUPLE4(&ctl_heap[0], make_small(DOP_EXIT), local, remote, reason);
     }
     /* forced, i.e ignore busy */
-    return dsig_send(dsdp, ctl, THE_NON_VALUE, 1);
+    res = dsig_send(dsdp, ctl, THE_NON_VALUE, 1);
+    UnUseTmpHeapNoproc(6);
+    return res;
 }
 
 int
 erts_dsig_send_exit(ErtsDSigData *dsdp, Eterm local, Eterm remote, Eterm reason)
 {
-    Eterm ctl_heap[5];
-    Eterm ctl = TUPLE4(&ctl_heap[0],
-		       make_small(DOP_EXIT), local, remote, reason);
+    DeclareTmpHeapNoproc(ctl_heap,5);
+    int res;
+    Eterm ctl;
+
+    UseTmpHeapNoproc(5);
+    ctl = TUPLE4(&ctl_heap[0],
+		 make_small(DOP_EXIT), local, remote, reason);
     /* forced, i.e ignore busy */
-    return dsig_send(dsdp, ctl, THE_NON_VALUE, 1);
+    res =  dsig_send(dsdp, ctl, THE_NON_VALUE, 1);
+    UnUseTmpHeapNoproc(5);
+    return res;
 }
 
 int
 erts_dsig_send_exit2(ErtsDSigData *dsdp, Eterm local, Eterm remote, Eterm reason)
 {
-    Eterm ctl_heap[5];
-    Eterm ctl = TUPLE4(&ctl_heap[0],
-		       make_small(DOP_EXIT2), local, remote, reason);
+    DeclareTmpHeapNoproc(ctl_heap,5);
+    int res;
+    Eterm ctl;
+
+    UseTmpHeapNoproc(5);
+    ctl = TUPLE4(&ctl_heap[0],
+		 make_small(DOP_EXIT2), local, remote, reason);
 
-    return dsig_send(dsdp, ctl, THE_NON_VALUE, 0);
+    res = dsig_send(dsdp, ctl, THE_NON_VALUE, 0);
+    UnUseTmpHeapNoproc(5);
+    return res;
 }
 
 
 int
 erts_dsig_send_group_leader(ErtsDSigData *dsdp, Eterm leader, Eterm remote)
 {
-    Eterm ctl_heap[4];
-    Eterm ctl = TUPLE3(&ctl_heap[0],
-		       make_small(DOP_GROUP_LEADER), leader, remote);
+    DeclareTmpHeapNoproc(ctl_heap,4);
+    int res;
+    Eterm ctl;
 
-    return dsig_send(dsdp, ctl, THE_NON_VALUE, 0);
+    UseTmpHeapNoproc(4);
+    ctl = TUPLE3(&ctl_heap[0],
+		 make_small(DOP_GROUP_LEADER), leader, remote);
+
+    res = dsig_send(dsdp, ctl, THE_NON_VALUE, 0);
+    UnUseTmpHeapNoproc(4);
+    return res;
 }
 
 #if defined(PURIFY)
@@ -832,6 +886,7 @@ erts_dsig_send_group_leader(ErtsDSigData *dsdp, Eterm leader, Eterm remote)
 **
 **   assert  hlen == 0 !!!
 */
+
 int erts_net_message(Port *prt,
 		     DistEntry *dep,
 		     byte *hbuf,
@@ -839,6 +894,7 @@ int erts_net_message(Port *prt,
 		     byte *buf,
 		     int len)
 {
+#define DIST_CTL_DEFAULT_SIZE 64
     ErtsDistExternal ede;
     byte *t;
     Sint ctl_len;
@@ -850,7 +906,7 @@ int erts_net_message(Port *prt,
     Eterm *tuple;
     Eterm reason;
     Process* rp;
-    Eterm ctl_default[64];
+    DeclareTmpHeapNoproc(ctl_default,DIST_CTL_DEFAULT_SIZE);
     Eterm* ctl = ctl_default;
     ErlOffHeap off_heap;
     Eterm* hp;
@@ -864,6 +920,7 @@ int erts_net_message(Port *prt,
     int orig_len = len;
 #endif
 
+    UseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE);
     /* Thanks to Luke Gorrie */
     off_heap.mso = NULL;
 #ifndef HYBRID /* FIND ME! */
@@ -876,12 +933,16 @@ int erts_net_message(Port *prt,
 
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
 
-    if (!erts_is_alive)
+    if (!erts_is_alive) {
+	UnUseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE);
 	return 0;
+    }
     if (hlen > 0)
 	goto data_error;
-    if (len == 0)  /* HANDLE TICK !!! */
+    if (len == 0) {  /* HANDLE TICK !!! */
+	UnUseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE);
 	return 0;
+    }
 
 #ifdef ERTS_RAW_DIST_MSG_DBG
     erts_fprintf(stderr, "<< ");
@@ -922,7 +983,8 @@ int erts_net_message(Port *prt,
 	goto data_error;
     }
     orig_ctl_len = ctl_len;
-    if (ctl_len > sizeof(ctl_default)/sizeof(ctl_default[0])) {
+
+    if (ctl_len > DIST_CTL_DEFAULT_SIZE) {
 	ctl = erts_alloc(ERTS_ALC_T_DCTRL_BUF, ctl_len * sizeof(Eterm));
     }
     hp = ctl;
@@ -1202,7 +1264,7 @@ int erts_net_message(Port *prt,
 	   {DOP_MONITOR_P_EXIT, Remote pid or name, Local pid, ref, reason} */
 	   
 
-	Eterm lhp[3];
+	DeclareTmpHeapNoproc(lhp,3);
 	Eterm sysname;
 	ErtsProcLocks rp_locks = ERTS_PROC_LOCKS_MSG_SEND|ERTS_PROC_LOCK_LINK;
 
@@ -1237,6 +1299,7 @@ int erts_net_message(Port *prt,
 	    erts_smp_proc_unlock(rp, rp_locks);
 	    break;
 	}
+	UseTmpHeapNoproc(3);
 	
 	watched = (is_not_nil(mon->name)
 		   ? TUPLE2(&lhp[0], mon->name, sysname)
@@ -1246,6 +1309,7 @@ int erts_net_message(Port *prt,
 				   ref, am_process, watched, reason);
 	erts_smp_proc_unlock(rp, rp_locks);
 	erts_destroy_monitor(mon);
+	UnUseTmpHeapNoproc(3);
 	break;
     }
 
@@ -1384,6 +1448,7 @@ int erts_net_message(Port *prt,
 	erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl);
     }
 #endif
+    UnUseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE);
     ERTS_SMP_CHK_NO_PROC_LOCKS;
     return 0;
 
@@ -1402,6 +1467,7 @@ int erts_net_message(Port *prt,
 	erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl);
     }
 #endif
+    UnUseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE);
     erts_do_exit_port(prt, dep->cid, am_killed);
     ERTS_SMP_CHK_NO_PROC_LOCKS;
     return -1;
@@ -1554,9 +1620,9 @@ dsig_send(ErtsDSigData *dsdp, Eterm ctl, Eterm msg, int force_busy)
 	 */
 
 	data_size >>= (10-4);
-#if defined(ARCH_64)
+#if defined(ARCH_64) && !HALFWORD_HEAP
 	data_size &= 0x003fffffffffffff;
-#elif defined(ARCH_32)
+#elif defined(ARCH_32) || HALFWORD_HEAP
 	data_size &= 0x003fffff;
 #else
 #       error "Ohh come on ... !?!"
@@ -1640,9 +1706,9 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)
 }
 
 
-#if defined(ARCH_64)
+#if defined(ARCH_64) && !HALFWORD_HEAP
 #define ERTS_PORT_REDS_MASK__ 0x003fffffffffffffL
-#elif defined(ARCH_32)
+#elif defined(ARCH_32) || HALFWORD_HEAP
 #define ERTS_PORT_REDS_MASK__ 0x003fffff
 #else
 #  error "Ohh come on ... !?!"
@@ -2547,12 +2613,15 @@ BIF_RETTYPE nodes_1(BIF_ALIST_1)
     int visible = 0;
     int hidden = 0;
     int this = 0;
-    Uint  buf[2]; /* For one cons-cell */
+    DeclareTmpHeap(buf,2,BIF_P); /* For one cons-cell */
     DistEntry *dep;
     Eterm arg_list = BIF_ARG_1;
 #ifdef DEBUG
     Eterm* endp;
 #endif
+
+    UseTmpHeap(2,BIF_P);
+
     if (is_atom(BIF_ARG_1))
       arg_list = CONS(buf, BIF_ARG_1, NIL);
 
@@ -2563,13 +2632,14 @@ BIF_RETTYPE nodes_1(BIF_ALIST_1)
       case am_known:     visible = hidden = not_connected = this = 1; break;
       case am_this:      this = 1;                                    break;
       case am_connected: visible = hidden = 1;                        break;
-      default:           BIF_ERROR(BIF_P, BADARG);                    break;
+      default:           goto error;                                  break;
       }
       arg_list = CDR(list_val(arg_list));
     }
 
-    if (is_not_nil(arg_list))
-      BIF_ERROR(BIF_P, BADARG);
+    if (is_not_nil(arg_list)) {
+	goto error;
+    }
 
     length = 0;
 
@@ -2591,7 +2661,7 @@ BIF_RETTYPE nodes_1(BIF_ALIST_1)
 
     if (length == 0) {
 	erts_smp_rwmtx_rwunlock(&erts_dist_table_rwmtx);
-	BIF_RET(result);
+	goto done;
     }
 
     hp = HAlloc(BIF_P, 2*length);
@@ -2620,7 +2690,14 @@ BIF_RETTYPE nodes_1(BIF_ALIST_1)
     }
     ASSERT(endp == hp);
     erts_smp_rwmtx_rwunlock(&erts_dist_table_rwmtx);
+
+done:
+    UnUseTmpHeap(2,BIF_P);
     BIF_RET(result);
+
+error:
+    UnUseTmpHeap(2,BIF_P);
+    BIF_ERROR(BIF_P,BADARG);
 }
 
 /**********************************************************************/