This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 5/9] [gdbserver] Move bytecode compilation bits from server.h to ax.h. (was: Re: [PATCH 5/9] [gdbserver] Split a new ax.h file out of server.h.)
- From: Pedro Alves <palves at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Thu, 05 Sep 2013 21:49:01 +0100
- Subject: [PATCH 5/9] [gdbserver] Move bytecode compilation bits from server.h to ax.h. (was: Re: [PATCH 5/9] [gdbserver] Split a new ax.h file out of server.h.)
- Authentication-results: sourceware.org; auth=none
- References: <1378239999-15533-1-git-send-email-palves at redhat dot com> <1378239999-15533-6-git-send-email-palves at redhat dot com>
The ChangeLog and the subject were wrong... This is not a new file.
Otherwise, the patch went in unchanged.
------
[gdbserver] Move bytecode compilation bits from server.h to ax.h.
gdb/gdbserver/
2013-09-05 Pedro Alves <palves@redhat.com>
* server.h (struct emit_ops, current_insn_ptr, emit_error):
Move ...
* ax.h: ... here.
---
gdb/gdbserver/ax.h | 57 +++++++++++++++++++++++++++++++++++++++++
gdb/gdbserver/linux-x86-low.c | 1 +
gdb/gdbserver/server.h | 56 ----------------------------------------
3 files changed, 58 insertions(+), 56 deletions(-)
diff --git a/gdb/gdbserver/ax.h b/gdb/gdbserver/ax.h
index b2b4e3a..3ecc5d8 100644
--- a/gdb/gdbserver/ax.h
+++ b/gdb/gdbserver/ax.h
@@ -83,4 +83,61 @@ enum eval_result_type
gdb_eval_agent_expr (struct eval_agent_expr_context *ctx,
struct agent_expr *aexpr,
ULONGEST *rslt);
+
+/* Bytecode compilation function vector. */
+
+struct emit_ops
+{
+ void (*emit_prologue) (void);
+ void (*emit_epilogue) (void);
+ void (*emit_add) (void);
+ void (*emit_sub) (void);
+ void (*emit_mul) (void);
+ void (*emit_lsh) (void);
+ void (*emit_rsh_signed) (void);
+ void (*emit_rsh_unsigned) (void);
+ void (*emit_ext) (int arg);
+ void (*emit_log_not) (void);
+ void (*emit_bit_and) (void);
+ void (*emit_bit_or) (void);
+ void (*emit_bit_xor) (void);
+ void (*emit_bit_not) (void);
+ void (*emit_equal) (void);
+ void (*emit_less_signed) (void);
+ void (*emit_less_unsigned) (void);
+ void (*emit_ref) (int size);
+ void (*emit_if_goto) (int *offset_p, int *size_p);
+ void (*emit_goto) (int *offset_p, int *size_p);
+ void (*write_goto_address) (CORE_ADDR from, CORE_ADDR to, int size);
+ void (*emit_const) (LONGEST num);
+ void (*emit_call) (CORE_ADDR fn);
+ void (*emit_reg) (int reg);
+ void (*emit_pop) (void);
+ void (*emit_stack_flush) (void);
+ void (*emit_zero_ext) (int arg);
+ void (*emit_swap) (void);
+ void (*emit_stack_adjust) (int n);
+
+ /* Emit code for a generic function that takes one fixed integer
+ argument and returns a 64-bit int (for instance, tsv getter). */
+ void (*emit_int_call_1) (CORE_ADDR fn, int arg1);
+
+ /* Emit code for a generic function that takes one fixed integer
+ argument and a 64-bit int from the top of the stack, and returns
+ nothing (for instance, tsv setter). */
+ void (*emit_void_call_2) (CORE_ADDR fn, int arg1);
+
+ /* Emit code specialized for common combinations of compare followed
+ by a goto. */
+ void (*emit_eq_goto) (int *offset_p, int *size_p);
+ void (*emit_ne_goto) (int *offset_p, int *size_p);
+ void (*emit_lt_goto) (int *offset_p, int *size_p);
+ void (*emit_le_goto) (int *offset_p, int *size_p);
+ void (*emit_gt_goto) (int *offset_p, int *size_p);
+ void (*emit_ge_goto) (int *offset_p, int *size_p);
+};
+
+extern CORE_ADDR current_insn_ptr;
+extern int emit_error;
+
#endif /* AX_H */
diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index afb4ef7..cf61872 100644
--- a/gdb/gdbserver/linux-x86-low.c
+++ b/gdb/gdbserver/linux-x86-low.c
@@ -32,6 +32,7 @@
#include "agent.h"
#include "tdesc.h"
#include "tracepoint.h"
+#include "ax.h"
#ifdef __x86_64__
/* Defined in auto-generated file amd64-linux.c. */
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 94feba7..e21012a 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -288,60 +288,4 @@ extern void hostio_last_error_from_errno (char *own_buf);
as large as the largest register set supported by gdbserver. */
#define PBUFSIZ 16384
-/* Bytecode compilation function vector. */
-
-struct emit_ops
-{
- void (*emit_prologue) (void);
- void (*emit_epilogue) (void);
- void (*emit_add) (void);
- void (*emit_sub) (void);
- void (*emit_mul) (void);
- void (*emit_lsh) (void);
- void (*emit_rsh_signed) (void);
- void (*emit_rsh_unsigned) (void);
- void (*emit_ext) (int arg);
- void (*emit_log_not) (void);
- void (*emit_bit_and) (void);
- void (*emit_bit_or) (void);
- void (*emit_bit_xor) (void);
- void (*emit_bit_not) (void);
- void (*emit_equal) (void);
- void (*emit_less_signed) (void);
- void (*emit_less_unsigned) (void);
- void (*emit_ref) (int size);
- void (*emit_if_goto) (int *offset_p, int *size_p);
- void (*emit_goto) (int *offset_p, int *size_p);
- void (*write_goto_address) (CORE_ADDR from, CORE_ADDR to, int size);
- void (*emit_const) (LONGEST num);
- void (*emit_call) (CORE_ADDR fn);
- void (*emit_reg) (int reg);
- void (*emit_pop) (void);
- void (*emit_stack_flush) (void);
- void (*emit_zero_ext) (int arg);
- void (*emit_swap) (void);
- void (*emit_stack_adjust) (int n);
-
- /* Emit code for a generic function that takes one fixed integer
- argument and returns a 64-bit int (for instance, tsv getter). */
- void (*emit_int_call_1) (CORE_ADDR fn, int arg1);
-
- /* Emit code for a generic function that takes one fixed integer
- argument and a 64-bit int from the top of the stack, and returns
- nothing (for instance, tsv setter). */
- void (*emit_void_call_2) (CORE_ADDR fn, int arg1);
-
- /* Emit code specialized for common combinations of compare followed
- by a goto. */
- void (*emit_eq_goto) (int *offset_p, int *size_p);
- void (*emit_ne_goto) (int *offset_p, int *size_p);
- void (*emit_lt_goto) (int *offset_p, int *size_p);
- void (*emit_le_goto) (int *offset_p, int *size_p);
- void (*emit_gt_goto) (int *offset_p, int *size_p);
- void (*emit_ge_goto) (int *offset_p, int *size_p);
-};
-
-extern CORE_ADDR current_insn_ptr;
-extern int emit_error;
-
#endif /* SERVER_H */