Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

internal_error: remove need to pass __FILE__/__LINE__

Browse Source 
Currently, every internal_error call must be passed __FILE__/__LINE__
explicitly, like:

  internal_error (__FILE__, __LINE__, "foo %d", var);

The need to pass in explicit __FILE__/__LINE__ is there probably
because the function predates widespread and portable variadic macros
availability.  We can use variadic macros nowadays, and in fact, we
already use them in several places, including the related
gdb_assert_not_reached.

So this patch renames the internal_error function to something else,
and then reimplements internal_error as a variadic macro that expands
__FILE__/__LINE__ itself.

The result is that we now should call internal_error like so:

  internal_error ("foo %d", var);

Likewise for internal_warning.

The patch adjusts all calls sites.  99% of the adjustments were done
with a perl/sed script.

The non-mechanical changes are in gdbsupport/errors.h,
gdbsupport/gdb_assert.h, and gdb/gdbarch.py.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
Change-Id: Ia6f372c11550ca876829e8fd85048f4502bdcf06
This commit is contained in:
Pedro Alves
2022-10-17 17:12:20 +01:00
parent 5c831a3c7f
commit f34652de0b
152 changed files with 467 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
gdbserver/tracepoint.cc
View File

@@ -2921,8 +2921,7 @@ get_jump_space_head (void)
if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_jump_pad_buffer,
&gdb_jump_pad_head))
{
internal_error (__FILE__, __LINE__,
"error extracting jump_pad_buffer");
internal_error ("error extracting jump_pad_buffer");
}
}
@@ -2954,15 +2953,13 @@ claim_trampoline_space (ULONGEST used, CORE_ADDR *trampoline)
if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_trampoline_buffer,
&trampoline_buffer_tail))
{
internal_error (__FILE__, __LINE__,
"error extracting trampoline_buffer");
internal_error ("error extracting trampoline_buffer");
}
if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_trampoline_buffer_end,
&trampoline_buffer_head))
{
internal_error (__FILE__, __LINE__,
"error extracting trampoline_buffer_end");
internal_error ("error extracting trampoline_buffer_end");
}
}
@@ -2997,8 +2994,7 @@ have_fast_tracepoint_trampoline_buffer (char *buf)
if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_trampoline_buffer_end,
&trampoline_end))
{
internal_error (__FILE__, __LINE__,
"error extracting trampoline_buffer_end");
internal_error ("error extracting trampoline_buffer_end");
}
if (buf)
@@ -3008,8 +3004,7 @@ have_fast_tracepoint_trampoline_buffer (char *buf)
if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_trampoline_buffer_error,
&errbuf))
{
internal_error (__FILE__, __LINE__,
"error extracting errbuf");
internal_error ("error extracting errbuf");
}
read_inferior_memory (errbuf, (unsigned char *) buf, 100);
@@ -3173,7 +3168,7 @@ install_tracepoint (struct tracepoint *tpoint, char *own_buf)
}
else
internal_error (__FILE__, __LINE__, "Unknown tracepoint type");
internal_error ("Unknown tracepoint type");
if (tpoint->handle == NULL)
{
@@ -3362,22 +3357,19 @@ cmd_qtstart (char *packet)
{
if (write_inferior_integer (ipa_sym_addrs.addr_tracing, 1))
{
internal_error (__FILE__, __LINE__,
"Error setting tracing variable in lib");
internal_error ("Error setting tracing variable in lib");
}
if (write_inferior_data_pointer (ipa_sym_addrs.addr_stopping_tracepoint,
0))
{
internal_error (__FILE__, __LINE__,
"Error clearing stopping_tracepoint variable"
internal_error ("Error clearing stopping_tracepoint variable"
" in lib");
}
if (write_inferior_integer (ipa_sym_addrs.addr_trace_buffer_is_full, 0))
{
internal_error (__FILE__, __LINE__,
"Error clearing trace_buffer_is_full variable"
internal_error ("Error clearing trace_buffer_is_full variable"
" in lib");
}
@@ -3429,8 +3421,7 @@ stop_tracing (void)
{
if (write_inferior_integer (ipa_sym_addrs.addr_tracing, 0))
{
internal_error (__FILE__, __LINE__,
"Error clearing tracing variable in lib");
internal_error ("Error clearing tracing variable in lib");
}
}
@@ -5599,27 +5590,23 @@ fast_tracepoint_collecting (CORE_ADDR thread_area,
if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_jump_pad_buffer,
&ipa_gdb_jump_pad_buffer))
{
internal_error (__FILE__, __LINE__,
"error extracting `gdb_jump_pad_buffer'");
internal_error ("error extracting `gdb_jump_pad_buffer'");
}
if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_jump_pad_buffer_end,
&ipa_gdb_jump_pad_buffer_end))
{
internal_error (__FILE__, __LINE__,
"error extracting `gdb_jump_pad_buffer_end'");
internal_error ("error extracting `gdb_jump_pad_buffer_end'");
}
if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_trampoline_buffer,
&ipa_gdb_trampoline_buffer))
{
internal_error (__FILE__, __LINE__,
"error extracting `gdb_trampoline_buffer'");
internal_error ("error extracting `gdb_trampoline_buffer'");
}
if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_trampoline_buffer_end,
&ipa_gdb_trampoline_buffer_end))
{
internal_error (__FILE__, __LINE__,
"error extracting `gdb_trampoline_buffer_end'");
internal_error ("error extracting `gdb_trampoline_buffer_end'");
}
if (ipa_gdb_jump_pad_buffer <= stop_pc
@@ -5978,8 +5965,7 @@ target_malloc (ULONGEST size)
if (read_inferior_data_pointer (ipa_sym_addrs.addr_gdb_tp_heap_buffer,
&target_tp_heap))
{
internal_error (__FILE__, __LINE__,
"couldn't get target heap head pointer");
internal_error ("couldn't get target heap head pointer");
}
}
@@ -6205,8 +6191,7 @@ download_tracepoint (struct tracepoint *tpoint)
+ offsetof (struct tracepoint, next),
&tp_prev_target_next_addr))
{
internal_error (__FILE__, __LINE__,
"error reading `tp_prev->next'");
internal_error ("error reading `tp_prev->next'");
}
/* tpoint->next = tp_prev->next */
@@ -6458,8 +6443,7 @@ upload_fast_traceframes (void)
if (ipa_tframe.tpnum == 0)
{
internal_error (__FILE__, __LINE__,
"Uploading: No (more) fast traceframes, but"
internal_error ("Uploading: No (more) fast traceframes, but"
" ipa_traceframe_count == %u??\n",
ipa_traceframe_write_count
- ipa_traceframe_read_count);