Merge branch 'sverker/bit-binary-ext/OTP-15712'

* sverker/bit-binary-ext/OTP-15712:
  jinterface: Add dist flag for export funs
  erl_interface: Add bitstring and export fun support
  erl_interface: Remove old r9 pid and port compatibility
  erl_interface: Refactor ei_decode_SUITE
  erl_interface: Fix maps arity from ei_get_type()
  erl_interface: Remove ei_get_type_internal()
  erl_interface: Deprecate ei_encode_term and ei_decode_term

1 files changed, 36 insertions, 0 deletions

diff --git a/lib/erl_interface/src/decode/decode_binary.c b/lib/erl_interface/src/decode/decode_binary.c
index 5b8d234984..2799438bef 100644
--- a/lib/erl_interface/src/decode/decode_binary.c
+++ b/lib/erl_interface/src/decode/decode_binary.c
@@ -40,4 +40,40 @@ int ei_decode_binary(const char *buf, int *index, void *p, long *lenp)
   return 0; 
 }
 
+int ei_decode_bitstring(const char *buf, int *index, void *p, size_t plen,
+                        size_t *bitsp)
+{
+  const char *s = buf + *index;
+  const char *s0 = s;
+  unsigned long len;
+  unsigned char last_bits;
+  const unsigned char tag = get8(s);
+
+  if (tag == ERL_BINARY_EXT) {
+      long bytes;
+      int ret = ei_decode_binary(buf, index, p, &bytes);
+      if (bitsp)
+          *bitsp = (size_t)bytes * 8;
+      return ret;
+  }
+
+  if (tag != ERL_BIT_BINARY_EXT)
+      return -1;
+
+  len = get32be(s);
+  last_bits = get8(s);
+
+  if (len > plen || ((last_bits==0) != (len==0)) || last_bits > 8)
+      return -1;
+
+  if (p)
+      memcpy(p, s, len);
+  s += len;
+
+  if (bitsp)
+      *bitsp = (len == 0) ? 0 : ((len-1) * 8) + last_bits;
+
+  *index += s-s0;
+  return 0;
+}