From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12077 invoked by alias); 31 Jan 2003 03:55:53 -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 12070 invoked from network); 31 Jan 2003 03:55:53 -0000 Received: from unknown (HELO external1.doc.com) (63.119.183.65) by 172.16.49.205 with SMTP; 31 Jan 2003 03:55:53 -0000 Received: (qmail 18093 invoked from network); 31 Jan 2003 03:55:18 -0000 Received: from cpe-24-221-209-215.co.sprintbbd.net (HELO doc.com) (24.221.209.215) by external1 with SMTP; 31 Jan 2003 03:55:18 -0000 Message-ID: <3E39F3C4.4090802@doc.com> Date: Fri, 31 Jan 2003 03:55:00 -0000 From: Adam Fedor User-Agent: Mozilla/5.0 (X11; U; Linux ppc; en-US; rv:1.1) Gecko/20020905 X-Accept-Language: en-us, en MIME-Version: 1.0 To: GDB Patches Subject: [RFC]: Minor clean up of variable names in infrun.c Content-Type: multipart/mixed; boundary="------------030905000003040705090804" X-SW-Source: 2003-01/txt/msg00830.txt.bz2 This is a multi-part message in MIME format. --------------030905000003040705090804 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 164 I renamed this variable to be a little more meaningful and did a little clean up. This is a pre-requisite for my previous (updated) infrun.c/Objective-C patch. --------------030905000003040705090804 Content-Type: text/plain; name="objc20b.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="objc20b.patch" Content-length: 2519 2003-01-30 Adam Fedor * infrun.c (handle_inferior_event): Rename 'tmp' to real_stop_pc. Remove duplicate/shadowing variable of same name. Index: infrun.c =================================================================== RCS file: /cvs/src/src/gdb/infrun.c,v retrieving revision 1.95 diff -u -p -r1.95 infrun.c --- infrun.c 19 Jan 2003 17:39:16 -0000 1.95 +++ infrun.c 31 Jan 2003 03:40:37 -0000 @@ -1172,7 +1173,7 @@ context_switch (struct execution_control void handle_inferior_event (struct execution_control_state *ecs) { - CORE_ADDR tmp; + CORE_ADDR real_stop_pc; int stepped_after_stopped_by_watchpoint; int sw_single_step_trap_p = 0; @@ -2407,19 +2408,19 @@ process_event_stop_test: function. That's what tells us (a) whether we want to step into it at all, and (b) what prologue we want to run to the end of, if we do step into it. */ - tmp = SKIP_TRAMPOLINE_CODE (stop_pc); - if (tmp != 0) - ecs->stop_func_start = tmp; + real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc); + if (real_stop_pc != 0) + ecs->stop_func_start = real_stop_pc; else { - tmp = DYNAMIC_TRAMPOLINE_NEXTPC (stop_pc); - if (tmp) + real_stop_pc = DYNAMIC_TRAMPOLINE_NEXTPC (stop_pc); + if (real_stop_pc) { struct symtab_and_line xxx; /* Why isn't this s_a_l called "sr_sal", like all of the other s_a_l's where this code is duplicated? */ init_sal (&xxx); /* initialize to zeroes */ - xxx.pc = tmp; + xxx.pc = real_stop_pc; xxx.section = find_pc_overlay (xxx.pc); check_for_old_step_resume_breakpoint (); step_resume_breakpoint = @@ -2482,19 +2509,17 @@ process_event_stop_test: we want to proceed through the trampoline when stepping. */ if (IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name)) { - CORE_ADDR tmp; - /* Determine where this trampoline returns. */ - tmp = SKIP_TRAMPOLINE_CODE (stop_pc); + real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc); /* Only proceed through if we know where it's going. */ - if (tmp) + if (real_stop_pc) { /* And put the step-breakpoint there and go until there. */ struct symtab_and_line sr_sal; init_sal (&sr_sal); /* initialize to zeroes */ - sr_sal.pc = tmp; + sr_sal.pc = real_stop_pc; sr_sal.section = find_pc_overlay (sr_sal.pc); /* Do not specify what the fp should be when we stop since on some machines the prologue --------------030905000003040705090804--