Merge branch 'sverker/ets_halfword_highmem/OTP-8941' into dev

* sverker/ets_halfword_highmem/OTP-8941:
  HALFWORD ETS Fix copyright year in some source files
  Fix vm crash in kernel test case seq_trace_SUITE:call
  remove NIF compile warning: no previous prototype for ‘nif_init’
  Refuse to load NIF library on wrong VM variant (halfword/fullword)
  HALFWORD ETS match spec heap fragment optimization
  HALFWORD ETS removed eheap and improved test case t_match_spec_run
  HALFWORD ETS Further match spec optimization to minimize copying and garbage
  HALFWORD ETS db_prog_match optimization
  HALFWORD ETS Fix segv for match spec with several function and guards
  HALFWORD Make system_info mseg_alloc report both low/high mem
  HALFWORD Fix segv caused by erlang:halt
  HALFWORD Make more allocators use high mem (binary, fixed and driver)
  HALFWORD ETS 32-bit arch fixes and other cleanups
  HALFWORD ETS nicer update_element
  HALFWORD ETS Real matching on relative terms
  HALFWORD first stab at high mem alloc
  HALFWORD ETS relative terms

Conflicts:
	erts/emulator/test/driver_SUITE.erl

1 files changed, 120 insertions, 120 deletions

diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index 7a7042abe4..68fda01597 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2003-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2003-2011. 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
@@ -261,139 +261,139 @@ print_function_from_pc(int to, void *to_arg, BeamInstr* x)
 static void
 heap_dump(int to, void *to_arg, Eterm x)
 {
+    DeclareTmpHeapNoproc(last,1);
+    Eterm* next = last;
     Eterm* ptr;
-    Eterm last = OUR_NIL;
-    Eterm* next = &last;
 
     if (is_immed(x) || is_CP(x)) {
 	return;
     }
-
- again:
-    if (x == OUR_NIL) {	/* We are done. */
-	return;
-    } if (is_CP(x)) {
-	next = (Eterm *) EXPAND_POINTER(x);
-    } else if (is_list(x)) {
-	ptr = list_val(x);
-	if (ptr[0] != OUR_NIL) {
-	    erts_print(to, to_arg, ADDR_FMT ":l", ptr);
-	    dump_element(to, to_arg, ptr[0]);
-	    erts_putc(to, to_arg, '|');
-	    dump_element(to, to_arg, ptr[1]);
-	    erts_putc(to, to_arg, '\n');
-	    if (is_immed(ptr[1])) {
-		ptr[1] = make_small(0);
-	    }
-	    x = ptr[0];
-	    ptr[0] = (Eterm) COMPRESS_POINTER(next);
-	    next = ptr + 1;
-	    goto again;
-	}
-    } else if (is_boxed(x)) {
-	Eterm hdr;
-	
-	ptr = boxed_val(x);
-	hdr = *ptr;
-	if (hdr != OUR_NIL) {	/* If not visited */
-	    erts_print(to, to_arg, ADDR_FMT ":", ptr);
-	    if (is_arity_value(hdr)) {
-		Uint i;
-		Uint arity = arityval(hdr);
-
-		erts_print(to, to_arg, "t" WORD_FMT ":", arity);
-		for (i = 1; i <= arity; i++) {
-		    dump_element(to, to_arg, ptr[i]);
-		    if (is_immed(ptr[i])) {
-			ptr[i] = make_small(0);
-		    }
-		    if (i < arity) {
-			erts_putc(to, to_arg, ',');
-		    }
-		}
+    UseTmpHeapNoproc(1);
+    *last = OUR_NIL;
+
+    while (x != OUR_NIL) {
+	if (is_CP(x)) {
+	    next = (Eterm *) EXPAND_POINTER(x);
+	} else if (is_list(x)) {
+	    ptr = list_val(x);
+	    if (ptr[0] != OUR_NIL) {
+		erts_print(to, to_arg, ADDR_FMT ":l", ptr);
+		dump_element(to, to_arg, ptr[0]);
+		erts_putc(to, to_arg, '|');
+		dump_element(to, to_arg, ptr[1]);
 		erts_putc(to, to_arg, '\n');
-		if (arity == 0) {
-		    ptr[0] = OUR_NIL;
-		} else {
-		    x = ptr[arity];
-		    ptr[0] = (Eterm) COMPRESS_POINTER(next);
-		    next = ptr + arity - 1;
-		    goto again;
+		if (is_immed(ptr[1])) {
+		    ptr[1] = make_small(0);
 		}
-	    } else if (hdr == HEADER_FLONUM) {
-		FloatDef f;
-		char sbuf[31];
-		int i;
-
-		GET_DOUBLE_DATA((ptr+1), f);
-		i = sys_double_to_chars(f.fd, (char*) sbuf);
-		sys_memset(sbuf+i, 0, 31-i);
-		erts_print(to, to_arg, "F%X:%s\n", i, sbuf);
-		*ptr = OUR_NIL;
-	    } else if (_is_bignum_header(hdr)) {
-		erts_print(to, to_arg, "B%T\n", x);
-		*ptr = OUR_NIL;
-	    } else if (is_binary_header(hdr)) {
-		Uint tag = thing_subtag(hdr);
-		Uint size = binary_size(x);
-		Uint i;
-
-		if (tag == HEAP_BINARY_SUBTAG) {
-		    byte* p;
-
-		    erts_print(to, to_arg, "Yh%X:", size);
-		    p = binary_bytes(x);
-		    for (i = 0; i < size; i++) {
-			erts_print(to, to_arg, "%02X", p[i]);
+		x = ptr[0];
+		ptr[0] = (Eterm) COMPRESS_POINTER(next);
+		next = ptr + 1;
+		continue;
+	    }
+	} else if (is_boxed(x)) {
+	    Eterm hdr;
+
+	    ptr = boxed_val(x);
+	    hdr = *ptr;
+	    if (hdr != OUR_NIL) {	/* If not visited */
+		erts_print(to, to_arg, ADDR_FMT ":", ptr);
+	        if (is_arity_value(hdr)) {
+		    Uint i;
+		    Uint arity = arityval(hdr);
+
+		    erts_print(to, to_arg, "t" WORD_FMT ":", arity);
+		    for (i = 1; i <= arity; i++) {
+			dump_element(to, to_arg, ptr[i]);
+			if (is_immed(ptr[i])) {
+			    ptr[i] = make_small(0);
+			}
+			if (i < arity) {
+			    erts_putc(to, to_arg, ',');
+			}
 		    }
-		} else if (tag == REFC_BINARY_SUBTAG) {
-		    ProcBin* pb = (ProcBin *) binary_val(x);
-		    Binary* val = pb->val;
-
-		    if (erts_smp_atomic_xchg(&val->refc, 0) != 0) {
-			val->flags = (UWord) all_binaries;
-			all_binaries = val;
+		    erts_putc(to, to_arg, '\n');
+		    if (arity == 0) {
+			ptr[0] = OUR_NIL;
+		    } else {
+			x = ptr[arity];
+			ptr[0] = (Eterm) COMPRESS_POINTER(next);
+			next = ptr + arity - 1;
+			continue;
 		    }
-		    erts_print(to, to_arg, "Yc%X:%X:%X", val,
-			       pb->bytes - (byte *)val->orig_bytes,
-			       size);
-		} else if (tag == SUB_BINARY_SUBTAG) {
-		    ErlSubBin* Sb = (ErlSubBin *) binary_val(x);
-		    Eterm* real_bin = binary_val(Sb->orig);
-		    void* val;
-
-		    if (thing_subtag(*real_bin) == REFC_BINARY_SUBTAG) {
-			ProcBin* pb = (ProcBin *) real_bin;
-			val = pb->val;
-		    } else {	/* Heap binary */
-			val = real_bin;
+		} else if (hdr == HEADER_FLONUM) {
+		    FloatDef f;
+		    char sbuf[31];
+		    int i;
+
+		    GET_DOUBLE_DATA((ptr+1), f);
+		    i = sys_double_to_chars(f.fd, (char*) sbuf);
+		    sys_memset(sbuf+i, 0, 31-i);
+		    erts_print(to, to_arg, "F%X:%s\n", i, sbuf);
+		    *ptr = OUR_NIL;
+		} else if (_is_bignum_header(hdr)) {
+		    erts_print(to, to_arg, "B%T\n", x);
+		    *ptr = OUR_NIL;
+		} else if (is_binary_header(hdr)) {
+		    Uint tag = thing_subtag(hdr);
+		    Uint size = binary_size(x);
+		    Uint i;
+
+		    if (tag == HEAP_BINARY_SUBTAG) {
+			byte* p;
+
+			erts_print(to, to_arg, "Yh%X:", size);
+			p = binary_bytes(x);
+			for (i = 0; i < size; i++) {
+			    erts_print(to, to_arg, "%02X", p[i]);
+			}
+		    } else if (tag == REFC_BINARY_SUBTAG) {
+			ProcBin* pb = (ProcBin *) binary_val(x);
+			Binary* val = pb->val;
+
+			if (erts_smp_atomic_xchg(&val->refc, 0) != 0) {
+			    val->flags = (UWord) all_binaries;
+			    all_binaries = val;
+			}
+			erts_print(to, to_arg, "Yc%X:%X:%X", val,
+				   pb->bytes - (byte *)val->orig_bytes,
+				   size);
+		    } else if (tag == SUB_BINARY_SUBTAG) {
+			ErlSubBin* Sb = (ErlSubBin *) binary_val(x);
+			Eterm* real_bin = binary_val(Sb->orig);
+			void* val;
+
+			if (thing_subtag(*real_bin) == REFC_BINARY_SUBTAG) {
+			    ProcBin* pb = (ProcBin *) real_bin;
+			    val = pb->val;
+			} else {	/* Heap binary */
+			    val = real_bin;
+			}
+			erts_print(to, to_arg, "Ys%X:%X:%X", val, Sb->offs, size);
 		    }
-		    erts_print(to, to_arg, "Ys%X:%X:%X", val, Sb->offs, size);
+		    erts_putc(to, to_arg, '\n');
+		    *ptr = OUR_NIL;
+		} else if (is_external_pid_header(hdr)) {
+		    erts_print(to, to_arg, "P%T\n", x);
+		    *ptr = OUR_NIL;
+		} else if (is_external_port_header(hdr)) {
+		    erts_print(to, to_arg, "p<%bpu.%bpu>\n",
+			       port_channel_no(x), port_number(x));
+		    *ptr = OUR_NIL;
+		} else {
+		    /*
+		     * All other we dump in the external term format.
+		     */
+			dump_externally(to, to_arg, x);
+		    erts_putc(to, to_arg, '\n');
+		    *ptr = OUR_NIL;
 		}
-		erts_putc(to, to_arg, '\n');
-		*ptr = OUR_NIL;
-	    } else if (is_external_pid_header(hdr)) {
-		erts_print(to, to_arg, "P%T\n", x);
-		*ptr = OUR_NIL;
-	    } else if (is_external_port_header(hdr)) {
-		erts_print(to, to_arg, "p<%bpu.%bpu>\n",
-			   port_channel_no(x), port_number(x));
-		*ptr = OUR_NIL;
-	    } else {
-		/*
-		 * All other we dump in the external term format.
-		 */
-		dump_externally(to, to_arg, x);
-		erts_putc(to, to_arg, '\n');
-		*ptr = OUR_NIL;
 	    }
 	}
+	x = *next;
+	*next = OUR_NIL;
+	next--;
     }
-
-    x = *next;
-    *next = OUR_NIL;
-    next--;
-    goto again;
+    UnUseTmpHeapNoproc(1);
 }
 
 static void