From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 2/7] gdb: move `enum compile_i_scope_types` to compile/compile.h
Date: Mon, 22 Apr 2024 16:10:12 -0400 [thread overview]
Message-ID: <20240422201157.46375-3-simon.marchi@efficios.com> (raw)
In-Reply-To: <20240422201157.46375-1-simon.marchi@efficios.com>
Move it out of defs.h, adjust the includes here and there.
Change-Id: I11901fdce55d54f5e51723e123cef154cfb1bbc5
---
gdb/cli/cli-script.h | 1 +
gdb/compile/compile-object-load.h | 1 +
gdb/compile/compile.h | 28 ++++++++++++++++++++++++++++
gdb/defs.h | 28 ----------------------------
4 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/gdb/cli/cli-script.h b/gdb/cli/cli-script.h
index d36743e5a316..512e37b8bf35 100644
--- a/gdb/cli/cli-script.h
+++ b/gdb/cli/cli-script.h
@@ -17,6 +17,7 @@
#ifndef CLI_CLI_SCRIPT_H
#define CLI_CLI_SCRIPT_H
+#include "compile/compile.h"
#include "gdbsupport/function-view.h"
struct ui_file;
diff --git a/gdb/compile/compile-object-load.h b/gdb/compile/compile-object-load.h
index eb6eb0dd8717..83665b5c4c42 100644
--- a/gdb/compile/compile-object-load.h
+++ b/gdb/compile/compile-object-load.h
@@ -18,6 +18,7 @@
#define COMPILE_COMPILE_OBJECT_LOAD_H
#include "compile-internal.h"
+#include "compile.h"
#include <list>
struct munmap_list
diff --git a/gdb/compile/compile.h b/gdb/compile/compile.h
index d584df6661cc..4be6f50d4f38 100644
--- a/gdb/compile/compile.h
+++ b/gdb/compile/compile.h
@@ -19,6 +19,7 @@
#define COMPILE_COMPILE_H
#include "gcc-c-interface.h"
+#include "gdbsupport/gdb-hashtab.h"
struct ui_file;
struct gdbarch;
@@ -27,6 +28,33 @@ struct dwarf2_per_objfile;
struct symbol;
struct dynamic_prop;
+/* Scope types enumerator. List the types of scopes the compiler will
+ accept. */
+
+enum compile_i_scope_types
+ {
+ COMPILE_I_INVALID_SCOPE,
+
+ /* A simple scope. Wrap an expression into a simple scope that
+ takes no arguments, returns no value, and uses the generic
+ function name "_gdb_expr". */
+
+ COMPILE_I_SIMPLE_SCOPE,
+
+ /* Do not wrap the expression,
+ it has to provide function "_gdb_expr" on its own. */
+ COMPILE_I_RAW_SCOPE,
+
+ /* A printable expression scope. Wrap an expression into a scope
+ suitable for the "compile print" command. It uses the generic
+ function name "_gdb_expr". COMPILE_I_PRINT_ADDRESS_SCOPE variant
+ is the usual one, taking address of the object.
+ COMPILE_I_PRINT_VALUE_SCOPE is needed for arrays where the array
+ name already specifies its address. See get_out_value_type. */
+ COMPILE_I_PRINT_ADDRESS_SCOPE,
+ COMPILE_I_PRINT_VALUE_SCOPE,
+ };
+
/* An object of this type holds state associated with a given
compilation job. */
diff --git a/gdb/defs.h b/gdb/defs.h
index ce8f29b2cf6a..057581d27641 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -63,34 +63,6 @@
#include "gdbsupport/enum-flags.h"
#include "gdbsupport/array-view.h"
-/* Scope types enumerator. List the types of scopes the compiler will
- accept. */
-
-enum compile_i_scope_types
- {
- COMPILE_I_INVALID_SCOPE,
-
- /* A simple scope. Wrap an expression into a simple scope that
- takes no arguments, returns no value, and uses the generic
- function name "_gdb_expr". */
-
- COMPILE_I_SIMPLE_SCOPE,
-
- /* Do not wrap the expression,
- it has to provide function "_gdb_expr" on its own. */
- COMPILE_I_RAW_SCOPE,
-
- /* A printable expression scope. Wrap an expression into a scope
- suitable for the "compile print" command. It uses the generic
- function name "_gdb_expr". COMPILE_I_PRINT_ADDRESS_SCOPE variant
- is the usual one, taking address of the object.
- COMPILE_I_PRINT_VALUE_SCOPE is needed for arrays where the array
- name already specifies its address. See get_out_value_type. */
- COMPILE_I_PRINT_ADDRESS_SCOPE,
- COMPILE_I_PRINT_VALUE_SCOPE,
- };
-
-
template<typename T>
using RequireLongest = gdb::Requires<gdb::Or<std::is_same<T, LONGEST>,
std::is_same<T, ULONGEST>>>;
--
2.44.0
next prev parent reply other threads:[~2024-04-22 20:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-22 20:10 [PATCH 0/7] First cleanup of defs.h Simon Marchi
2024-04-22 20:10 ` [PATCH 1/7] gdb: move two declarations out " Simon Marchi
2024-04-22 20:10 ` Simon Marchi [this message]
2024-04-22 20:10 ` [PATCH 3/7] gdb: remove extract_long_unsigned_integer Simon Marchi
2024-04-22 20:10 ` [PATCH 4/7] gdb: move store/extract integer functions to extract-store-integer.{c,h} Simon Marchi
2024-04-23 18:03 ` [PATCH 4/7] gdb: move store/extract integer functions to extract-store-integer.{c, h} Pedro Alves
2024-04-23 19:10 ` Simon Marchi
2024-04-23 19:40 ` Pedro Alves
2024-04-22 20:10 ` [PATCH 5/7] gdb: move RequireLongest to gdbsupport/traits.h Simon Marchi
2024-04-22 20:10 ` [PATCH 6/7] gdb: don't include hashtab.h in defs.h Simon Marchi
2024-04-22 20:10 ` [PATCH 7/7] gdb: don't include gdbsupport/array-view.h " Simon Marchi
2024-04-22 22:55 ` [PATCH 0/7] First cleanup of defs.h John Baldwin
2024-04-23 1:38 ` Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240422201157.46375-3-simon.marchi@efficios.com \
--to=simon.marchi@efficios.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).