[commit] Inline one find_proc_desc call, simplify

[commit] Inline one find_proc_desc call, simplify

[Andrew Cagney]

[-- Attachment #1: Type: text/plain, Size: 46 bytes --]

Just FYI (hope I got this one right),

Andrew

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 3458 bytes --]


	* mips-tdep.c (find_proc_desc): Inline call to find_proc_desc.
	Simplify as NEXT_FRAME is NULL.
	(find_proc_desc): Simplify as NEXT_FRAME is non-NULL.

Index: mips-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mips-tdep.c,v
retrieving revision 1.315
diff -p -u -r1.315 mips-tdep.c
--- mips-tdep.c	3 Sep 2004 22:18:17 -0000	1.315
+++ mips-tdep.c	3 Sep 2004 22:30:00 -0000
@@ -888,13 +888,45 @@ after_prologue (CORE_ADDR pc)
   mips_extra_func_info_t proc_desc;
   struct symtab_and_line sal;
   CORE_ADDR func_addr, func_end;
+  CORE_ADDR startaddr = 0;
+
+  /* Pass a NULL next_frame to heuristic_proc_desc.  We should not
+     attempt to read the stack pointer from the current machine state,
+     because the current machine state has nothing to do with the
+     information we need from the proc_desc; and the process may or
+     may not exist right now.  */
+  proc_desc = non_heuristic_proc_desc (pc, &startaddr);
+  if (proc_desc)
+    {
+      /* IF this is the topmost frame AND (this proc does not have
+	 debugging information OR the PC is in the procedure prologue)
+	 THEN create a "heuristic" proc_desc (by analyzing the actual
+	 code) to replace the "official" proc_desc.  */
+      struct symtab_and_line val;
+      struct symbol *proc_symbol =
+	PROC_DESC_IS_DUMMY (proc_desc) ? 0 : PROC_SYMBOL (proc_desc);
+
+      if (proc_symbol)
+	{
+	  val = find_pc_line (BLOCK_START
+			      (SYMBOL_BLOCK_VALUE (proc_symbol)), 0);
+	  val.pc = val.end ? val.end : pc;
+	}
+      if (!proc_symbol || pc < val.pc)
+	{
+	  mips_extra_func_info_t found_heuristic =
+	    heuristic_proc_desc (PROC_LOW_ADDR (proc_desc), pc, NULL);
+	  if (found_heuristic)
+	    proc_desc = found_heuristic;
+	}
+    }
+  else
+    {
+      if (startaddr == 0)
+	startaddr = heuristic_proc_start (pc);
 
-  /* Pass a NULL next_frame to find_proc_desc.  We should not attempt
-     to read the stack pointer from the current machine state, because
-     the current machine state has nothing to do with the information
-     we need from the proc_desc; and the process may or may not exist
-     right now.  */
-  proc_desc = find_proc_desc (pc, NULL);
+      proc_desc = heuristic_proc_desc (startaddr, pc, NULL);
+    }
 
   if (proc_desc)
     {
@@ -3115,38 +3147,7 @@ find_proc_desc (CORE_ADDR pc, struct fra
   CORE_ADDR startaddr = 0;
 
   proc_desc = non_heuristic_proc_desc (pc, &startaddr);
-
-  if (proc_desc)
-    {
-      /* IF this is the topmost frame AND
-       * (this proc does not have debugging information OR
-       * the PC is in the procedure prologue)
-       * THEN create a "heuristic" proc_desc (by analyzing
-       * the actual code) to replace the "official" proc_desc.
-       */
-      if (next_frame == NULL)
-	{
-	  struct symtab_and_line val;
-	  struct symbol *proc_symbol =
-	    PROC_DESC_IS_DUMMY (proc_desc) ? 0 : PROC_SYMBOL (proc_desc);
-
-	  if (proc_symbol)
-	    {
-	      val = find_pc_line (BLOCK_START
-				  (SYMBOL_BLOCK_VALUE (proc_symbol)), 0);
-	      val.pc = val.end ? val.end : pc;
-	    }
-	  if (!proc_symbol || pc < val.pc)
-	    {
-	      mips_extra_func_info_t found_heuristic =
-		heuristic_proc_desc (PROC_LOW_ADDR (proc_desc),
-				     pc, next_frame);
-	      if (found_heuristic)
-		proc_desc = found_heuristic;
-	    }
-	}
-    }
-  else
+  if (proc_desc == NULL)
     {
       if (startaddr == 0)
 	startaddr = heuristic_proc_start (pc);

Re: [commit] Inline one find_proc_desc call, simplify

[Joel Brobecker]

> Just FYI (hope I got this one right),

There is a little oopsie in the ChangeLog:

> 
> 	* mips-tdep.c (find_proc_desc): Inline call to find_proc_desc.
                       ^^^^^^^^^^^^^^ after_prologue
> 	Simplify as NEXT_FRAME is NULL.
> 	(find_proc_desc): Simplify as NEXT_FRAME is non-NULL.

I'll give the testsuite another spin. See what we get out of it.

-- 
Joel