From: Daniel Jacobowitz <drow@false.org>
Date: Thu, 9 Oct 2003 14:26:14 +0000 (+0000)
Subject: 	Merge from mainline:
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec0767fddb6a5c2ef19ba81c4edf0ed1ccf28ff9;p=thirdparty%2Fbinutils-gdb.git

	Merge from mainline:
	2003-07-31  Daniel Jacobowitz  <drow@mvista.com>

	* dwarf2read.c (new_symbol): Use var_decode_location for parameters.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1d3d60b1aad..a52f1b4df30 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-09  Daniel Jacobowitz  <drow@mvista.com>
+
+	Merge from mainline:
+	2003-07-31  Daniel Jacobowitz  <drow@mvista.com>
+
+	* dwarf2read.c (new_symbol): Use var_decode_location for parameters.
+
 2003-10-09  Daniel Jacobowitz  <drow@mvista.com>
 
 	* dwarf2expr.c (execute_stack_op): Don't treat the frame base as
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 115d8db9645..da31c60642c 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -5207,32 +5207,10 @@ new_symbol (struct die_info *die, struct type *type, struct objfile *objfile,
 	  attr = dwarf_attr (die, DW_AT_location);
 	  if (attr)
 	    {
-	      SYMBOL_VALUE (sym) =
-		decode_locdesc (DW_BLOCK (attr), objfile, cu_header);
-	      if (isreg)
-		{
-		  SYMBOL_CLASS (sym) = LOC_REGPARM;
-		  SYMBOL_VALUE (sym) = 
-		    DWARF2_REG_TO_REGNUM (SYMBOL_VALUE (sym));
-		}
-	      else if (offreg)
-		{
-		  if (isderef)
-		    {
-		      if (basereg != frame_base_reg)
-			dwarf2_complex_location_expr_complaint ();
-		      SYMBOL_CLASS (sym) = LOC_REF_ARG;
-		    }
-		  else
-		    {
-		      SYMBOL_CLASS (sym) = LOC_BASEREG_ARG;
-		      SYMBOL_BASEREG (sym) = DWARF2_REG_TO_REGNUM (basereg);
-		    }
-		}
-	      else
-		{
-		  SYMBOL_CLASS (sym) = LOC_ARG;
-		}
+	      var_decode_location (attr, sym, objfile, cu_header);
+	      /* FIXME drow/2003-07-31: Is LOC_COMPUTED_ARG necessary?  */
+	      if (SYMBOL_CLASS (sym) == LOC_COMPUTED)
+		SYMBOL_CLASS (sym) = LOC_COMPUTED_ARG;
 	    }
 	  attr = dwarf_attr (die, DW_AT_const_value);
 	  if (attr)