Update target_stop's documentation

[deliverable/binutils-gdb.git] / gdb / ax-general.c

diff --git a/gdb/ax-general.c b/gdb/ax-general.c
index 8d95855dcf7effe4e3a2c07f5dd3c52e5334f02d..cdb1480760545d5d1bc8371918acd39c5db4921b 100644 (file)
--- a/gdb/ax-general.c
+++ b/gdb/ax-general.c
@@ -1,6 +1,5 @@
 /* Functions for manipulating expressions designed to be executed on the agent
-   Copyright (C) 1998, 1999, 2000, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -26,8 +25,6 @@
 #include "ax.h"
 
 #include "value.h"
-#include "gdb_string.h"
-
 #include "user-regs.h"
 
 static void grow_expr (struct agent_expr *x, int n);
@@ -59,6 +56,9 @@ new_agent_expr (struct gdbarch *gdbarch, CORE_ADDR scope)
   x->reg_mask = xmalloc (x->reg_mask_len * sizeof (x->reg_mask[0]));
   memset (x->reg_mask, 0, x->reg_mask_len * sizeof (x->reg_mask[0]));
 
+  x->tracing = 0;
+  x->trace_string = 0;
+
   return x;
 }
 
@@ -145,6 +145,7 @@ ax_simple (struct agent_expr *x, enum agent_op op)
 
 /* Append a pick operator to EXPR.  DEPTH is the stack item to pick,
    with 0 being top of stack.  */
+
 void
 ax_pick (struct agent_expr *x, int depth)
 {
@@ -330,6 +331,30 @@ ax_tsv (struct agent_expr *x, enum agent_op op, int num)
   x->buf[x->len + 2] = (num) & 0xff;
   x->len += 3;
 }
+
+/* Append a string to the expression.  Note that the string is going
+   into the bytecodes directly, not on the stack.  As a precaution,
+   include both length as prefix, and terminate with a NUL.  (The NUL
+   is counted in the length.)  */
+
+void
+ax_string (struct agent_expr *x, const char *str, int slen)
+{
+  int i;
+
+  /* Make sure the string length is reasonable.  */
+  if (slen < 0 || slen > 0xffff)
+    internal_error (__FILE__, __LINE__, 
+                   _("ax-general.c (ax_string): string "
+                     "length is %d, out of allowed range"), slen);
+
+  grow_expr (x, 2 + slen + 1);
+  x->buf[x->len++] = ((slen + 1) >> 8) & 0xff;
+  x->buf[x->len++] = (slen + 1) & 0xff;
+  for (i = 0; i < slen; ++i)
+    x->buf[x->len++] = str[i];
+  x->buf[x->len++] = '\0';
+}
 \f
 
 
