gdb ChangeLog

	PR pascal/11492.
	* p-valprint.c (pascal_val_print): Fix default printing of integer
	arrays.

gdb/testsuite ChangeLog
	PR pascal/11492.
	* gdb.pascal/gdb11492.pas: New file.
	* gdb.pascal/gdb11492.exp: New file.

5 files changed, 119 insertions, 6 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f3db88..f5a2453 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2010-04-21  Pierre Muller  <muller@ics.u-strasbg.fr>
 
+	PR pascal/11492.
+	* p-valprint.c (pascal_val_print): Fix default printing of integer
+	arrays.
+
+2010-04-21  Pierre Muller  <muller@ics.u-strasbg.fr>
+
 	Fix compilation warning on gcc-4.1.2.
 	* rs6000-aix-tdep.c (rs6000_convert_from_func_ptr_addr): Initialize
 	local variable`pc' to zero.
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index 3bc9c55..d38aa42 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -80,12 +80,13 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr,
 	    {
 	      print_spaces_filtered (2 + 2 * recurse, stream);
 	    }
-	  /* For an array of chars, print with string syntax.  */
-	  if ((eltlen == 1 || eltlen == 2 || eltlen == 4)
-	      && ((TYPE_CODE (elttype) == TYPE_CODE_INT)
-	       || ((current_language->la_language == language_pascal)
-		   && (TYPE_CODE (elttype) == TYPE_CODE_CHAR)))
-	      && (options->format == 0 || options->format == 's'))
+	  /* If 's' format is used, try to print out as string.
+	     If no format is given, print as string if element type
+	     is of TYPE_CODE_CHAR and element size is 1,2 or 4.  */
+	  if (options->format == 's'
+	      || ((eltlen == 1 || eltlen == 2 || eltlen == 4)
+		  && TYPE_CODE (elttype) == TYPE_CODE_CHAR
+		  && options->format == 0))
 	    {
 	      /* If requested, look for the first null char and only print
 	         elements up to it.  */
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 867e41f..cc07b6c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-21  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	PR pascal/11492.
+	* gdb.pascal/gdb11492.pas: New file.
+	* gdb.pascal/gdb11492.exp: New file.
+
 2010-04-20  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/info_types.c, gdb.ada/info_types.exp: New files.
diff --git a/gdb/testsuite/gdb.pascal/gdb11492.exp b/gdb/testsuite/gdb.pascal/gdb11492.exp
new file mode 100644
index 0000000..be8c82d
--- /dev/null
+++ b/gdb/testsuite/gdb.pascal/gdb11492.exp
@@ -0,0 +1,60 @@
+# Copyright 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+load_lib "pascal.exp"
+
+set testfile "gdb11492"
+set srcfile ${testfile}.pas
+set binfile ${objdir}/${subdir}/${testfile}$EXEEXT
+
+if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+  return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
+
+if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
+    pass "setting breakpoint 1"
+}
+
+# Verify that "start" lands inside the right procedure.
+if { [gdb_start_cmd] < 0 } {
+    untested start
+    return -1
+}
+
+gdb_test "" ".* at .*${srcfile}.*" "start"
+gdb_test "continue" ""
+
+gdb_test "print integer_array" " = {50, 51, 52, 53, 54, 55, 56, 57}" 
+gdb_test "print /s integer_array" " = '23456789'" 
+
+gdb_test "print char_array" " = '23456789'" 
+gdb_test "print /d char_array" " = {50, 51, 52, 53, 54, 55, 56, 57}" 
+gdb_test "print /x char_array" " = {0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39}" 
+# Use next two times to avoid GPC line numbering problem
+gdb_test "next" ""
+gdb_test "next" ""
+gdb_test "print char_array" " = '2345X789'"
+gdb_exit
+
diff --git a/gdb/testsuite/gdb.pascal/gdb11492.pas b/gdb/testsuite/gdb.pascal/gdb11492.pas
new file mode 100644
index 0000000..2eb86f5
--- /dev/null
+++ b/gdb/testsuite/gdb.pascal/gdb11492.pas
@@ -0,0 +1,40 @@
+{
+ Copyright 2010 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+}
+
+
+program test_gdb_11492;
+
+const
+  LowBound = 1;
+  HighBound = 8;
+var
+  integer_array : array[LowBound..HighBound] of integer;
+  char_array : array[LowBound..HighBound] of char;
+  i : integer;
+
+begin
+  for i:=LowBound to HighBound do
+    begin
+      integer_array[i]:=49+i;
+      char_array[i]:=char(49+i);
+    end;
+  i:=0; { set breakpoint 1 here }
+  char_array[5] := 'X';
+  Writeln('integer array, index 5 is ',integer_array[5]);
+  Writeln('char array, index 5 is ',char_array[5]);
+end.
+