From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id w0kyIC/g32maGxoAWB0awg (envelope-from ) for ; Wed, 15 Apr 2026 14:59:59 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZNcIX+Mn; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 476661E0BC; Wed, 15 Apr 2026 14:59:59 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 726AD1E0C3 for ; Wed, 15 Apr 2026 14:59:55 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 09C5D4BA2E35 for ; Wed, 15 Apr 2026 18:59:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09C5D4BA2E35 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZNcIX+Mn Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 983B14BA2E14 for ; Wed, 15 Apr 2026 18:59:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 983B14BA2E14 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 983B14BA2E14 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776279558; cv=none; b=uQKuyMSPzbwxMblQZitsf74AxYnr5kj7IV2MH5ysDDLxBV6m5ryoWDqHrf/p16CnzS43U37p5mT/P5GEZoHDWrfijd/4qCHcX+ec1ztHmB4gURZFgMMZ3eL8KPiDWe1cKzCqEJW2nqpwb0NRkYGC9JwGo2DQBoBMOBIivvvTin8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776279558; c=relaxed/simple; bh=bBfPAAZ1qiNuTSFHb8zcV/sAoPAweJIcawGH9NEToXc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=dx8TEduT54kMlxySZzKVu5qebVJvht1ltl8zMtioIl6pNnggXU/yyG36a6SiZ9XZaCirF1XiHJPg6z6pEwi0hoffVGnhq+lfDV/ktxgHAkMudQUrqqB0CFJclmBvM2t+9ruDhZud6285zTRrweMsooDMxRPInoFNxEy6cpGGjmE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 983B14BA2E14 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776279558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gl5vzuk6wlC41PrvrrrchBheNMaic9g7dtPt03H/BCk=; b=ZNcIX+MnIySgUEOI3oUfGwtMmGY5wjOa4m5cw2/WV4yuXe+lxzZpTH0Pl7t9mbaj7qb9oI ePmsoqXnS0Jl/ALVUvdWnl0PZnvT6epUn20jZQCqYj+dwGH+3/s15RVMIAMrRRvmu0q0QX 9RhDarchuj+wQ85r/XTN8xOw+1YJPjo= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-668-G7GmlPjRPcyFqk5zrQDZSg-1; Wed, 15 Apr 2026 14:59:16 -0400 X-MC-Unique: G7GmlPjRPcyFqk5zrQDZSg-1 X-Mimecast-MFC-AGG-ID: G7GmlPjRPcyFqk5zrQDZSg_1776279556 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DBEE61800451 for ; Wed, 15 Apr 2026 18:59:15 +0000 (UTC) Received: from fedora.tailb97d54.ts.net (unknown [10.96.134.153]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E27D830001A4; Wed, 15 Apr 2026 18:59:14 +0000 (UTC) From: Guinevere Larsen To: gdb-patches@sourceware.org Cc: Guinevere Larsen Subject: [PATCH 5/6] gdb/record: extract the PC to record_full_instruction Date: Wed, 15 Apr 2026 15:58:35 -0300 Message-ID: <20260415185836.2732968-6-guinevere@redhat.com> In-Reply-To: <20260415185836.2732968-1-guinevere@redhat.com> References: <20260415185836.2732968-1-guinevere@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: z3ApPz0pTa21DH9sZPlUN8hf1KWIN5_f2W5lfl8geBY_1776279556 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org This commit makes it so the PC is not saved as part of the record_full_instruction effects, but rather gets a special location. That is because a couple of commands would really benefit from it being easy to find the PC (especially ones from record-btrace that's haven't been implemented to record-full yet, such as the ones in PR record/18059), while also possibly allowing for one fewer resizing of the effect vector (and saving an entire byte in the process). This commit also refactored record_full_read_entry_from_bfd and record_full_write_entry_to_bfd, removing the parts specific to mem and reg entries, to avoid obscure code paths or writing the code to do the same thing again. --- gdb/record-full.c | 268 ++++++++++++++++++++++++++++------------------ 1 file changed, 165 insertions(+), 103 deletions(-) diff --git a/gdb/record-full.c b/gdb/record-full.c index c9e66fac578..297b5b76ae7 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -250,6 +250,16 @@ class record_full_entry gdb_assert (mem_type == record_full_mem); } + void set_entry (record_full_reg_entry reg) + { + entry = reg; + } + + void set_entry (record_full_mem_entry mem) + { + entry = mem; + } + record_full_reg_entry& reg () { gdb_assert (type () == record_full_reg); @@ -325,6 +335,7 @@ struct record_full_instruction uint32_t insn_num; std::optional sigval; std::vector effects; + record_full_reg_entry pc; /* Execute the full instruction. As a side effect, set record_full_stop_reason. */ @@ -684,7 +695,10 @@ record_full_arch_list_add_reg (struct regcache *regcache, int regnum) regcache->cooked_read (regnum, rec.get_loc ()); - record_full_arch_list_add (rec); + if (regnum == gdbarch_pc_regnum (regcache->arch ())) + record_full_incomplete_instruction.pc = rec.reg (); + else + record_full_arch_list_add (rec); return 0; } @@ -841,6 +855,7 @@ static enum target_stop_reason record_full_stop_reason void record_full_instruction::exec_insn (regcache *regcache, gdbarch *gdbarch) { + pc.execute (regcache, gdbarch); for (auto &entry : effects) if (entry.execute (regcache, gdbarch)) record_full_stop_reason = TARGET_STOPPED_BY_WATCHPOINT; @@ -2184,13 +2199,73 @@ netorder32 (uint32_t input) return ret; } +static record_full_reg_entry +record_full_read_reg_from_bfd (bfd *cbfd, asection *osec, int *bfd_offset) +{ + uint32_t regnum; + regcache *cache = get_thread_regcache (inferior_thread ()); + + /* Get register number to regnum. */ + bfdcore_read (cbfd, osec, ®num, sizeof (regnum), + bfd_offset); + regnum = netorder32 (regnum); + + record_full_reg_entry reg (cache->arch (), regnum); + + /* Get val. */ + bfdcore_read (cbfd, osec, reg.get_loc (), + reg.len, bfd_offset); + + if (record_debug) + gdb_printf (gdb_stdlog, + " Reading register %d (1 " + "plus %lu plus %d bytes)\n", + reg.num, + (unsigned long) sizeof (regnum), + reg.len); + return reg; + +} + +static record_full_mem_entry +record_full_read_mem_from_bfd (bfd *cbfd, asection *osec, int *bfd_offset) +{ + uint32_t len; + uint64_t addr; + + /* Get len. */ + bfdcore_read (cbfd, osec, &len, sizeof (len), bfd_offset); + len = netorder32 (len); + + /* Get addr. */ + bfdcore_read (cbfd, osec, &addr, sizeof (addr), + bfd_offset); + addr = netorder64 (addr); + + record_full_mem_entry mem (addr, len); + + /* Get val. */ + bfdcore_read (cbfd, osec, mem.get_loc (), + len, bfd_offset); + + if (record_debug) + gdb_printf (gdb_stdlog, + " Reading memory %s (1 plus " + "%lu plus %lu plus %d bytes)\n", + paddress (get_current_arch (), + mem.addr), + (unsigned long) sizeof (addr), + (unsigned long) sizeof (len), + len); + + return mem; +} + static void record_full_read_entry_from_bfd (bfd *cbfd, asection *osec, int *bfd_offset) { uint8_t rectype; - uint32_t regnum, len; - uint64_t addr; - regcache *cache = get_thread_regcache (inferior_thread ()); + record_full_entry rec; bfdcore_read (cbfd, osec, &rectype, sizeof (rectype), bfd_offset); @@ -2198,57 +2273,13 @@ record_full_read_entry_from_bfd (bfd *cbfd, asection *osec, int *bfd_offset) { case record_full_reg: /* reg */ { - /* Get register number to regnum. */ - bfdcore_read (cbfd, osec, ®num, sizeof (regnum), - bfd_offset); - regnum = netorder32 (regnum); - - record_full_entry rec (record_full_reg, cache->arch (), regnum); - - /* Get val. */ - bfdcore_read (cbfd, osec, rec.get_loc (), - rec.reg ().len, bfd_offset); - - if (record_debug) - gdb_printf (gdb_stdlog, - " Reading register %d (1 " - "plus %lu plus %d bytes)\n", - rec.reg ().num, - (unsigned long) sizeof (regnum), - rec.reg ().len); - - record_full_arch_list_add (rec); + rec.set_entry (record_full_read_reg_from_bfd (cbfd, osec, bfd_offset)); break; } case record_full_mem: /* mem */ { - /* Get len. */ - bfdcore_read (cbfd, osec, &len, sizeof (len), bfd_offset); - len = netorder32 (len); - - /* Get addr. */ - bfdcore_read (cbfd, osec, &addr, sizeof (addr), - bfd_offset); - addr = netorder64 (addr); - - record_full_entry rec (record_full_mem, addr, len); - - /* Get val. */ - bfdcore_read (cbfd, osec, rec.get_loc (), - len, bfd_offset); - - if (record_debug) - gdb_printf (gdb_stdlog, - " Reading memory %s (1 plus " - "%lu plus %lu plus %d bytes)\n", - paddress (get_current_arch (), - rec.mem ().addr), - (unsigned long) sizeof (addr), - (unsigned long) sizeof (len), - len); - - record_full_arch_list_add (rec); + rec.set_entry (record_full_read_mem_from_bfd (cbfd, osec, bfd_offset)); break; } @@ -2259,6 +2290,7 @@ record_full_read_entry_from_bfd (bfd *cbfd, asection *osec, int *bfd_offset) bfd_get_filename (cbfd))); break; } + record_full_arch_list_add (rec); } /* Restore the execution log from core file CBFD. */ @@ -2323,6 +2355,9 @@ record_full_restore (struct bfd &cbfd) if (sigval != GDB_SIGNAL_0) record_full_incomplete_instruction.sigval = (gdb_signal) sigval; + record_full_incomplete_instruction.pc + = record_full_read_reg_from_bfd (&cbfd, osec, &bfd_offset); + eff_count = netorder32 (eff_count); /* This deals with all the side effects. */ @@ -2387,6 +2422,67 @@ cmd_record_full_restore (const char *args, int from_tty) record_full_open (nullptr, from_tty); } +static void +record_full_write_reg_to_bfd (record_full_reg_entry ®, + gdb_bfd_ref_ptr obfd, + asection *osec, int *bfd_offset, + gdbarch *gdbarch) +{ + uint32_t regnum; + + if (record_debug) + gdb_printf (gdb_stdlog, + " Writing register %d (1 " + "plus %lu plus %d bytes)\n", + reg.num, + (unsigned long) sizeof (regnum), + reg.len); + + /* Write regnum. */ + regnum = netorder32 (reg.num); + bfdcore_write (obfd.get (), osec, ®num, + sizeof (regnum), bfd_offset); + + /* Write regval. */ + bfdcore_write (obfd.get (), osec, + reg.get_loc (), + reg.len, bfd_offset); +} + +static void +record_full_write_mem_to_bfd (record_full_mem_entry &mem, + gdb_bfd_ref_ptr obfd, + asection *osec, int *bfd_offset, + gdbarch *gdbarch) +{ + uint32_t len; + uint64_t addr; + + if (record_debug) + gdb_printf (gdb_stdlog, + " Writing memory %s (1 plus " + "%lu plus %lu plus %d bytes)\n", + paddress (gdbarch, mem.addr), + (unsigned long) sizeof (addr), + (unsigned long) sizeof (len), + mem.len); + + /* Write memlen. */ + len = netorder32 (mem.len); + bfdcore_write (obfd.get (), osec, &len, sizeof (len), + bfd_offset); + + /* Write memaddr. */ + addr = netorder64 (mem.addr); + bfdcore_write (obfd.get (), osec, &addr, + sizeof (addr), bfd_offset); + + /* Write memval. */ + bfdcore_write (obfd.get (), osec, + mem.get_loc (), + mem.len, bfd_offset); +} + static void record_full_write_entry_to_bfd (record_full_entry &entry, gdb_bfd_ref_ptr obfd, @@ -2395,8 +2491,6 @@ record_full_write_entry_to_bfd (record_full_entry &entry, { /* Save entry. */ uint8_t type; - uint32_t regnum, len; - uint64_t addr; type = entry.type (); bfdcore_write (obfd.get (), osec, &type, sizeof (type), bfd_offset); @@ -2404,56 +2498,14 @@ record_full_write_entry_to_bfd (record_full_entry &entry, switch (type) { case record_full_reg: /* reg */ - { - auto reg = entry.reg (); - if (record_debug) - gdb_printf (gdb_stdlog, - " Writing register %d (1 " - "plus %lu plus %d bytes)\n", - reg.num, - (unsigned long) sizeof (regnum), - reg.len); - - /* Write regnum. */ - regnum = netorder32 (reg.num); - bfdcore_write (obfd.get (), osec, ®num, - sizeof (regnum), bfd_offset); - - /* Write regval. */ - bfdcore_write (obfd.get (), osec, - entry.get_loc (), - reg.len, bfd_offset); - break; - } + record_full_write_reg_to_bfd (entry.reg (), obfd, osec, + bfd_offset, gdbarch); + break; case record_full_mem: /* mem */ - { - auto mem = entry.mem (); - if (record_debug) - gdb_printf (gdb_stdlog, - " Writing memory %s (1 plus " - "%lu plus %lu plus %d bytes)\n", - paddress (gdbarch, mem.addr), - (unsigned long) sizeof (addr), - (unsigned long) sizeof (len), - mem.len); - - /* Write memlen. */ - len = netorder32 (mem.len); - bfdcore_write (obfd.get (), osec, &len, sizeof (len), - bfd_offset); - - /* Write memaddr. */ - addr = netorder64 (mem.addr); - bfdcore_write (obfd.get (), osec, &addr, - sizeof (addr), bfd_offset); - - /* Write memval. */ - bfdcore_write (obfd.get (), osec, - entry.get_loc (), - mem.len, bfd_offset); - break; - } + record_full_write_mem_to_bfd (entry.mem (), obfd, osec, + bfd_offset, gdbarch); + break; } } @@ -2499,6 +2551,7 @@ record_full_base_target::save_record (const char *recfilename) { /* Number of effects of an instruction. */ save_size += sizeof (uint32_t) + sizeof (uint8_t) + sizeof (uint32_t); + save_size += 4 + record_full_list[i].pc.len; for (auto &entry : record_full_list[i].effects) switch (entry.type ()) { @@ -2557,6 +2610,9 @@ record_full_base_target::save_record (const char *recfilename) bfdcore_write (obfd.get (), osec, &insn_num, sizeof (uint32_t), &bfd_offset); + record_full_write_reg_to_bfd (record_full_list[i].pc, obfd, osec, + &bfd_offset, gdbarch); + for (auto &entry : record_full_list[i].effects) { record_full_write_entry_to_bfd (entry, obfd, osec, &bfd_offset, @@ -2639,6 +2695,9 @@ maintenance_print_record_instruction (const char *args, int from_tty) auto to_print = record_full_list.begin () + offset; gdbarch *arch = current_inferior ()->arch (); + struct value_print_options opts; + get_user_print_options (&opts); + opts.raw = true; for (auto entry : to_print->effects) { @@ -2652,9 +2711,6 @@ maintenance_print_record_instruction (const char *args, int from_tty) entry.get_loc ()); gdb_printf ("Register %s changed: ", gdbarch_register_name (arch, entry.reg ().num)); - struct value_print_options opts; - get_user_print_options (&opts); - opts.raw = true; value_print (val, gdb_stdout, &opts); gdb_printf ("\n"); break; @@ -2673,6 +2729,12 @@ maintenance_print_record_instruction (const char *args, int from_tty) } } } + type *regtype = gdbarch_register_type (arch, to_print->pc.num); + value *val = value_from_contents (regtype, to_print->pc.get_loc ()); + gdb_printf ("Register %s changed: ", + gdbarch_register_name (arch, to_print->pc.num)); + value_print (val, gdb_stdout, &opts); + gdb_printf ("\n"); } INIT_GDB_FILE (record_full) -- 2.53.0