Initial Persistent HAMT - Map framework

Conflicts:
	erts/emulator/Makefile.in
	erts/emulator/beam/bif.tab
	erts/emulator/beam/erl_gc.c
	erts/emulator/beam/erl_gc.h
	erts/emulator/beam/erl_printf_term.c
	erts/emulator/beam/erl_term.c
	erts/emulator/beam/erl_term.h

1 files changed, 68 insertions, 8 deletions

diff --git a/erts/emulator/beam/erl_printf_term.c b/erts/emulator/beam/erl_printf_term.c
index c982dc2080..f07fe30cf6 100644
--- a/erts/emulator/beam/erl_printf_term.c
+++ b/erts/emulator/beam/erl_printf_term.c
@@ -26,12 +26,13 @@
 #include "big.h"
 #include "erl_map.h"
 #include "erl_binary.h"
+#include "erl_hashmap.h"
 
 #define PRINT_CHAR(CNT, FN, ARG, C)					\
 do {									\
     int res__ = erts_printf_char((FN), (ARG), (C));			\
     if (res__ < 0)							\
-	return res__;							\
+	abort();							\
     (CNT) += res__;							\
 } while (0)
 
@@ -39,7 +40,7 @@ do {									\
 do {									\
     int res__ = erts_printf_string((FN), (ARG), (STR));			\
     if (res__ < 0)							\
-	return res__;							\
+	abort();							\
     (CNT) += res__;							\
 } while (0)
 
@@ -47,7 +48,7 @@ do {									\
 do {									\
     int res__ = erts_printf_buf((FN), (ARG), (char*)(BUF), (LEN));	\
     if (res__ < 0)							\
-	return res__;							\
+	abort();							\
     (CNT) += res__;							\
 } while (0)
 
@@ -55,7 +56,7 @@ do {									\
 do {									\
     int res__ = erts_printf_pointer((FN), (ARG), (void *) (PTR));	\
     if (res__ < 0)							\
-	return res__;							\
+	abort();							\
     (CNT) += res__;							\
 } while (0)
 
@@ -63,7 +64,7 @@ do {									\
 do {									\
     int res__ = erts_printf_uword((FN), (ARG), (C), (P), (W), (I));	\
     if (res__ < 0)							\
-	return res__;							\
+	abort();							\
     (CNT) += res__;							\
 } while (0)
 
@@ -71,7 +72,7 @@ do {									\
 do {									\
     int res__ = erts_printf_sword((FN), (ARG), (C), (P), (W), (I));	\
     if (res__ < 0)							\
-	return res__;							\
+	abort();							\
     (CNT) += res__;							\
 } while (0)
 
@@ -79,7 +80,7 @@ do {									\
 do {									\
     int res__ = erts_printf_double((FN), (ARG), (C), (P), (W), (I));	\
     if (res__ < 0)							\
-	return res__;							\
+	abort();							\
     (CNT) += res__;							\
 } while (0)
 
@@ -247,6 +248,17 @@ static int print_atom_name(fmtfn_t fn, void* arg, Eterm atom, long *dcount)
 #define PRT_PATCH_FUN_SIZE     ((Eterm) 7)
 #define PRT_LAST_ARRAY_ELEMENT ((Eterm) 8) /* Note! Must be last... */
 
+#if 0
+static char *format_binary(Uint16 x, char *b) {
+    int z;
+    b[16] = '\0';
+    for (z = 0; z < 16; z++) { 
+	b[15-z] = ((x>>z) & 0x1) ? '1' : '0'; 
+    }
+    return b;
+}
+#endif
+
 static int
 print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
 	   Eterm* obj_base) /* ignored if !HALFWORD_HEAP */
@@ -575,6 +587,54 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
 		}
 	    }
 	    break;
+	case HASHMAP_DEF:
+	    {
+		Uint n,mapval;
+		Eterm *head;
+		head = hashmap_val(wobj);
+		mapval = MAP_HEADER_VAL(*head);
+		switch (MAP_HEADER_TYPE(*head)) {
+		    case MAP_HEADER_TAG_HAMT_HEAD_BITMAP:
+			PRINT_STRING(res, fn, arg, "#<");
+			PRINT_UWORD(res, fn, arg, 'x', 0, 1, mapval);
+			PRINT_STRING(res, fn, arg, ">{");
+			WSTACK_PUSH(s,PRT_CLOSE_TUPLE);
+			n = hashmap_bitcount(mapval);
+			ASSERT(n < 17);
+			head += 2;
+			if (n > 0) {
+			    n--;
+			    WSTACK_PUSH(s, head[n]);
+			    WSTACK_PUSH(s, PRT_TERM);
+			    while (n--) {
+				WSTACK_PUSH(s, PRT_COMMA);
+				WSTACK_PUSH(s, head[n]);
+				WSTACK_PUSH(s, PRT_TERM);
+			    }
+			}
+			break;
+		    case MAP_HEADER_TAG_HAMT_NODE_BITMAP:
+			n = hashmap_bitcount(mapval);
+			head++;
+			PRINT_CHAR(res, fn, arg, '<');
+			PRINT_UWORD(res, fn, arg, 'x', 0, 1, mapval);
+			PRINT_STRING(res, fn, arg, ">{");
+			WSTACK_PUSH(s,PRT_CLOSE_TUPLE);
+			ASSERT(n < 17);
+			if (n > 0) {
+			    n--;
+			    WSTACK_PUSH(s, head[n]);
+			    WSTACK_PUSH(s, PRT_TERM);
+			    while (n--) {
+				WSTACK_PUSH(s, PRT_COMMA);
+				WSTACK_PUSH(s, head[n]);
+				WSTACK_PUSH(s, PRT_TERM);
+			    }
+			}
+			break;
+		}
+	    }
+	    break;
 	default:
 	    PRINT_STRING(res, fn, arg, "<unknown:");
 	    PRINT_POINTER(res, fn, arg, wobj);
@@ -584,11 +644,11 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
     }
 
  L_done:
-    
     DESTROY_WSTACK(s);
     return res;
 }
 
+
 int
 erts_printf_term(fmtfn_t fn, void* arg, ErlPfEterm term, long precision,
 		 ErlPfEterm* term_base)