From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 1AB4F3858C5E; Fri, 20 Jan 2023 19:52:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AB4F3858C5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674244347; bh=oU/0Om6Q1eN+b/JuiTS4CkBZ1SzPlMsZaIfbWsK7V6I=; h=From:To:Subject:Date:From; b=fRaKs5zItG6sTCk1pkUfjX7H2INGjpje8uk0Ocvr1ACZDBk8VqFWzSsIcN1hIIkn5 GAesHKBQzUAz3olMPxUxYbB+dqPClfuSGBG0wfw8Ig3PBE9R5l8fLw1MU2DDFKsvn6 woBJkVgSY0kFj/E98AnN7MPOta8S4HqXiEgMd7fs= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: move sect_offset and cu_offset to dwarf2/types.h X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: 83b6e1f1c52c632a7b554674306cc586e03f7855 X-Git-Newrev: b23bf9f7241caecc41127a5739dfb32788b041a6 Message-Id: <20230120195227.1AB4F3858C5E@sourceware.org> Date: Fri, 20 Jan 2023 19:52:27 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Db23bf9f7241c= aecc41127a5739dfb32788b041a6 commit b23bf9f7241caecc41127a5739dfb32788b041a6 Author: Simon Marchi Date: Tue Dec 13 22:34:32 2022 -0500 gdb: move sect_offset and cu_offset to dwarf2/types.h =20 I want to move the call_site stuff out of gdbtypes.h, to a new header file, to break some cyclic include problem. The call_site stuff uses cu_offset, also defined in gdbtypes.h, so cu_offset also needs to move somewhere else (otherwise, call-site.h will need to include gdbtypes.h, and we are back to square 1). I could move cu_offset to the future new file dwarf2/call-site.h, but it doesn't sound like a good place for it, at cu_offset is not specific to call sites, it's used throughout dwarf2/. So, move it to its own file, dwarf2/types.h. For now, gdbtypes.h includes dwarf2/types.h, but that will be removed once the call site stuff is moved to its own file. =20 Move sect_offset with it too. sect_offset is not a DWARF-specific concept, but for the moment it is only used in dwarf2/. =20 Change-Id: I1fd2a3b7b67dee789c4874244b044bde7db43d8e Reviewed-By: Bruno Larsen Diff: --- gdb/dwarf2/types.h | 39 +++++++++++++++++++++++++++++++++++++++ gdb/gdbtypes.h | 18 +----------------- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/gdb/dwarf2/types.h b/gdb/dwarf2/types.h new file mode 100644 index 00000000000..463dc485925 --- /dev/null +++ b/gdb/dwarf2/types.h @@ -0,0 +1,39 @@ +/* Common internal types for the DWARF reader + + Copyright (C) 2017-2022 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 DWARF2_TYPES_H +#define DWARF2_TYPES_H + +#include "gdbsupport/offset-type.h" + +/* Offset relative to the start of its containing CU (compilation + unit). */ +DEFINE_OFFSET_TYPE (cu_offset, unsigned int); + +/* Offset relative to the start of its .debug_info or .debug_types + section. */ +DEFINE_OFFSET_TYPE (sect_offset, uint64_t); + +static inline char * +sect_offset_str (sect_offset offset) +{ + return hex_string (to_underlying (offset)); +} + +#endif /* DWARF2_TYPES_H */ diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index a9abb0d8071..1878af329e9 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -57,6 +57,7 @@ #include "gdbsupport/gdb_obstack.h" #include "gmp-utils.h" #include "frame-info.h" +#include "dwarf2/types.h" =20 /* Forward declarations for prototypes. */ struct field; @@ -66,23 +67,6 @@ struct language_defn; struct dwarf2_per_cu_data; struct dwarf2_per_objfile; =20 -/* These declarations are DWARF-specific as some of the gdbtypes.h data ty= pes - are already DWARF-specific. */ - -/* * Offset relative to the start of its containing CU (compilation - unit). */ -DEFINE_OFFSET_TYPE (cu_offset, unsigned int); - -/* * Offset relative to the start of its .debug_info or .debug_types - section. */ -DEFINE_OFFSET_TYPE (sect_offset, uint64_t); - -static inline char * -sect_offset_str (sect_offset offset) -{ - return hex_string (to_underlying (offset)); -} - /* Some macros for char-based bitfields. */ =20 #define B_SET(a,x) ((a)[(x)>>3] |=3D (1 << ((x)&7)))