@@ -338,58 +363,11 @@ ax_tsv (struct agent_expr *x, enum agent_op op, int num)
 
 struct aop_map aop_map[] =
 {
-  {0, 0, 0, 0, 0},
-  {"float", 0, 0, 0, 0},       /* 0x01 */
-  {"add", 0, 0, 2, 1},         /* 0x02 */
-  {"sub", 0, 0, 2, 1},         /* 0x03 */
-  {"mul", 0, 0, 2, 1},         /* 0x04 */
-  {"div_signed", 0, 0, 2, 1},  /* 0x05 */
-  {"div_unsigned", 0, 0, 2, 1},        /* 0x06 */
-  {"rem_signed", 0, 0, 2, 1},  /* 0x07 */
-  {"rem_unsigned", 0, 0, 2, 1},        /* 0x08 */
-  {"lsh", 0, 0, 2, 1},         /* 0x09 */
-  {"rsh_signed", 0, 0, 2, 1},  /* 0x0a */
-  {"rsh_unsigned", 0, 0, 2, 1},        /* 0x0b */
-  {"trace", 0, 0, 2, 0},       /* 0x0c */
-  {"trace_quick", 1, 0, 1, 1}, /* 0x0d */
-  {"log_not", 0, 0, 1, 1},     /* 0x0e */
-  {"bit_and", 0, 0, 2, 1},     /* 0x0f */
-  {"bit_or", 0, 0, 2, 1},      /* 0x10 */
-  {"bit_xor", 0, 0, 2, 1},     /* 0x11 */
-  {"bit_not", 0, 0, 1, 1},     /* 0x12 */
-  {"equal", 0, 0, 2, 1},       /* 0x13 */
-  {"less_signed", 0, 0, 2, 1}, /* 0x14 */
-  {"less_unsigned", 0, 0, 2, 1},       /* 0x15 */
-  {"ext", 1, 0, 1, 1},         /* 0x16 */
-  {"ref8", 0, 8, 1, 1},                /* 0x17 */
-  {"ref16", 0, 16, 1, 1},      /* 0x18 */
-  {"ref32", 0, 32, 1, 1},      /* 0x19 */
-  {"ref64", 0, 64, 1, 1},      /* 0x1a */
-  {"ref_float", 0, 0, 1, 1},   /* 0x1b */
-  {"ref_double", 0, 0, 1, 1},  /* 0x1c */
-  {"ref_long_double", 0, 0, 1, 1},     /* 0x1d */
-  {"l_to_d", 0, 0, 1, 1},      /* 0x1e */
-  {"d_to_l", 0, 0, 1, 1},      /* 0x1f */
-  {"if_goto", 2, 0, 1, 0},     /* 0x20 */
-  {"goto", 2, 0, 0, 0},                /* 0x21 */
-  {"const8", 1, 8, 0, 1},      /* 0x22 */
-  {"const16", 2, 16, 0, 1},    /* 0x23 */
-  {"const32", 4, 32, 0, 1},    /* 0x24 */
-  {"const64", 8, 64, 0, 1},    /* 0x25 */
-  {"reg", 2, 0, 0, 1},         /* 0x26 */
-  {"end", 0, 0, 0, 0},         /* 0x27 */
-  {"dup", 0, 0, 1, 2},         /* 0x28 */
-  {"pop", 0, 0, 1, 0},         /* 0x29 */
-  {"zero_ext", 1, 0, 1, 1},    /* 0x2a */
-  {"swap", 0, 0, 2, 2},                /* 0x2b */
-  {"getv", 2, 0, 0, 1},                /* 0x2c */
-  {"setv", 2, 0, 0, 1},                /* 0x2d */
-  {"tracev", 2, 0, 0, 1},      /* 0x2e */
-  {0, 0, 0, 0, 0},             /* 0x2f */
-  {"trace16", 2, 0, 1, 1},     /* 0x30 */
-  {0, 0, 0, 0, 0},             /* 0x31 */
-  {"pick", 1, 0, 0, 1},                /* 0x32 */
-  {"rot", 0, 0, 3, 3},         /* 0x33 */
+  {0, 0, 0, 0, 0}
+#define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE) \
+  , { # NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED }
+#include "ax.def"
+#undef DEFOP
 };
 
 
@@ -398,7 +376,6 @@ void
 ax_print (struct ui_file *f, struct agent_expr *x)
 {
   int i;
-  int is_float = 0;
 
   fprintf_filtered (f, _("Scope: %s\n"), paddress (x->gdbarch, x->scope));
   fprintf_filtered (f, _("Reg mask:"));
@@ -438,10 +415,21 @@ ax_print (struct ui_file *f, struct agent_expr *x)
          print_longest (f, 'd', 0,
                         read_const (x, i + 1, aop_map[op].op_size));
        }
+      /* Handle the complicated printf arguments specially.  */
+      else if (op == aop_printf)
+       {
+         int slen, nargs;
+
+         i++;
+         nargs = x->buf[i++];
+         slen = x->buf[i++];
+         slen = slen * 256 + x->buf[i++];
+         fprintf_filtered (f, _(" \"%s\", %d args"),
+                           &(x->buf[i]), nargs);
+         i += slen - 1;
+       }
       fprintf_filtered (f, "\n");
       i += 1 + aop_map[op].op_size;
-
-      is_float = (op == aop_float);
     }
 }