From 99b0bb12cdb22489b403df6afe992b81bebbd9ec Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 21 Aug 2015 23:59:33 +0100 Subject: [PATCH] Fix ax.c:gdb_eval_agent_expr MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In C++ mode: src/gdb/gdbserver/ax.c: In function ‘eval_result_type gdb_eval_agent_expr(eval_agent_expr_context*, agent_expr*, ULONGEST*)’: src/gdb/gdbserver/ax.c:1335:11: error: invalid conversion from ‘int’ to ‘eval_result_type’ [-fpermissive] return 1; ^ "1" as an enum eval_result_type is expr_eval_empty_expression, but clearly this wants to return expr_eval_unhandled_opcode. gdb/gdbserver/ChangeLog: 2015-08-21 Pedro Alves * ax.c (gdb_eval_agent_expr): Return expr_eval_unhandled_opcode instead of literal 1. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/ax.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 61032872c6..cd5e046ce5 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2015-08-21 Pedro Alves + + * ax.c (gdb_eval_agent_expr): Return expr_eval_unhandled_opcode + instead of literal 1. + 2015-08-21 Pedro Alves * tdesc.c (default_description): Explicitly zero-initialize. diff --git a/gdb/gdbserver/ax.c b/gdb/gdbserver/ax.c index c5b65fad62..f94a27d96b 100644 --- a/gdb/gdbserver/ax.c +++ b/gdb/gdbserver/ax.c @@ -1332,7 +1332,7 @@ gdb_eval_agent_expr (struct eval_agent_expr_context *ctx, op); /* If ever GDB generates any of these, we don't have the option of ignoring. */ - return 1; + return expr_eval_unhandled_opcode; default: ax_debug ("Agent expression op 0x%x not recognized", op); -- 2.34.1