* symtab.h (enum address_class): Remove LOC_LOCAL_ARG.

	* ada-exp.y (select_possible_type_sym): Do not handle LOC_LOCAL_ARG.
	* ada-lang.c (resolve_subexp, symtab_for_sym): Likewise.
	(ada_add_block_symbols): Likewise.
	* ax-gdb.c (gen_var_ref): Likewise.
	* buildsyms.c (finish_block): Likewise.
	* findvar.c (symbol_read_needs_frame, read_var_value): Likewise.
	* m2-exp.y (yylex): Likewise.
	* mi/mi-cmd-stack.c (list_args_or_locals): Likewise.
	* printcmd.c (address_info): Likewise.
	* stack.c (print_frame_args, print_frame_arg_vars): Likewise.
	* symmisc.c (print_symbol, print_partial_symbols): Likewise.
	* symtab.c (lookup_block_symbol): Likewise.
	* tracepoint.c (collect_symbol, add_local_symbols): Likewise.
	(scope_info): Likewise.

14 files changed, 19 insertions, 39 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 299f3fe..2486399 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,24 @@
 2008-05-22  Ulrich Weigand  <uweigand@de.ibm.com>
 
+	* symtab.h (enum address_class): Remove LOC_LOCAL_ARG.
+
+	* ada-exp.y (select_possible_type_sym): Do not handle LOC_LOCAL_ARG.
+	* ada-lang.c (resolve_subexp, symtab_for_sym): Likewise.
+	(ada_add_block_symbols): Likewise.
+	* ax-gdb.c (gen_var_ref): Likewise.
+	* buildsyms.c (finish_block): Likewise.
+	* findvar.c (symbol_read_needs_frame, read_var_value): Likewise.
+	* m2-exp.y (yylex): Likewise.
+	* mi/mi-cmd-stack.c (list_args_or_locals): Likewise.
+	* printcmd.c (address_info): Likewise.
+	* stack.c (print_frame_args, print_frame_arg_vars): Likewise.
+	* symmisc.c (print_symbol, print_partial_symbols): Likewise.
+	* symtab.c (lookup_block_symbol): Likewise.
+	* tracepoint.c (collect_symbol, add_local_symbols): Likewise.
+	(scope_info): Likewise.
+
+2008-05-22  Ulrich Weigand  <uweigand@de.ibm.com>
+
 	* symtab.h (enum address_class): Remove LOC_INDIRECT and
 	LOC_HP_THREAD_LOCAL_STATIC.
 
diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index 72b554e..b11b8b4 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -1059,7 +1059,6 @@ select_possible_type_sym (struct ada_symbol_info *syms, int nsyms)
       case LOC_REGPARM:
       case LOC_REGPARM_ADDR:
       case LOC_LOCAL:
