From 70b8286a9749deb6639c2fd5b39c7e4a26195738 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 27 Oct 2015 09:33:29 -0400 Subject: [PATCH] Introduce ax_raw_byte and use it This patch was taken directly from Pedro's branch. ax_simple is used to append an agent expression operator to an agent expression string. Therefore, it takes an enum agent_op as input. There is an instance where it's called to append a raw byte, unrelated to the enum. It makes the build fail in C++ mode. This patch introduces ax_raw_byte for that purpose and uses it. gdb/ChangeLog: * ax.h (ax_raw_byte): New declaration. * ax-general.c (ax_raw_byte): New function. (ax_simple): Use ax_raw_byte. * ax-gdb.c (gen_printf): Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/ax-gdb.c | 2 +- gdb/ax-general.c | 11 +++++++++-- gdb/ax.h | 3 +++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7b78890ef41..768de09244b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2015-10-27 Simon Marchi + + * ax.h (ax_raw_byte): New declaration. + * ax-general.c (ax_raw_byte): New function. + (ax_simple): Use ax_raw_byte. + * ax-gdb.c (gen_printf): Likewise. + 2015-10-27 Simon Marchi * ada-lang.h (GROW_VECT): Add cast. diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 817fa53ed90..7091a4ae268 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -2564,7 +2564,7 @@ gen_printf (CORE_ADDR scope, struct gdbarch *gdbarch, /* Issue the printf bytecode proper. */ ax_simple (ax, aop_printf); - ax_simple (ax, nargs); + ax_raw_byte (ax, nargs); ax_string (ax, format, fmtlen); /* And terminate. */ diff --git a/gdb/ax-general.c b/gdb/ax-general.c index e5dc240576a..5c8a25bb3a0 100644 --- a/gdb/ax-general.c +++ b/gdb/ax-general.c @@ -133,13 +133,20 @@ read_const (struct agent_expr *x, int o, int n) return accum; } +/* See ax.h. */ + +void +ax_raw_byte (struct agent_expr *x, gdb_byte byte) +{ + grow_expr (x, 1); + x->buf[x->len++] = byte; +} /* Append a simple operator OP to EXPR. */ void ax_simple (struct agent_expr *x, enum agent_op op) { - grow_expr (x, 1); - x->buf[x->len++] = op; + ax_raw_byte (x, op); } /* Append a pick operator to EXPR. DEPTH is the stack item to pick, diff --git a/gdb/ax.h b/gdb/ax.h index eaa72ddb703..1714bb4618b 100644 --- a/gdb/ax.h +++ b/gdb/ax.h @@ -190,6 +190,9 @@ extern struct agent_expr *new_agent_expr (struct gdbarch *, CORE_ADDR); extern void free_agent_expr (struct agent_expr *); extern struct cleanup *make_cleanup_free_agent_expr (struct agent_expr *); +/* Append a raw byte to EXPR. */ +extern void ax_raw_byte (struct agent_expr *expr, gdb_byte byte); + /* Append a simple operator OP to EXPR. */ extern void ax_simple (struct agent_expr *EXPR, enum agent_op OP); -- 2.39.2