From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10321 invoked by alias); 5 Sep 2013 20:49:05 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 10309 invoked by uid 89); 5 Sep 2013 20:49:05 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 05 Sep 2013 20:49:05 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-5.8 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r85Kn33U003455 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 5 Sep 2013 16:49:03 -0400 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r85Kn1Q2031342 for ; Thu, 5 Sep 2013 16:49:02 -0400 Message-ID: <5228EE3D.7040803@redhat.com> Date: Thu, 05 Sep 2013 20:49:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: gdb-patches@sourceware.org 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.) References: <1378239999-15533-1-git-send-email-palves@redhat.com> <1378239999-15533-6-git-send-email-palves@redhat.com> In-Reply-To: <1378239999-15533-6-git-send-email-palves@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-SW-Source: 2013-09/txt/msg00186.txt.bz2 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 * 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 */