diff options
author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-10-25 23:29:34 -0400 |
---|---|---|
committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-12-03 16:41:38 -0500 |
commit | 2a50938ab740296a1d6df67feea9401e57e4d90e (patch) | |
tree | c0a570783faab4b4e5225e14a434739fa0264536 /gdb/defs.h | |
parent | 4bce7cdaf481901edbc5ee47d953ea7e8efb56ca (diff) | |
download | gdb-2a50938ab740296a1d6df67feea9401e57e4d90e.zip gdb-2a50938ab740296a1d6df67feea9401e57e4d90e.tar.gz gdb-2a50938ab740296a1d6df67feea9401e57e4d90e.tar.bz2 |
gdb: make extract_integer take an array_view
I think it would make sense for extract_integer, extract_signed_integer
and extract_unsigned_integer to take an array_view. This way, when we
extract an integer, we can validate that we don't overflow the buffer
passed by the caller (e.g. ask to extract a 4-byte integer but pass a
2-byte buffer).
- Change extract_integer to take an array_view
- Add overloads of extract_signed_integer and extract_unsigned_integer
that take array_views. Keep the existing versions so we don't
need to change all callers, but make them call the array_view
versions.
This shortens some places like:
result = extract_unsigned_integer (value_contents (result_val).data (),
TYPE_LENGTH (value_type (result_val)),
byte_order);
into
result = extract_unsigned_integer (value_contents (result_val), byte_order);
value_contents returns an array view that is of length
`TYPE_LENGTH (value_type (result_val))` already, so the length is
implicitly communicated through the array view.
Change-Id: Ic1c1f98c88d5c17a8486393af316f982604d6c95
Diffstat (limited to 'gdb/defs.h')
-rw-r--r-- | gdb/defs.h | 23 |
1 files changed, 20 insertions, 3 deletions
@@ -63,6 +63,7 @@ #include "gdbsupport/host-defs.h" #include "gdbsupport/enum-flags.h" +#include "gdbsupport/array-view.h" /* Scope types enumerator. List the types of scopes the compiler will accept. */ @@ -500,20 +501,36 @@ enum symbol_needs_kind /* In findvar.c. */ template<typename T, typename = RequireLongest<T>> -T extract_integer (const gdb_byte *addr, int len, enum bfd_endian byte_order); +T extract_integer (gdb::array_view<const gdb_byte>, enum bfd_endian byte_order); + +static inline LONGEST +extract_signed_integer (gdb::array_view<const gdb_byte> buf, + enum bfd_endian byte_order) +{ + return extract_integer<LONGEST> (buf, byte_order); +} static inline LONGEST extract_signed_integer (const gdb_byte *addr, int len, enum bfd_endian byte_order) { - return extract_integer<LONGEST> (addr, len, byte_order); + return extract_signed_integer (gdb::array_view<const gdb_byte> (addr, len), + byte_order); +} + +static inline ULONGEST +extract_unsigned_integer (gdb::array_view<const gdb_byte> buf, + enum bfd_endian byte_order) +{ + return extract_integer<ULONGEST> (buf, byte_order); } static inline ULONGEST extract_unsigned_integer (const gdb_byte *addr, int len, enum bfd_endian byte_order) { - return extract_integer<ULONGEST> (addr, len, byte_order); + return extract_unsigned_integer (gdb::array_view<const gdb_byte> (addr, len), + byte_order); } extern int extract_long_unsigned_integer (const gdb_byte *, int, |