[PATCH 2/6] gdb/record: remove record_full_insn_num

Guinevere Larsen
2026-04-15T19:00:04Z

Now that record_full_list uses a deque, we don't need a variable to
track the amount of items recorded, so it is just dropped.
---
gdb/record-full.c | 41 ++++++++++++-----------------------------
1 file changed, 12 insertions(+), 29 deletions(-)

diff --git a/gdb/record-full.c b/gdb/record-full.c
index c9757464bb9..95776679f21 100644
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -190,8 +190,6 @@ static bool record_full_stop_at_limit = true;
/* Maximum allowed number of insns in execution log. */
static unsigned int record_full_insn_max_num
= DEFAULT_RECORD_FULL_INSN_MAX_NUM;
-/* Actual count of insns presently in execution log. */
-static unsigned int record_full_insn_num = 0;
/* Count of insns logged so far (may be larger
than count of insns presently in execution log). */
static ULONGEST record_full_insn_count;
@@ -460,7 +458,6 @@ record_full_entry_cleanup (struct record_full_entry rec)
static void
record_full_reset_history ()
{
- record_full_insn_num = 0;
record_full_insn_count = 0;
record_full_next_insn = 0;

@@ -498,9 +495,7 @@ record_full_save_instruction ()
}

/* Delete the first instruction from the beginning of the log, to make
- room for adding a new instruction at the end of the log.
-
- Note -- this function does not modify record_full_insn_num. */
+ room for adding a new instruction at the end of the log. */

static void
record_full_list_release_first (void)
@@ -600,7 +595,7 @@ record_full_arch_list_add_mem (CORE_ADDR addr, int len)
static void
record_full_check_insn_num (void)
{
- if (record_full_insn_num == record_full_insn_max_num)
+ if (record_full_list.size () == record_full_insn_max_num)
{
/* Ask user what to do. */
if (record_full_stop_at_limit)
@@ -682,10 +677,8 @@ record_full_message (struct regcache *regcache, enum gdb_signal signal)

record_full_save_instruction ();

- if (record_full_insn_num == record_full_insn_max_num)
+ if (record_full_list.size () == record_full_insn_max_num)
record_full_list_release_first ();
- else
- record_full_insn_num++;
}

static bool
@@ -1449,10 +1442,8 @@ record_full_registers_change (struct regcache *regcache, int regnum)
}
record_full_save_instruction ();

- if (record_full_insn_num == record_full_insn_max_num)
+ if (record_full_list.size () == record_full_insn_max_num)
record_full_list_release_first ();
- else
- record_full_insn_num++;
}

/* "store_registers" method for process record target. */
@@ -1553,10 +1544,8 @@ record_full_target::xfer_partial (enum target_object object,
}
record_full_save_instruction ();

- if (record_full_insn_num == record_full_insn_max_num)
+ if (record_full_list.size () == record_full_insn_max_num)
record_full_list_release_first ();
- else
- record_full_insn_num++;
}

return this->beneath ()->xfer_partial (object, annex, readbuf, writebuf,
@@ -1791,8 +1780,8 @@ record_full_base_target::info_record ()
pulongest (record_full_insn_count));

/* Display log count. */
- gdb_printf (_("Log contains %u instructions.\n"),
- record_full_insn_num);
+ gdb_printf (_("Log contains %lu instructions.\n"),
+ (unsigned long int) record_full_list.size ());
}
else
gdb_printf (_("No instructions have been logged.\n"));
@@ -2276,8 +2265,6 @@ record_full_restore (struct bfd &cbfd)
"RECORD_FULL_FILE_MAGIC (0x%s)\n",
phex_nz (netorder32 (magic), 4));

- record_full_insn_num = 0;
-
try
{

@@ -2321,9 +2308,9 @@ record_full_restore (struct bfd &cbfd)
}

/* Update record_full_insn_max_num. */
- if (record_full_insn_num > record_full_insn_max_num)
+ if (record_full_list.size () > record_full_insn_max_num)
{
- record_full_insn_max_num = record_full_insn_num;
+ record_full_insn_max_num = record_full_list.size ();
warning (_("Auto increase record/replay buffer limit to %u."),
record_full_insn_max_num);
}
@@ -2584,14 +2571,10 @@ static void
set_record_full_insn_max_num (const char *args, int from_tty,
struct cmd_list_element *c)
{
- if (record_full_insn_num > record_full_insn_max_num)
+ if (record_full_list.size () > record_full_insn_max_num)
{
- /* Count down record_full_insn_num while releasing records from list. */
- while (record_full_insn_num > record_full_insn_max_num)
- {
- record_full_list_release_first ();
- record_full_insn_num--;
- }
+ while (record_full_list.size () > record_full_insn_max_num)
+ record_full_list_release_first ();
}
}

--
2.53.0