5 files changed, 195 insertions, 58 deletions

diff --git a/lib/erl_interface/src/encode/encode_binary.c b/lib/erl_interface/src/encode/encode_binary.c
index 4471c51769..0562979417 100644
--- a/lib/erl_interface/src/encode/encode_binary.c
+++ b/lib/erl_interface/src/encode/encode_binary.c
@@ -22,6 +22,10 @@
 #include "eiext.h"
 #include "putget.h"
 
+static void copy_bits(const unsigned char* src, size_t soffs,
+                      unsigned char* dst, size_t n);
+
+
 int ei_encode_binary(char *buf, int *index, const void *p, long len)
 {
   char *s = buf + *index;
@@ -40,3 +44,106 @@ int ei_encode_binary(char *buf, int *index, const void *p, long len)
   return 0; 
 }
 
+int ei_encode_bitstring(char *buf, int *index,
+                        const char *p,
+                        size_t bitoffs,
+                        size_t bits)
+{
+  char *s = buf + *index;
+  char *s0 = s;
+  size_t bytes = (bits + 7) / 8;
+  char last_bits = bits % 8;
+
+  if (!buf) s += last_bits ? 6 : 5;
+  else {
+      char* tagp = s++;
+      put32be(s, bytes);
+      if (last_bits) {
+          *tagp = ERL_BIT_BINARY_EXT;
+          put8(s, last_bits);
+      }
+      else
+          *tagp = ERL_BINARY_EXT;
+
+      copy_bits((const unsigned char*)p, bitoffs, (unsigned char*)s, bits);
+  }
+  s += bytes;
+
+  *index += s-s0;
+
+  return 0;
+}
+
+
+/*
+ * MAKE_MASK(n) constructs a mask with n bits.
+ * Example: MAKE_MASK(3) returns the binary number 00000111.
+ */
+#define MAKE_MASK(n) ((((unsigned) 1) << (n))-1)
+
+
+static
+void copy_bits(const unsigned char* src, /* Base pointer to source. */
+	       size_t soffs,	         /* Bit offset for source relative to src. */
+	       unsigned char* dst,	 /* Destination. */
+	       size_t n)	         /* Number of bits to copy. */
+{
+    unsigned rmask;
+    unsigned count;
+    unsigned deoffs;
+    unsigned bits;
+    unsigned bits1;
+    unsigned rshift;
+
+    if (n == 0)
+        return;
+
+    deoffs = n & 7;
+    rmask = deoffs ? (MAKE_MASK(deoffs) << (8-deoffs)) : 0;
+
+    if (soffs == 0) {
+        unsigned nbytes = (n + 7) / 8;
+        memcpy(dst, src, nbytes);
+        if (rmask)
+            dst[nbytes-1] &= rmask;
+        return;
+    }
+
+    src += soffs / 8;
+    soffs &= 7;
+
+    if (n < 8) {     /* Less than one byte */
+        bits = (*src << soffs);
+        if (soffs+n > 8) {
+            src++;
+            bits |= (*src >> (8 - soffs));
+        }
+        *dst = bits & rmask;
+	return;
+    }
+
+    count = n >> 3;
+
+    rshift = 8 - soffs;
+    bits = *src;
+    if (soffs + n > 8) {
+        src++;
+    }
+
+    while (count--) {
+        bits1 = bits << soffs;
+        bits = *src;
+        src++;
+        *dst = bits1 | (bits >> rshift);
+        dst++;
+    }
+
+    if (rmask) {
+        bits1 = bits << soffs;
+        if ((rmask << rshift) & 0xff) {
+            bits = *src;
+            bits1 |= (bits >> rshift);
+        }
+        *dst = bits1 & rmask;
+    }
+}
diff --git a/lib/erl_interface/src/encode/encode_fun.c b/lib/erl_interface/src/encode/encode_fun.c
index 3bfc7530d1..e29424f9f4 100644
--- a/lib/erl_interface/src/encode/encode_fun.c
+++ b/lib/erl_interface/src/encode/encode_fun.c
@@ -26,56 +26,72 @@ int ei_encode_fun(char *buf, int *index, const erlang_fun *p)
 {
     int ix = *index;
 
-    if (p->arity == -1) {
-	/* ERL_FUN_EXT */
-	if (buf != NULL) {
-	    char* s = buf + ix;
-	    put8(s, ERL_FUN_EXT);
-	    put32be(s, p->n_free_vars);
-	}
-	ix += sizeof(char) + 4;
-	if (ei_encode_pid(buf, &ix, &p->pid) < 0)
-	    return -1;
-	if (ei_encode_atom_as(buf, &ix, p->module, ERLANG_UTF8, p->module_org_enc) < 0)
-	    return -1;
-	if (ei_encode_long(buf, &ix, p->index) < 0)
-	    return -1;
-	if (ei_encode_long(buf, &ix, p->uniq) < 0)
-	    return -1;
-	if (buf != NULL)
-	    memcpy(buf + ix, p->free_vars, p->free_var_len);
-	ix += p->free_var_len;
-    } else {
-	char *size_p;
-	/* ERL_NEW_FUN_EXT */
-	if (buf != NULL) {
-	    char* s = buf + ix;
-	    put8(s, ERL_NEW_FUN_EXT);
-	    size_p = s;
-	    s += 4;
-	    put8(s, p->arity);
-	    memcpy(s, p->md5, sizeof(p->md5));
-	    s += sizeof(p->md5);
-	    put32be(s, p->index);
-	    put32be(s, p->n_free_vars);
-	} else
-	    size_p = NULL;
-	ix += 1 + 4 + 1 + sizeof(p->md5) + 4 + 4;
-	if (ei_encode_atom_as(buf, &ix, p->module, ERLANG_UTF8, p->module_org_enc) < 0)
-	    return -1;
-	if (ei_encode_long(buf, &ix, p->old_index) < 0)
-	    return -1;
-	if (ei_encode_long(buf, &ix, p->uniq) < 0)
-	    return -1;
-	if (ei_encode_pid(buf, &ix, &p->pid) < 0)
-	    return -1;
-	if (buf != NULL)
-	    memcpy(buf + ix, p->free_vars, p->free_var_len);
-	ix += p->free_var_len;
-	if (size_p != NULL) {
-	    int sz = buf + ix - size_p;
-	    put32be(size_p, sz);
+    switch (p->type) {
+    case EI_FUN_CLOSURE:
+	if (p->arity == -1) {
+	    /* ERL_FUN_EXT */
+	    if (buf != NULL) {
+		char* s = buf + ix;
+		put8(s, ERL_FUN_EXT);
+		put32be(s, p->u.closure.n_free_vars);
+	    }
+	    ix += sizeof(char) + 4;
+	    if (ei_encode_pid(buf, &ix, &p->u.closure.pid) < 0)
+		return -1;
+	    if (ei_encode_atom_as(buf, &ix, p->module, ERLANG_UTF8, ERLANG_UTF8) < 0)
+		return -1;
+	    if (ei_encode_long(buf, &ix, p->u.closure.index) < 0)
+		return -1;
+	    if (ei_encode_long(buf, &ix, p->u.closure.uniq) < 0)
+		return -1;
+	    if (buf != NULL)
+		memcpy(buf + ix, p->u.closure.free_vars, p->u.closure.free_var_len);
+	    ix += p->u.closure.free_var_len;
+	} else {
+	    char *size_p;
+	    if (buf != NULL) {
+		char* s = buf + ix;
+		put8(s, ERL_NEW_FUN_EXT);
+		size_p = s;
+		s += 4;
+		put8(s, p->arity);
+		memcpy(s, p->u.closure.md5, sizeof(p->u.closure.md5));
+		s += sizeof(p->u.closure.md5);
+		put32be(s, p->u.closure.index);
+		put32be(s, p->u.closure.n_free_vars);
+	    } else
+		size_p = NULL;
+	    ix += 1 + 4 + 1 + sizeof(p->u.closure.md5) + 4 + 4;
+	    if (ei_encode_atom_as(buf, &ix, p->module, ERLANG_UTF8, ERLANG_UTF8) < 0)
+		return -1;
+	    if (ei_encode_long(buf, &ix, p->u.closure.old_index) < 0)
+		return -1;
+	    if (ei_encode_long(buf, &ix, p->u.closure.uniq) < 0)
+		return -1;
+	    if (ei_encode_pid(buf, &ix, &p->u.closure.pid) < 0)
+		return -1;
+	    if (buf != NULL)
+		memcpy(buf + ix, p->u.closure.free_vars, p->u.closure.free_var_len);
+	    ix += p->u.closure.free_var_len;
+	    if (size_p != NULL) {
+		int sz = buf + ix - size_p;
+		put32be(size_p, sz);
+	    }
 	}
+	break;
+    case EI_FUN_EXPORT:
+        if (buf != NULL) {
+            char* s = buf + ix;
+            put8(s, ERL_EXPORT_EXT);
+        }
+        ix++;
+        if (ei_encode_atom_as(buf, &ix, p->module, ERLANG_UTF8, ERLANG_UTF8) < 0)
+            return -1;
+        if (ei_encode_atom_as(buf, &ix, p->u.exprt.func, ERLANG_UTF8, ERLANG_UTF8) < 0)
+            return -1;
+        if (ei_encode_long(buf, &ix, p->arity) < 0)
+            return -1;
+        break;
     }
     *index = ix;
     return 0;
diff --git a/lib/erl_interface/src/encode/encode_pid.c b/lib/erl_interface/src/encode/encode_pid.c
index 0dfdb16372..d14746b40f 100644
--- a/lib/erl_interface/src/encode/encode_pid.c
+++ b/lib/erl_interface/src/encode/encode_pid.c
@@ -25,6 +25,7 @@
 int ei_encode_pid(char *buf, int *index, const erlang_pid *p)
 {
   char* s = buf + *index;
+  const char tag = (p->creation > 3) ? ERL_NEW_PID_EXT : ERL_PID_EXT;
 
   ++(*index); /* skip ERL_PID_EXT */
   if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node),
@@ -32,17 +33,21 @@ int ei_encode_pid(char *buf, int *index, const erlang_pid *p)
       return -1;
 
   if (buf) {
-    put8(s, ERL_NEW_PID_EXT);
+    put8(s, tag);
 
     s = buf + *index;
 
     /* now the integers */
     put32be(s,p->num & 0x7fff); /* 15 bits */
     put32be(s,p->serial & 0x1fff); /* 13 bits */
-    put32be(s, p->creation); /* 32 bits */
+    if (tag == ERL_PID_EXT) {
+        put8(s,(p->creation & 0x03)); /* 2 bits */
+    } else {
+        put32be(s, p->creation); /* 32 bits */
+    }
   }
 
-  *index += 4 + 4 + 4;
+  *index += 4 + 4 + (tag == ERL_PID_EXT ? 1 : 4);
   return 0;
 }
 
diff --git a/lib/erl_interface/src/encode/encode_port.c b/lib/erl_interface/src/encode/encode_port.c
index 0fb4018db1..eb464380c0 100644
--- a/lib/erl_interface/src/encode/encode_port.c
+++ b/lib/erl_interface/src/encode/encode_port.c
@@ -25,6 +25,7 @@
 int ei_encode_port(char *buf, int *index, const erlang_port *p)
 {
   char *s = buf + *index;
+  const char tag = p->creation > 3 ? ERL_NEW_PORT_EXT : ERL_PORT_EXT;
 
   ++(*index); /* skip ERL_PORT_EXT */
   if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node), ERLANG_UTF8,
@@ -32,15 +33,19 @@ int ei_encode_port(char *buf, int *index, const erlang_port *p)
       return -1;
   }
   if (buf) {
-    put8(s, ERL_NEW_PORT_EXT);
+    put8(s, tag);
 
     s = buf + *index;
 
     /* now the integers */
     put32be(s,p->id & 0x0fffffff /* 28 bits */);
-    put32be(s, p->creation);
+    if (tag == ERL_PORT_EXT) {
+        put8(s,(p->creation & 0x03));
+    } else {
+        put32be(s, p->creation);
+    }
   }
-  *index += 4 + 4;
+  *index += 4 + (tag == ERL_PORT_EXT ? 1 : 4);
   return 0;
 }
 
