This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[RFA]: Patch to fix the SEGV error when printing f77 array element


Daniel, 

I had cleaned up the patch to fix the SEGV error we discussed on gdb@ the
days before and tested it on ppc64 arch with the latest CVS tree.  It 
works ok.  Please review and comment.  Thanks.

2005-06-9  Wu Zhou  <woodzltc@cn.ibm.com>

	* eval.c (evaluate_subexp_standard): Add code to check the target
	type of a TYPE_CODE_PTR value when we encounter a f77 undetermined
	arglist.  If it is TYPE_CODE_ARRAY or TYPE_CODE_STRING, jump to 
	relevant code path, else go on with the original path.

Index: eval.c
===================================================================
RCS file: /cvs/src/src/gdb/eval.c,v
retrieving revision 1.55
diff -c -p -r1.55 eval.c
*** eval.c	26 May 2005 20:48:58 -0000	1.55
--- eval.c	9 Jun 2005 09:23:02 -0000
*************** evaluate_subexp_standard (struct type *e
*** 1254,1260 ****
  	case TYPE_CODE_STRING:
  	  goto op_f77_substr;
  
- 	case TYPE_CODE_PTR:
  	case TYPE_CODE_FUNC:
  	  /* It's a function call. */
  	  /* Allocate arg vector, including space for the function to be
--- 1254,1259 ----
*************** evaluate_subexp_standard (struct type *e
*** 1267,1272 ****
--- 1266,1298 ----
  	  argvec[tem] = 0;	/* signal end of arglist */
  	  goto do_call_it;
  
+ 	case TYPE_CODE_PTR:
+ 	  /* Fortran always passes variables to subroutines as pointer. 
+ 	     So we need to look into its target type to see if it is 
+ 	     array subscript or substring operations.  */
+ 	  switch (TYPE_CODE (TYPE_TARGET_TYPE (type)))
+ 	    {
+ 	    case TYPE_CODE_ARRAY:
+ 	      arg1 = value_ind (arg1);
+ 	      type = check_typedef (value_type (arg1));
+ 	      goto multi_f77_subscript;
+ 
+ 	    case TYPE_CODE_STRING:
+ 	      arg1 = value_ind (arg1);
+ 	      type = check_typedef (value_type (arg1));
+ 	      goto op_f77_substr;
+ 
+ 	    default:
+ 	      /* It's a function call.  */
+ 	      argvec = (struct value **) alloca (sizeof (struct value *) * (nargs + 2));
+ 	      argvec[0] = arg1;
+ 	      tem = 1;
+ 	      for (; tem <= nargs; tem++)
+ 		argvec[tem] = evaluate_subexp_with_coercion (exp, pos, noside);
+ 	      argvec[tem] = 0;	/* signal end of arglist */
+ 	      goto do_call_it;
+ 	    }
+ 
  	default:
  	  error (_("Cannot perform substring on this type"));
  	}


Cheers
- Wu Zhou


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]