[v2,1/7] Introduce type-safe variant of gdb_bfd_openr_iovec
Checks
Context |
Check |
Description |
linaro-tcwg-bot/tcwg_gdb_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_check--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 |
success
|
Testing passed
|
Commit Message
This patch adds a new, type-safe variant of gdb_bfd_openr_iovec. In
this approach, the underlying user data is simply an object, the
callbacks are methods, and the "open" function is a function view.
Nothing uses this new code yet.
Reviewed-By: Lancelot Six <lancelot.six@amd.com>
---
gdb/gdb_bfd.c | 42 ++++++++++++++++++++++++++++++++++++++++++
gdb/gdb_bfd.h | 31 +++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+)
@@ -907,6 +907,48 @@ gdb_bfd_openw (const char *filename, const char *target)
/* See gdb_bfd.h. */
+gdb_bfd_ref_ptr
+gdb_bfd_openr_iovec (const char *filename, const char *target,
+ gdb_iovec_opener_ftype open_fn)
+{
+ auto do_open = [] (bfd *nbfd, void *closure) -> void *
+ {
+ auto real_opener = static_cast<gdb_iovec_opener_ftype *> (closure);
+ return (*real_opener) (nbfd);
+ };
+
+ auto read_trampoline = [] (bfd *nbfd, void *stream, void *buf,
+ file_ptr nbytes, file_ptr offset) -> file_ptr
+ {
+ gdb_bfd_iovec_base *obj = static_cast<gdb_bfd_iovec_base *> (stream);
+ return obj->read (nbfd, buf, nbytes, offset);
+ };
+
+ auto stat_trampoline = [] (struct bfd *abfd, void *stream,
+ struct stat *sb) -> int
+ {
+ gdb_bfd_iovec_base *obj = static_cast<gdb_bfd_iovec_base *> (stream);
+ return obj->stat (abfd, sb);
+ };
+
+ auto close_trampoline = [] (struct bfd *nbfd, void *stream) -> int
+ {
+ gdb_bfd_iovec_base *obj = static_cast<gdb_bfd_iovec_base *> (stream);
+ delete obj;
+ /* Success. */
+ return 0;
+ };
+
+ bfd *result = bfd_openr_iovec (filename, target,
+ do_open, &open_fn,
+ read_trampoline, close_trampoline,
+ stat_trampoline);
+
+ return gdb_bfd_ref_ptr::new_reference (result);
+}
+
+/* See gdb_bfd.h. */
+
gdb_bfd_ref_ptr
gdb_bfd_openr_iovec (const char *filename, const char *target,
void *(*open_func) (struct bfd *nbfd,
@@ -22,6 +22,7 @@
#include "registry.h"
#include "gdbsupport/byte-vector.h"
+#include "gdbsupport/function-view.h"
#include "gdbsupport/gdb_ref_ptr.h"
#include "gdbsupport/iterator-range.h"
#include "gdbsupport/next-iterator.h"
@@ -150,6 +151,36 @@ gdb_bfd_ref_ptr gdb_bfd_openr (const char *, const char *);
gdb_bfd_ref_ptr gdb_bfd_openw (const char *, const char *);
+/* The base class for BFD "iovec" implementations. This is used by
+ gdb_bfd_openr_iovec and enables better type safety. */
+
+class gdb_bfd_iovec_base
+{
+protected:
+
+ gdb_bfd_iovec_base () = default;
+
+public:
+
+ virtual ~gdb_bfd_iovec_base () = default;
+
+ /* The "read" callback. */
+ virtual file_ptr read (bfd *abfd, void *buffer, file_ptr nbytes,
+ file_ptr offset) = 0;
+
+ /* The "stat" callback. */
+ virtual int stat (struct bfd *abfd, struct stat *sb) = 0;
+};
+
+/* The type of the function used to open a new iovec-based BFD. */
+using gdb_iovec_opener_ftype
+ = gdb::function_view<gdb_bfd_iovec_base * (bfd *)>;
+
+/* A type-safe wrapper for bfd_openr_iovec. */
+
+gdb_bfd_ref_ptr gdb_bfd_openr_iovec (const char *filename, const char *target,
+ gdb_iovec_opener_ftype open_fn);
+
/* A wrapper for bfd_openr_iovec that initializes the gdb-specific
reference count. */