diff --git a/lib/erl_interface/src/encode/encode_ref.c b/lib/erl_interface/src/encode/encode_ref.c
index 8c2e0a25f7..5ccfc32c6d 100644
--- a/lib/erl_interface/src/encode/encode_ref.c
+++ b/lib/erl_interface/src/encode/encode_ref.c
@@ -24,6 +24,7 @@
 
 int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
 {
+  const char tag = (p->creation > 3) ? ERL_NEWER_REFERENCE_EXT : ERL_NEW_REFERENCE_EXT;
   char *s = buf + *index;
   int i;
 
@@ -36,7 +37,7 @@ int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
   /* Always encode as an extended reference; all participating parties
      are now expected to be able to decode extended references. */
   if (buf) {
-	  put8(s, ERL_NEWER_REFERENCE_EXT);
+	  put8(s, tag);
 
 	  /* first, number of integers */
 	  put16be(s, p->len);
@@ -45,12 +46,15 @@ int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
 	  s = buf + *index;
 
 	  /* now the integers */
-          put32be(s, p->creation);
+          if (tag == ERL_NEW_REFERENCE_EXT)
+              put8(s,(p->creation & 0x03));
+          else
+              put32be(s, p->creation);
 	  for (i = 0; i < p->len; i++)
 	      put32be(s,p->n[i]);
   }
   
-  *index += p->len*4 + 4;
+  *index += p->len*4 + (tag == ERL_NEW_REFERENCE_EXT ? 1 : 4);
   return 0;
 }