From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5596 invoked by alias); 4 Aug 2004 17:48:19 -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 5589 invoked from network); 4 Aug 2004 17:48:18 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 4 Aug 2004 17:48:18 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i74HmDe1030781 for ; Wed, 4 Aug 2004 13:48:18 -0400 Received: from zenia.home.redhat.com (porkchop.devel.redhat.com [172.16.58.2]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i74HmCa31199; Wed, 4 Aug 2004 13:48:12 -0400 To: Kevin Buettner Cc: gdb-patches@sources.redhat.com Subject: Re: RFA: Change PowerPC E500 raw regcache layout References: <20040723162923.7d57d174@saguaro> From: Jim Blandy Date: Wed, 04 Aug 2004 17:48:00 -0000 In-Reply-To: <20040723162923.7d57d174@saguaro> Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2004-08/txt/msg00087.txt.bz2 Kevin Buettner writes: > Okay, except for the uses of ``gdb_assert (0)''. Please use > internal_error() for these instead. Committed, but I had forgotten this caveat. I've committed the below as a separate patch. As penance, I fixed the one I'd introduced in rs6000_store_return_value, too. 2004-08-04 Jim Blandy * ppc-linux-nat.c (fetch_register): Replace 'gdb_assert (0)' with a call to 'internal_error', with a more helpful error message. * rs6000-tdep.c (e500_pseudo_register_read, e500_pseudo_register_write, rs6000_store_return_value): Same. Index: gdb/ppc-linux-nat.c =================================================================== RCS file: /cvs/src/src/gdb/ppc-linux-nat.c,v retrieving revision 1.51 diff -c -p -r1.51 ppc-linux-nat.c *** gdb/ppc-linux-nat.c 4 Aug 2004 17:17:55 -0000 1.51 --- gdb/ppc-linux-nat.c 4 Aug 2004 17:32:37 -0000 *************** fetch_register (int tid, int regno) *** 399,405 **** regcache_raw_supply (current_regcache, regno, buf + padding); } else ! gdb_assert (0); } static void --- 399,407 ---- regcache_raw_supply (current_regcache, regno, buf + padding); } else ! internal_error (__FILE__, __LINE__, ! "fetch_register: unexpected byte order: %d", ! gdbarch_byte_order (current_gdbarch)); } static void Index: gdb/rs6000-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v retrieving revision 1.227 diff -c -p -r1.227 rs6000-tdep.c *** gdb/rs6000-tdep.c 4 Aug 2004 17:17:55 -0000 1.227 --- gdb/rs6000-tdep.c 4 Aug 2004 17:32:39 -0000 *************** e500_pseudo_register_read (struct gdbarc *** 1941,1948 **** && reg_nr < tdep->ppc_ev0_regnum + ppc_num_gprs) e500_move_ev_register (regcache_raw_read, regcache, reg_nr, buffer); else ! /* We should only be called on pseudo-registers. */ ! gdb_assert (0); } static void --- 1941,1950 ---- && reg_nr < tdep->ppc_ev0_regnum + ppc_num_gprs) e500_move_ev_register (regcache_raw_read, regcache, reg_nr, buffer); else ! internal_error (__FILE__, __LINE__, ! "e500_pseudo_register_read: " ! "called on unexpected register '%s' (%d)", ! gdbarch_register_name (gdbarch, reg_nr), reg_nr); } static void *************** e500_pseudo_register_write (struct gdbar *** 1960,1967 **** regcache_raw_write, regcache, reg_nr, (void *) buffer); else ! /* We should only be called on pseudo-registers. */ ! gdb_assert (0); } /* The E500 needs a custom reggroup function: it has anonymous raw --- 1962,1971 ---- regcache_raw_write, regcache, reg_nr, (void *) buffer); else ! internal_error (__FILE__, __LINE__, ! "e500_pseudo_register_read: " ! "called on unexpected register '%s' (%d)", ! gdbarch_register_name (gdbarch, reg_nr), reg_nr); } /* The E500 needs a custom reggroup function: it has anonymous raw *************** rs6000_store_return_value (struct type * *** 2095,2101 **** && TYPE_VECTOR (type)) regnum = tdep->ppc_vr0_regnum + 2; else ! gdb_assert (0); } else /* Everything else is returned in GPR3 and up. */ --- 2099,2107 ---- && TYPE_VECTOR (type)) regnum = tdep->ppc_vr0_regnum + 2; else ! internal_error (__FILE__, __LINE__, ! "rs6000_store_return_value: " ! "unexpected array return type"); } else /* Everything else is returned in GPR3 and up. */