From 1f802279f79ff3a7f1ded5604d6433a6cd448448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 18 Jan 2018 13:33:06 +0100
Subject: beam_debug: Print out strings for bs_match_string/bs_put_string

---
 erts/emulator/beam/beam_debug.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'erts/emulator/beam/beam_debug.c')

diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c
index 5aff1c3cb8..188cbbe915 100644
--- a/erts/emulator/beam/beam_debug.c
+++ b/erts/emulator/beam/beam_debug.c
@@ -55,6 +55,7 @@ static int print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
 static void print_bif_name(fmtfn_t to, void* to_arg, BifFunction bif);
 static BeamInstr* f_to_addr(BeamInstr* base, int op, BeamInstr* ap);
 static BeamInstr* f_to_addr_packed(BeamInstr* base, int op, Sint32* ap);
+static void print_byte_string(fmtfn_t to, void *to_arg, byte* str, Uint bytes);
 
 BIF_RETTYPE
 erts_debug_same_2(BIF_ALIST_2)
@@ -396,6 +397,7 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
     BeamInstr args[8];		/* Arguments for this instruction. */
     BeamInstr* ap;			/* Pointer to arguments. */
     BeamInstr* unpacked;		/* Unpacked arguments */
+    BeamInstr* first_arg;               /* First argument */
 
     start_prog = opc[op].pack;
 
@@ -480,6 +482,8 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
 	ap = args;
     }
 
+    first_arg = ap;
+
     /*
      * Print the name and all operands of the instructions.
      */
@@ -580,6 +584,25 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
                     erts_print(to, to_arg, "%d", *ap);
                 }
                 break;
+	    case op_i_bs_match_string_xfWW:
+                if (ap - first_arg < 3) {
+                    erts_print(to, to_arg, "%d", *ap);
+                } else {
+                    Uint bits = ap[-1];
+                    Uint bytes = (bits+7)/8;
+                    byte* str = (byte *) *ap;
+                    print_byte_string(to, to_arg, str, bytes);
+                }
+                break;
+	    case op_bs_put_string_WW:
+                if (ap - first_arg == 0) {
+                    erts_print(to, to_arg, "%d", *ap);
+                } else {
+                    Uint bytes = ap[-1];
+                    byte* str = (byte *) ap[0];
+                    print_byte_string(to, to_arg, str, bytes);
+                }
+                break;
 	    default:
 		erts_print(to, to_arg, "%d", *ap);
 	    }
@@ -858,6 +881,14 @@ static BeamInstr* f_to_addr_packed(BeamInstr* base, int op, Sint32* ap)
     return base - 1 + opc[op].adjust + *ap;
 }
 
+static void print_byte_string(fmtfn_t to, void *to_arg, byte* str, Uint bytes)
+{
+    Uint i;
+
+    for (i = 0; i < bytes; i++) {
+        erts_print(to, to_arg, "%02X", str[i]);
+    }
+}
 
 /*
  * Dirty BIF testing.
-- 
cgit v1.2.3