Merge branch 'sverk/maps-erl_interface'

* sverk/maps-erl_interface:
  erts: Add distribution capability flag for maps DFLAG_MAP_TAG
  erts: Change external format for maps
  erts: Document external format for maps (MAP_EXT)
  erl_interface: Add test for ei_skip_term of container terms
  erl_interface: Add map support in ei_skip_term
  erl_interface: Fix mem leak in ei_decode_encode_test
  erl_interface: test decode/encode of maps
  erl_interface: Add ei encode/decode for maps
  erl_interface: test decode_encode of tuples and lists
  erl_interface: refactor ei_decode_encode_test.c

2 files changed, 22 insertions, 39 deletions

diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index 0519a9225e..f32b999198 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2014. 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
@@ -40,6 +40,7 @@
 #define DFLAG_SMALL_ATOM_TAGS     0x4000
 #define DFLAG_INTERNAL_TAGS       0x8000
 #define DFLAG_UTF8_ATOMS          0x10000
+#define DFLAG_MAP_TAG             0x20000
 
 /* All flags that should be enabled when term_to_binary/1 is used. */
 #define TERM_TO_BINARY_DFLAGS (DFLAG_EXTENDED_REFERENCES	\
@@ -47,7 +48,8 @@
 			       | DFLAG_NEW_FLOATS		\
 			       | DFLAG_EXTENDED_PIDS_PORTS	\
 			       | DFLAG_EXPORT_PTR_TAG		\
-			       | DFLAG_BIT_BINARIES)
+			       | DFLAG_BIT_BINARIES             \
+			       | DFLAG_MAP_TAG)
 
 /* opcodes used in distribution messages */
 #define DOP_LINK		1
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index 9671cde228..656de7c49a 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -2562,29 +2562,25 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 	    {
 		map_t *mp = (map_t*)map_val(obj);
 		Uint size = map_get_size(mp);
-		Eterm *mptr;
 
 		*ep++ = MAP_EXT;
 		put_int32(size, ep); ep += 4;
 
-		/* Push values first */
 		if (size > 0) {
-		    mptr = map_get_values(mp);
+		    Eterm *kptr = map_get_keys(mp);
+		    Eterm *vptr = map_get_values(mp);
+
 		    for (i = size-1; i >= 1; i--) {
 			WSTACK_PUSH(s, ENC_TERM);
-			WSTACK_PUSH(s, (UWord) mptr[i]);
+			WSTACK_PUSH(s, (UWord) vptr[i]);
+			WSTACK_PUSH(s, ENC_TERM);
+			WSTACK_PUSH(s, (UWord) kptr[i]);
 		    }
 
 		    WSTACK_PUSH(s, ENC_TERM);
-		    WSTACK_PUSH(s, (UWord) mptr[0]);
-
-		    mptr = map_get_keys(mp);
-		    for (i = size-1; i >= 1; i--) {
-			WSTACK_PUSH(s, ENC_TERM);
-			WSTACK_PUSH(s, (UWord) mptr[i]);
-		    }
+		    WSTACK_PUSH(s, (UWord) vptr[0]);
 
-		    obj = mptr[0];
+		    obj = kptr[0];
 		    goto L_jump_start;
 		}
 	    }
@@ -3518,16 +3514,16 @@ dec_term_atom_common:
 
 		keys  = make_tuple(hp);
 		*hp++ = make_arityval(size);
-		kptr  = hp;
 		hp   += size;
+		kptr = hp - 1;
 
 		mp    = (map_t*)hp;
 		hp   += MAP_HEADER_SIZE;
-		vptr  = hp;
 		hp   += size;
+		vptr = hp - 1;
 
-		/* kptr, first word for keys
-		 * vptr, first word for values
+		/* kptr, last word for keys
+		 * vptr, last word for values
 		 */
 
 		/*
@@ -3542,27 +3538,12 @@ dec_term_atom_common:
 		mp->keys       = keys;
 		*objp          = make_map(mp);
 
-		/* We assume the map is wellformed, meaning:
-		 * - ascending key order
-		 * - unique keys
-		 */
-
-		objp  = vptr + size - 1;
-		n     = size;
-
-		while (n-- > 0) {
-		    *objp = (Eterm) COMPRESS_POINTER(next);
-		    next  = objp;
-		    objp--;
-		}
-
-		objp  = kptr + size - 1;
-		n     = size;
-
-		while (n-- > 0) {
-		    *objp = (Eterm) COMPRESS_POINTER(next);
-		    next  = objp;
-		    objp--;
+		for (n = size; n; n--) {
+		    *vptr = (Eterm) COMPRESS_POINTER(next);
+		    *kptr = (Eterm) COMPRESS_POINTER(vptr);
+		    next  = kptr;
+		    vptr--;
+		    kptr--;
 		}
 	    }
 	    break;