-      case LOC_LOCAL_ARG:
       case LOC_BASEREG:
       case LOC_BASEREG_ARG:
       case LOC_COMPUTED:
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 6bfdf0d..d0003ed 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -2893,7 +2893,6 @@ resolve_subexp (struct expression **expp, int *pos, int deprocedure_p,
                   case LOC_REGPARM:
                   case LOC_REGPARM_ADDR:
                   case LOC_LOCAL:
-                  case LOC_LOCAL_ARG:
                   case LOC_BASEREG:
                   case LOC_BASEREG_ARG:
                   case LOC_COMPUTED:
@@ -4322,7 +4321,6 @@ symtab_for_sym (struct symbol *sym)
       case LOC_REGPARM_ADDR:
       case LOC_LOCAL:
       case LOC_TYPEDEF:
-      case LOC_LOCAL_ARG:
       case LOC_BASEREG:
       case LOC_BASEREG_ARG:
       case LOC_COMPUTED:
@@ -5222,7 +5220,6 @@ ada_add_block_symbols (struct obstack *obstackp,
             switch (SYMBOL_CLASS (sym))
               {
               case LOC_ARG:
-              case LOC_LOCAL_ARG:
               case LOC_REF_ARG:
               case LOC_REGPARM:
               case LOC_REGPARM_ADDR:
@@ -5256,7 +5253,6 @@ ada_add_block_symbols (struct obstack *obstackp,
                 switch (SYMBOL_CLASS (sym))
                   {
                   case LOC_ARG:
-                  case LOC_LOCAL_ARG:
                   case LOC_REF_ARG:
                   case LOC_REGPARM:
                   case LOC_REGPARM_ADDR:
@@ -5312,7 +5308,6 @@ ada_add_block_symbols (struct obstack *obstackp,
                 switch (SYMBOL_CLASS (sym))
                   {
                   case LOC_ARG:
-                  case LOC_LOCAL_ARG:
                   case LOC_REF_ARG:
                   case LOC_REGPARM:
                   case LOC_REGPARM_ADDR:
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index 571c3e7..6d108f4 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -564,7 +564,6 @@ gen_var_ref (struct agent_expr *ax, struct axs_value *value, struct symbol *var)
       break;
 
     case LOC_LOCAL:		/* var lives in locals area of frame */
-    case LOC_LOCAL_ARG:
       gen_frame_locals_address (ax);
       gen_sym_offset (ax, var);
       value->kind = axs_lvalue_memory;
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index e9d5d0f..2171457 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -290,7 +290,6 @@ finish_block (struct symbol *symbol, struct pending **listhead,
 		case LOC_REGPARM:
 		case LOC_REGPARM_ADDR:
 		case LOC_BASEREG_ARG:
-		case LOC_LOCAL_ARG:
 		case LOC_COMPUTED_ARG:
 		  nparams++;
 		  break;
@@ -330,7 +329,6 @@ finish_block (struct symbol *symbol, struct pending **listhead,
 		    case LOC_REGPARM:
 		    case LOC_REGPARM_ADDR:
 		    case LOC_BASEREG_ARG:
-		    case LOC_LOCAL_ARG:
 		    case LOC_COMPUTED_ARG:
 		      TYPE_FIELD_TYPE (ftype, iparams) = SYMBOL_TYPE (sym);
 		      TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
diff --git a/gdb/findvar.c b/gdb/findvar.c
index 1f853b3..6d53674 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -359,7 +359,6 @@ symbol_read_needs_frame (struct symbol *sym)
     case LOC_REGPARM:
     case LOC_REGPARM_ADDR:
     case LOC_LOCAL:
-    case LOC_LOCAL_ARG:
     case LOC_BASEREG:
     case LOC_BASEREG_ARG:
       return 1;
@@ -480,7 +479,6 @@ read_var_value (struct symbol *var, struct frame_info *frame)
       }
 
     case LOC_LOCAL:
-    case LOC_LOCAL_ARG:
       if (frame == NULL)
 	return 0;
       addr = get_frame_locals_address (frame);
diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y
index c5ee4a4..420c287 100644
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -1044,7 +1044,6 @@ yylex ()
        case LOC_REGPARM:
        case LOC_REGPARM_ADDR:
        case LOC_LOCAL:
-       case LOC_LOCAL_ARG:
        case LOC_BASEREG:
        case LOC_BASEREG_ARG:
        case LOC_CONST:
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index af3818e..7e0d7d3 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -254,7 +254,6 @@ list_args_or_locals (int locals, int values, struct frame_info *fi)
 	    case LOC_REF_ARG:	/* reference arg         */
 	    case LOC_REGPARM:	/* register arg          */
 	    case LOC_REGPARM_ADDR:	/* indirect register arg */
-	    case LOC_LOCAL_ARG:	/* stack arg             */
 	    case LOC_BASEREG_ARG:	/* basereg arg           */
 	    case LOC_COMPUTED_ARG:	/* arg with computed location */
 	      if (!locals)
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index d698a83..c21c642 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -1164,10 +1164,6 @@ address_info (char *exp, int from_tty)
       printf_filtered (_("an argument at offset %ld"), val);
       break;
 
-    case LOC_LOCAL_ARG:
-      printf_filtered (_("an argument at frame offset %ld"), val);
-      break;
-
     case LOC_LOCAL:
       printf_filtered (_("a local variable at frame offset %ld"), val);
       break;
diff --git a/gdb/stack.c b/gdb/stack.c
index a0c1edf..66019c7 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -264,7 +264,6 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
 		 keep track of stack offsets in them.  */
 	    case LOC_REGPARM:
 	    case LOC_REGPARM_ADDR:
-	    case LOC_LOCAL_ARG:
 	    case LOC_BASEREG_ARG:
 	    case LOC_COMPUTED_ARG:
 	      break;
@@ -1577,7 +1576,6 @@ print_frame_arg_vars (struct frame_info *frame, struct ui_file *stream)
       switch (SYMBOL_CLASS (sym))
 	{
 	case LOC_ARG:
-	case LOC_LOCAL_ARG:
 	case LOC_REF_ARG:
 	case LOC_REGPARM:
 	case LOC_REGPARM_ADDR:
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index d2306ac..8171fa3 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -651,11 +651,6 @@ print_symbol (void *args)
 			    SYMBOL_VALUE (symbol));
 	  break;
 
-	case LOC_LOCAL_ARG:
-	  fprintf_filtered (outfile, "arg at offset 0x%lx from fp",
-			    SYMBOL_VALUE (symbol));
-	  break;
-
 	case LOC_REF_ARG:
 	  fprintf_filtered (outfile, "reference arg at 0x%lx", SYMBOL_VALUE (symbol));
 	  break;
@@ -856,9 +851,6 @@ print_partial_symbols (struct partial_symbol **p, int count, char *what,
 	case LOC_CONST_BYTES:
 	  fputs_filtered ("constant bytes", outfile);
 	  break;
-	case LOC_LOCAL_ARG:
-	  fputs_filtered ("shuffled arg", outfile);
-	  break;
 	case LOC_UNRESOLVED:
 	  fputs_filtered ("unresolved", outfile);
 	  break;
diff --git a/gdb/symtab.c b/gdb/symtab.c
index d4f3bfe..089c63d 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1956,7 +1956,6 @@ lookup_block_symbol (const struct block *block, const char *name,
 	    {
 	      sym_found = sym;
 	      if (SYMBOL_CLASS (sym) != LOC_ARG &&
-		  SYMBOL_CLASS (sym) != LOC_LOCAL_ARG &&
 		  SYMBOL_CLASS (sym) != LOC_REF_ARG &&
 		  SYMBOL_CLASS (sym) != LOC_REGPARM &&
 		  SYMBOL_CLASS (sym) != LOC_REGPARM_ADDR &&
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 3b4350a..169a752 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -485,14 +485,6 @@ enum address_class
 
   LOC_CONST_BYTES,
 
-  /* Value is arg at SYMBOL_VALUE offset in stack frame. Differs from
-     LOC_LOCAL in that symbol is an argument; differs from LOC_ARG in
-     that we find it in the frame (get_frame_locals_address), not in
-     the arglist (get_frame_args_address).  Added for i960, which
-     passes args in regs then copies to frame.  */
-
-  LOC_LOCAL_ARG,
-
   /* Value is at SYMBOL_VALUE offset from the current value of
      register number SYMBOL_BASEREG.  This exists mainly for the same
      things that LOC_LOCAL and LOC_ARG do; but we need to do this
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 255d0b7..805baa7 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1279,7 +1279,6 @@ collect_symbol (struct collection_list *collect,
       add_memrange (collect, reg, offset, len);
       break;
     case LOC_LOCAL:
-    case LOC_LOCAL_ARG:
       reg = frame_regno;
       offset = frame_offset + SYMBOL_VALUE (sym);
       if (info_verbose)
@@ -1348,7 +1347,6 @@ add_local_symbols (struct collection_list *collect, CORE_ADDR pc,
 		}
 	      break;
 	    case LOC_ARG:
-	    case LOC_LOCAL_ARG:
 	    case LOC_REF_ARG:
 	    case LOC_REGPARM:
 	    case LOC_REGPARM_ADDR:
@@ -2461,7 +2459,6 @@ scope_info (char *args, int from_tty)
 				 (current_gdbarch, SYMBOL_VALUE (sym)));
 	      break;
 	    case LOC_ARG:
-	    case LOC_LOCAL_ARG:
 	      printf_filtered ("an argument at stack/frame offset %ld",
 			       SYMBOL_VALUE (sym));
 	      break;