From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12722 invoked by alias); 8 May 2004 04:03:00 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 12709 invoked from network); 8 May 2004 04:02:58 -0000 Received: from unknown (HELO pippin.tausq.org) (64.81.244.94) by sourceware.org with SMTP; 8 May 2004 04:02:58 -0000 Received: by pippin.tausq.org (Postfix, from userid 1000) id 40FF5CD29F; Fri, 7 May 2004 21:02:58 -0700 (PDT) Date: Sat, 08 May 2004 04:03:00 -0000 From: Randolph Chung To: gdb-patches@sources.redhat.com Subject: [committed] Use frame memory for code reading Message-ID: <20040508040258.GO3965@tausq.org> Reply-To: Randolph Chung Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-GPG: for GPG key, see http://www.tausq.org/gpg.txt User-Agent: Mutt/1.5.5.1+cvs20040105i X-SW-Source: 2004-05/txt/msg00237.txt.bz2 Ignore breakpoints when doing code reading during unwind, as suggested by Andrew. commited. thanks -randolph 2004-05-07 Randolph Chung * hppa-tdep.c (skip_prologue_hard_way, hppa_frame_cache): Use read_memory_nobpt for code reading when doing frame unwinding. * hppa-linux-tdep.c (insns_match_pattern): Likewise. Index: hppa-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/hppa-tdep.c,v retrieving revision 1.155 diff -u -p -r1.155 hppa-tdep.c --- hppa-tdep.c 8 May 2004 03:17:57 -0000 1.155 +++ hppa-tdep.c 8 May 2004 03:53:22 -0000 @@ -1329,7 +1364,7 @@ restart: old_save_sp = save_sp; old_stack_remaining = stack_remaining; - status = target_read_memory (pc, buf, 4); + status = read_memory_nobpt (pc, buf, 4); inst = extract_unsigned_integer (buf, 4); /* Yow! */ @@ -1378,7 +1413,7 @@ restart: while (reg_num >= (TARGET_PTR_BIT == 64 ? 19 : 23) && reg_num <= 26) { pc += 4; - status = target_read_memory (pc, buf, 4); + status = read_memory_nobpt (pc, buf, 4); inst = extract_unsigned_integer (buf, 4); if (status != 0) return pc; @@ -1391,7 +1426,7 @@ restart: reg_num = inst_saves_fr (inst); save_fr &= ~(1 << reg_num); - status = target_read_memory (pc + 4, buf, 4); + status = read_memory_nobpt (pc + 4, buf, 4); next_inst = extract_unsigned_integer (buf, 4); /* Yow! */ @@ -1418,13 +1453,13 @@ restart: while (reg_num >= 4 && reg_num <= (TARGET_PTR_BIT == 64 ? 11 : 7)) { pc += 8; - status = target_read_memory (pc, buf, 4); + status = read_memory_nobpt (pc, buf, 4); inst = extract_unsigned_integer (buf, 4); if (status != 0) return pc; if ((inst & 0xfc000000) != 0x34000000) break; - status = target_read_memory (pc + 4, buf, 4); + status = read_memory_nobpt (pc + 4, buf, 4); next_inst = extract_unsigned_integer (buf, 4); if (status != 0) return pc; @@ -1649,7 +1686,7 @@ hppa_frame_cache (struct frame_info *nex { int reg; char buf4[4]; - long status = target_read_memory (pc, buf4, sizeof buf4); + long status = read_memory_nobpt (pc, buf4, sizeof buf4); long inst = extract_unsigned_integer (buf4, sizeof buf4); /* Note the interesting effects of this instruction. */ Index: hppa-linux-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/hppa-linux-tdep.c,v retrieving revision 1.3 diff -u -p -r1.3 hppa-linux-tdep.c --- hppa-linux-tdep.c 8 May 2004 03:17:57 -0000 1.3 +++ hppa-linux-tdep.c 8 May 2004 03:53:23 -0000 @@ -146,7 +148,10 @@ insns_match_pattern (CORE_ADDR pc, for (i = 0; pattern[i].mask; i++) { - insn[i] = read_memory_unsigned_integer (npc, 4); + char buf[4]; + + read_memory_nobpt (npc, buf, 4); + insn[i] = extract_unsigned_integer (buf, 4); if ((insn[i] & pattern[i].mask) == pattern[i].data) npc += 4; else -- Randolph Chung Debian GNU/Linux Developer, hppa/ia64 ports http://www.tausq.org/