Remove the bs_bits_to_bytes/3 instruction

The last compiler to generate code that uses the bs_bits_to_bytes/3
instruction was the R11 compiler. Since we don't support loading
R11 *.beam files in R14, removing the remaining support for the
instruction.

3 files changed, 2 insertions, 44 deletions

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index eb95999e55..d42e74ccc9 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -3527,42 +3527,6 @@ apply_bif_or_nif_epilogue:
 	 }
  }
 
- OpCase(i_bs_bits_to_bytes_rjd): {
-     tmp_arg1 = r(0);
-     goto do_bits_to_bytes;
- }
-
- OpCase(i_bs_bits_to_bytes_yjd): {
-     tmp_arg1 = yb(Arg(0));
-     I++;
-     goto do_bits_to_bytes;
-
- OpCase(i_bs_bits_to_bytes_xjd): {
-     tmp_arg1 = xb(Arg(0));
-     I++;
- }
-
- do_bits_to_bytes:
-     {
-	 if (is_valid_bit_size(tmp_arg1)) {
-	     tmp_arg1 = make_small(unsigned_val(tmp_arg1) >> 3);
-	 } else {
-	     Uint bytes;
-	     if (!term_to_Uint(tmp_arg1, &bytes)) {
-		 goto badarg;
-	     }
-	     tmp_arg1 = bytes;
-	     if ((tmp_arg1 & 0x07) != 0) {
-		 goto badarg;
-	     }
-	     SWAPOUT;
-	     tmp_arg1 = erts_make_integer(tmp_arg1 >> 3, c_p);
-	     HTOP = HEAP_TOP(c_p);
-	 }
-	 StoreBifResult(1, tmp_arg1);
-     }
- }
-
  OpCase(i_bs_add_jId): {
      Uint Unit = Arg(1);
      if (is_both_small(tmp_arg1, tmp_arg2)) {
@@ -3600,7 +3564,7 @@ apply_bif_or_nif_epilogue:
 
 	 /*
 	  * Now we know that one of the arguments is
-	  * not at small. We must convert both arguments
+	  * not a small. We must convert both arguments
 	  * to Uints and check for errors at the same time.
 	  *
 	  * Error checking is tricky.
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index 802c6fd1eb..42c84989c6 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -1180,12 +1180,6 @@ i_bs_init_bits_fail_heap I j I d
 i_bs_init_bits I I d
 i_bs_init_bits_heap I I I d
 
-bs_bits_to_bytes Fail Src Dst => i_bs_bits_to_bytes Src Fail Dst
-
-i_bs_bits_to_bytes r j d
-i_bs_bits_to_bytes x j d
-i_bs_bits_to_bytes y j d
-
 bs_add Fail S1=i==0 S2 Unit=u==1 D => move S2 D
 bs_add Fail S1 S2 Unit D => i_fetch S1 S2 | i_bs_add Fail Unit D
 
diff --git a/lib/compiler/src/genop.tab b/lib/compiler/src/genop.tab
index d7e344b019..63527bda8f 100644
--- a/lib/compiler/src/genop.tab
+++ b/lib/compiler/src/genop.tab
@@ -208,7 +208,7 @@ BEAM_FORMAT_NUMBER=0
 
 # New instructions in R10B.
 109: bs_init2/6
-110: bs_bits_to_bytes/3
+110: -bs_bits_to_bytes/3
 111: bs_add/5
 112: apply/1
 113: apply_last/2