From patchwork Wed Aug 13 09:56:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2380 Received: (qmail 27460 invoked by alias); 13 Aug 2014 09:56:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 27409 invoked by uid 89); 13 Aug 2014 09:56:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 13 Aug 2014 09:56:29 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7D9uQHf027264 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Aug 2014 05:56:26 -0400 Received: from blade.nx (ovpn-116-116.ams2.redhat.com [10.36.116.116]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7D9uP1o028440; Wed, 13 Aug 2014 05:56:25 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id CB4292640E9; Wed, 13 Aug 2014 10:56:24 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Doug Evans , Pedro Alves Subject: [PATCH 2/5 v7] Introduce common-types.h Date: Wed, 13 Aug 2014 10:56:16 +0100 Message-Id: <1407923779-22149-3-git-send-email-gbenson@redhat.com> In-Reply-To: <1407923779-22149-1-git-send-email-gbenson@redhat.com> References: <1407923779-22149-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This introduces common-types.h. This file defines various standard types used by gdb and gdbserver. Currently these types are conditionally defined based on GDBSERVER. The long term goal is to remove all such tests; however, this is difficult as currently gdb uses definitions from BFD. In the meantime this is still a step in the right direction. gdb/ 2014-08-13 Tom Tromey Gary Benson * common/common-types.h: New file. * Makefile.in (HFILES_NO_SRCDIR): Add common/common-types.h. * common/common-defs.h: Include common-types.h. * defs.h (gdb_byte, CORE_ADDR, CORE_ADDR_MAX, LONGEST) (ULONGEST): Remove. gdb/gdbserver/ 2014-08-13 Tom Tromey Gary Benson * server.h: Add static assertion. (gdb_byte, CORE_ADDR, LONGEST, ULONGEST): Remove. --- gdb/ChangeLog | 9 ++++++ gdb/Makefile.in | 2 +- gdb/common/common-defs.h | 1 + gdb/common/common-types.h | 61 +++++++++++++++++++++++++++++++++++++++++++++ gdb/defs.h | 29 --------------------- gdb/gdbserver/ChangeLog | 6 ++++ gdb/gdbserver/server.h | 13 +-------- 7 files changed, 80 insertions(+), 41 deletions(-) create mode 100644 gdb/common/common-types.h diff --git a/gdb/Makefile.in b/gdb/Makefile.in index fa0dcd4..76ca0da 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -936,7 +936,7 @@ gdb_bfd.h sparc-ravenscar-thread.h ppc-ravenscar-thread.h nat/linux-btrace.h \ ctf.h nat/i386-cpuid.h nat/i386-gcc-cpuid.h target/resume.h \ target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \ common/print-utils.h common/rsp-low.h nat/i386-dregs.h x86-linux-nat.h \ -i386-linux-nat.h common/common-defs.h common/errors.h +i386-linux-nat.h common/common-defs.h common/errors.h common/common-types.h # Header files that already have srcdir in them, or which are in objdir. diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h index a15423c..5543e4c 100644 --- a/gdb/common/common-defs.h +++ b/gdb/common/common-defs.h @@ -42,5 +42,6 @@ #include "common-utils.h" #include "gdb_assert.h" #include "errors.h" +#include "common-types.h" #endif /* COMMON_DEFS_H */ diff --git a/gdb/common/common-types.h b/gdb/common/common-types.h new file mode 100644 index 0000000..9fa1c24 --- /dev/null +++ b/gdb/common/common-types.h @@ -0,0 +1,61 @@ +/* Declarations for common types. + + Copyright (C) 1986-2014 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef COMMON_TYPES_H +#define COMMON_TYPES_H + +#ifdef GDBSERVER + +/* * A byte from the program being debugged. */ +typedef unsigned char gdb_byte; + +typedef unsigned long long CORE_ADDR; + +typedef long long LONGEST; +typedef unsigned long long ULONGEST; + +#else /* GDBSERVER */ + +#include "bfd.h" + +/* * A byte from the program being debugged. */ +typedef bfd_byte gdb_byte; + +/* * An address in the program being debugged. Host byte order. */ +typedef bfd_vma CORE_ADDR; + +/* This is to make sure that LONGEST is at least as big as CORE_ADDR. */ + +#ifdef BFD64 + +typedef BFD_HOST_64_BIT LONGEST; +typedef BFD_HOST_U_64_BIT ULONGEST; + +#else /* No BFD64 */ + +typedef long long LONGEST; +typedef unsigned long long ULONGEST; + +#endif /* No BFD64 */ +#endif /* GDBSERVER */ + +/* * The largest CORE_ADDR value. */ +#define CORE_ADDR_MAX (~ (CORE_ADDR) 0) + +#endif /* COMMON_TYPES_H */ diff --git a/gdb/defs.h b/gdb/defs.h index b7271a7..8914512 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -76,35 +76,6 @@ #include "hashtab.h" -/* Rather than duplicate all the logic in BFD for figuring out what - types to use (which can be pretty complicated), symply define them - in terms of the corresponding type from BFD. */ - -#include "bfd.h" - -/* * A byte from the program being debugged. */ -typedef bfd_byte gdb_byte; - -/* * An address in the program being debugged. Host byte order. */ -typedef bfd_vma CORE_ADDR; - -/* * The largest CORE_ADDR value. */ -#define CORE_ADDR_MAX (~ (CORE_ADDR) 0) - -/* This is to make sure that LONGEST is at least as big as CORE_ADDR. */ - -#ifdef BFD64 - -#define LONGEST BFD_HOST_64_BIT -#define ULONGEST BFD_HOST_U_64_BIT - -#else /* No BFD64 */ - -#define LONGEST long long -#define ULONGEST unsigned long long - -#endif /* No BFD64 */ - #ifndef min #define min(a, b) ((a) < (b) ? (a) : (b)) #endif diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index db6ddde..e6b2277 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -21,6 +21,8 @@ #include "common-defs.h" +gdb_static_assert (sizeof (CORE_ADDR) >= sizeof (void *)); + #ifdef __MINGW32CE__ #include "wincecompat.h" #endif @@ -63,19 +65,8 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap); # define PROG "gdbserver" #endif -/* A type used for binary buffers. */ -typedef unsigned char gdb_byte; - #include "buffer.h" #include "xml-utils.h" - -/* FIXME: This should probably be autoconf'd for. It's an integer type at - least the size of a (void *). */ -typedef unsigned long long CORE_ADDR; - -typedef long long LONGEST; -typedef unsigned long long ULONGEST; - #include "regcache.h" #include "gdb_signals.h" #include "target.h"