From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14515 invoked by alias); 15 Jan 2008 05:07:36 -0000 Received: (qmail 14349 invoked by uid 22791); 15 Jan 2008 05:07:33 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate1.de.ibm.com (HELO mtagate1.de.ibm.com) (195.212.29.150) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 15 Jan 2008 05:07:08 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate1.de.ibm.com (8.13.8/8.13.8) with ESMTP id m0F576Sa080266 for ; Tue, 15 Jan 2008 05:07:06 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v8.7) with ESMTP id m0F575XN2486520 for ; Tue, 15 Jan 2008 06:07:05 +0100 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m0F5757o005797 for ; Tue, 15 Jan 2008 06:07:05 +0100 Received: from bbkeks.de.ibm.com (dyn-9-152-248-46.boeblingen.de.ibm.com [9.152.248.46]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id m0F574dM005791 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 15 Jan 2008 06:07:05 +0100 Message-ID: <478C3F09.7090106@de.ibm.com> Date: Tue, 15 Jan 2008 05:07:00 -0000 From: Markus Deuling User-Agent: Thunderbird 2.0.0.9 (X11/20071031) MIME-Version: 1.0 To: Ulrich Weigand CC: GDB Patches Subject: Re: [patch] Remove all current_gdbarch's in mn10300 References: <200801141409.m0EE9W2l017003@d12av02.megacenter.de.ibm.com> In-Reply-To: <200801141409.m0EE9W2l017003@d12av02.megacenter.de.ibm.com> Content-Type: multipart/mixed; boundary="------------090805000402050907050804" Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-01/txt/msg00342.txt.bz2 This is a multi-part message in MIME format. --------------090805000402050907050804 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1063 Ulrich Weigand schrieb: > Markus Deuling wrote: > >> @@ -604,7 +606,7 @@ mn10300_analyze_prologue (struct frame_i > >> - if (AM33_MODE == 2) >> + if (AM33_MODE (get_frame_arch (fi))== 2) > > This is incorrect, as mn10300_analyze_prologue may be called > with a NULL fi value (from mn10300_skip_prologue). I guess > the right way would be to allow the caller to pass an explicit > gdbarch ... > Hi Uli, thank you for review. I attached a new version of the patch. Tested by building mn10300 target (--enable-targets=all). Ok to commit ? ChangeLog: * mn10300-tdep.h (AM33_MODE): Add gdbarch as parameter. * mn10300-tdep.c (set_reg_offsets, mn10300_analyze_prologue): Use get_frame_arch to get at the current_architecture. Update AM33_MODE call. (mn10300_analyze_prologue): Add gdbarch as parameter. Update caller. (mn10300_frame_unwind_cache): Use get_frame_arch to get at the current architecture. (set_reg_offsets, mn10300_analyze_prologue): Fix indentation. -- Markus Deuling GNU Toolchain for Linux on Cell BE deuling@de.ibm.com --------------090805000402050907050804 Content-Type: text/plain; name="diff-mn10300" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diff-mn10300" Content-length: 4104 diff -urpN src/gdb/mn10300-tdep.c dev/gdb/mn10300-tdep.c --- src/gdb/mn10300-tdep.c 2008-01-11 15:42:53.000000000 +0100 +++ dev/gdb/mn10300-tdep.c 2008-01-15 06:02:31.000000000 +0100 @@ -307,6 +307,7 @@ set_reg_offsets (struct frame_info *fi, int stack_extra_size, int frame_in_fp) { + struct gdbarch *gdbarch; struct trad_frame_cache *cache; int offset = 0; CORE_ADDR base; @@ -317,6 +318,7 @@ set_reg_offsets (struct frame_info *fi, cache = mn10300_frame_unwind_cache (fi, this_cache); if (cache == NULL) return; + gdbarch = get_frame_arch (fi); if (frame_in_fp) { @@ -324,12 +326,13 @@ set_reg_offsets (struct frame_info *fi, } else { - base = frame_unwind_register_unsigned (fi, E_SP_REGNUM) + stack_extra_size; + base = frame_unwind_register_unsigned (fi, E_SP_REGNUM) + + stack_extra_size; } trad_frame_set_this_base (cache, base); - if (AM33_MODE == 2) + if (AM33_MODE (gdbarch)== 2) { /* If bit N is set in fpregmask, fsN is saved on the stack. The floating point registers are saved in ascending order. @@ -342,7 +345,8 @@ set_reg_offsets (struct frame_info *fi, { if (fpregmask & (1 << i)) { - trad_frame_set_reg_addr (cache, E_FS0_REGNUM + i, base + offset); + trad_frame_set_reg_addr (cache, E_FS0_REGNUM + i, + base + offset); offset += 4; } } @@ -385,7 +389,7 @@ set_reg_offsets (struct frame_info *fi, trad_frame_set_reg_addr (cache, E_D2_REGNUM, base + offset); offset += 4; } - if (AM33_MODE) + if (AM33_MODE (gdbarch)) { if (movm_args & movm_exother_bit) { @@ -515,7 +519,7 @@ set_reg_offsets (struct frame_info *fi, frame chain to not bother trying to unwind past this frame. */ static CORE_ADDR -mn10300_analyze_prologue (struct frame_info *fi, +mn10300_analyze_prologue (struct gdbarch *gdbarch, struct frame_info *fi, void **this_cache, CORE_ADDR pc) { @@ -604,7 +608,7 @@ mn10300_analyze_prologue (struct frame_i goto finish_prologue; } - if (AM33_MODE == 2) + if (AM33_MODE (gdbarch)== 2) { /* Determine if any floating point registers are to be saved. Look for one of the following three prologue formats: @@ -818,7 +822,8 @@ mn10300_analyze_prologue (struct frame_i finish_prologue: /* Note if/where callee saved registers were saved. */ if (fi) - set_reg_offsets (fi, this_cache, movm_args, fpregmask, stack_extra_size, frame_in_fp); + set_reg_offsets (fi, this_cache, movm_args, fpregmask, stack_extra_size, + frame_in_fp); return addr; } @@ -828,7 +833,7 @@ mn10300_analyze_prologue (struct frame_i static CORE_ADDR mn10300_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) { - return mn10300_analyze_prologue (NULL, NULL, pc); + return mn10300_analyze_prologue (gdbarch, NULL, NULL, pc); } /* Simple frame_unwind_cache. @@ -837,6 +842,7 @@ struct trad_frame_cache * mn10300_frame_unwind_cache (struct frame_info *next_frame, void **this_prologue_cache) { + struct gdbarch *gdbarch; struct trad_frame_cache *cache; CORE_ADDR pc, start, end; void *cache_p; @@ -844,9 +850,10 @@ mn10300_frame_unwind_cache (struct frame if (*this_prologue_cache) return (*this_prologue_cache); + gdbarch = get_frame_arch (next_frame); cache_p = trad_frame_cache_zalloc (next_frame); - pc = gdbarch_unwind_pc (get_frame_arch (next_frame), next_frame); - mn10300_analyze_prologue (next_frame, &cache_p, pc); + pc = gdbarch_unwind_pc (gdbarch, next_frame); + mn10300_analyze_prologue (gdbarch, next_frame, &cache_p, pc); cache = cache_p; if (find_pc_partial_function (pc, NULL, &start, &end)) diff -urpN src/gdb/mn10300-tdep.h dev/gdb/mn10300-tdep.h --- src/gdb/mn10300-tdep.h 2008-01-01 23:53:12.000000000 +0100 +++ dev/gdb/mn10300-tdep.h 2008-01-15 05:53:58.000000000 +0100 @@ -77,4 +77,4 @@ struct gdbarch_tdep int am33_mode; }; -#define AM33_MODE (gdbarch_tdep (current_gdbarch)->am33_mode) +#define AM33_MODE(gdbarch) (gdbarch_tdep (gdbarch)->am33_mode) --------------090805000402050907050804--