* dbxread.c (read_dbx_symtab) <bss_ext_symbol>: Remove unused

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

diff --git a/gdb/ax-general.c b/gdb/ax-general.c
index 62c382cc5d70f3055cce2be5af24476f00be4b38..78d7f7e5731ff17645e47c651558bfbc55f10e24 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-2013 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -59,6 +58,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;
 }
 
@@ -332,12 +334,28 @@ ax_tsv (struct agent_expr *x, enum agent_op op, int num)
   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_memcpy (struct agent_expr *x, const void *src, size_t n)
+ax_string (struct agent_expr *x, const char *str, int slen)
 {
-  grow_expr (x, n);
-  memcpy (x->buf + x->len, src, n);
-  x->len += n;
+  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
 
@@ -360,7 +378,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:"));
@@ -377,7 +394,6 @@ ax_print (struct ui_file *f, struct agent_expr *x)
   for (i = 0; i < x->len;)
     {
       enum agent_op op = x->buf[i];
-      int op_size;
 
       if (op >= (sizeof (aop_map) / sizeof (aop_map[0]))
          || !aop_map[op].name)
@@ -386,19 +402,7 @@ ax_print (struct ui_file *f, struct agent_expr *x)
          i++;
          continue;
        }
-      if (op == aop_printf)
-        {
-         if (i + 2 >= x->len)
-           {
-             fprintf_filtered (f, _("%3d  <bad opcode %02x>\n"), i, op);
-             i++;
-             continue;
-           }
-         op_size = 1 + strlen (x->buf + i + 2) + 1;
-       }
-      else
-       op_size = aop_map[op].op_size;
-      if (i + 1 + op_size > x->len)
+      if (i + 1 + aop_map[op].op_size > x->len)
        {
          fprintf_filtered (f, _("%3d  <incomplete opcode %s>\n"),
                            i, aop_map[op].name);
@@ -406,17 +410,28 @@ ax_print (struct ui_file *f, struct agent_expr *x)
        }
 
       fprintf_filtered (f, "%3d  %s", i, aop_map[op].name);
-      if (op_size > 0)
+      if (aop_map[op].op_size > 0)
        {
          fputs_filtered (" ", f);
 
          print_longest (f, 'd', 0,
-                        read_const (x, i + 1, op_size));
+                        read_const (x, i + 1, aop_map[op].op_size));
        }
-      fprintf_filtered (f, "\n");
-      i += 1 + op_size;
+      /* Handle the complicated printf arguments specially.  */
+      else if (op == aop_printf)
+       {
+         int slen, nargs;
 
-      is_float = (op == aop_float);
+         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;
     }
 }
 
@@ -482,8 +497,6 @@ ax_reqs (struct agent_expr *ax)
   /* Pointer to a description of the present op.  */
   struct aop_map *op;
 
-  int op_size = 0, consumed = 0;
-
   memset (targets, 0, ax->len * sizeof (targets[0]));
   memset (boundary, 0, ax->len * sizeof (boundary[0]));
 
@@ -491,7 +504,7 @@ ax_reqs (struct agent_expr *ax)
   ax->flaw = agent_flaw_none;
   ax->max_data_size = 0;
 
-  for (i = 0; i < ax->len; i += 1 + op_size)
+  for (i = 0; i < ax->len; i += 1 + op->op_size)
     {
       if (ax->buf[i] > (sizeof (aop_map) / sizeof (aop_map[0])))
        {
@@ -507,23 +520,7 @@ ax_reqs (struct agent_expr *ax)
          return;
        }
 
-      if (ax->buf[i] == aop_printf)
-        {
-         if (i + 2 >= ax->len)
-           {
-             ax->flaw = agent_flaw_incomplete_instruction;
-             return;
-           }
-         consumed = ax->buf[i + 1];
-         op_size = 1 + strlen (ax->buf + i + 2) + 1;
-       }
-      else
-        {
-         op_size = op->op_size;
-         consumed = op->consumed;
-        }
-
-      if (i + 1 + op_size > ax->len)
+      if (i + 1 + op->op_size > ax->len)
        {
          ax->flaw = agent_flaw_incomplete_instruction;
          return;
@@ -541,7 +538,7 @@ ax_reqs (struct agent_expr *ax)
       boundary[i] = 1;
       heights[i] = height;
 
-      height -= consumed;
+      height -= op->consumed;
       if (height < ax->min_height)
        ax->min_height = height;
       height += op->produced;