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, 24 insertions, 0 deletions

diff --git a/lib/erl_interface/src/encode/encode_binary.c b/lib/erl_interface/src/encode/encode_binary.c
index 4471c51769..4aa9f6bc16 100644
--- a/lib/erl_interface/src/encode/encode_binary.c
+++ b/lib/erl_interface/src/encode/encode_binary.c
@@ -40,3 +40,27 @@ int ei_encode_binary(char *buf, int *index, const void *p, long len)
   return 0; 
 }
 
+int ei_encode_bitstring(char *buf, int *index, const void *p, size_t bits)
+{
+  char *s = buf + *index;
+  char *s0 = s;
+  size_t bytes = (bits + 7) / 8;
+  char last_bits = bits % 8;
+
+  if (bytes == 0 || last_bits == 0)
+      return ei_encode_binary(buf, index, p, bytes);
+
+  if (!buf) s += 6;
+  else {
+      put8(s, ERL_BIT_BINARY_EXT);
+      put32be(s, bytes);
+      put8(s, last_bits);
+      memcpy(s, p, bytes);
+      s[bytes-1] &= (0xff << (8-last_bits));
+  }
+  s += bytes;
+
+  *index += s-s0;
+
+  return 0;
+}