2010-07-13 Emmanuel Thomé <Emmanuel.Thome@gmail.com>

	* c-valprint.c (c_val_print): Add embedded_offset to address in
	call to val_print_array_elements.

2010-07-13  Tom Tromey  <tromey@redhat.com>

	* gdb.python/py-prettyprint.c (struct arraystruct): New struct.
	(main): Use it.
	* gdb.python/py-prettyprint.exp (run_lang_tests): Add test.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 36c94f9fe313f93f69e1d8b396dc4c03ab724e93..c1a31243310e8464bd764859c0d2959fa798c908 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-13  Emmanuel Thomé  <Emmanuel.Thome@gmail.com>
+
+       * c-valprint.c (c_val_print): Add embedded_offset to address in
+       call to val_print_array_elements.
+
 2010-07-13  Tom Tromey  <tromey@redhat.com>
 
        * dwarf2read.c (dwarf2_read_index): Correctly set 'total_size'.

diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 4e5a95fe0627c966167af270c0b4a0bff5e93f2a..f0895a4d9c1ee462d120fef5055011598c648370 100644 (file)
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -222,7 +222,8 @@ c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
                {
                  i = 0;
                }
-             val_print_array_elements (type, valaddr + embedded_offset, address, stream,
+             val_print_array_elements (type, valaddr + embedded_offset,
+                                       address + embedded_offset, stream,
                                        recurse, original_value, options, i);
              fprintf_filtered (stream, "}");
            }

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 92fb577e7de748d54b679dbee10c75b3fd8a807d..6b52dbbf34041f4448e748f2dc074838d932e0b8 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-13  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.python/py-prettyprint.c (struct arraystruct): New struct.
+       (main): Use it.
+       * gdb.python/py-prettyprint.exp (run_lang_tests): Add test.
+
 2010-07-13  Tom Tromey  <tromey@redhat.com>
 
        * gdb.base/label.exp: New file.

diff --git a/gdb/testsuite/gdb.python/py-prettyprint.c b/gdb/testsuite/gdb.python/py-prettyprint.c
index f461bb184523ed3cfea28b76d8f4b792e1f8b7b1..66a90141f121a7780fb7368f6fa58818b5430798 100644 (file)
--- a/gdb/testsuite/gdb.python/py-prettyprint.c
+++ b/gdb/testsuite/gdb.python/py-prettyprint.c
@@ -29,6 +29,12 @@ struct ss
   struct s b;
 };
 
+struct arraystruct
+{
+  int y;
+  struct s x[2];
+};
+
 struct ns {
   const char *null_str;
   int length;
@@ -199,6 +205,7 @@ main ()
 {
   struct ss  ss;
   struct ss  ssa[2];
+  struct arraystruct arraystruct;
   string x = make_string ("this is x");
   zzz_type c = make_container ("container");
   zzz_type c2 = make_container ("container2");
@@ -214,6 +221,10 @@ main ()
   init_ss(ssa+1, 5, 6);
   memset (&nullstr, 0, sizeof nullstr);
 
+  arraystruct.y = 7;
+  init_s (&arraystruct.x[0], 23);
+  init_s (&arraystruct.x[1], 24);
+
   struct ns  ns;
   ns.null_str = "embedded\0null\0string";
   ns.length = 20;

diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp
index f435fb76999786d4604f6d2915143b315880faad..3b2aadd9602cbdab6afc5637db424e39ae2dfe60 100644 (file)
--- a/gdb/testsuite/gdb.python/py-prettyprint.exp
+++ b/gdb/testsuite/gdb.python/py-prettyprint.exp
@@ -76,6 +76,8 @@ proc run_lang_tests {lang} {
     gdb_test "print ssa\[1\]" " = a=< a=<5> b=<$hex>> b=< a=<6> b=<$hex>>"
     gdb_test "print ssa" " = {a=< a=<3> b=<$hex>> b=< a=<4> b=<$hex>>, a=< a=<5> b=<$hex>> b=< a=<6> b=<$hex>>}"
     
+    gdb_test "print arraystruct" " = {$nl *y = 7, *$nl *x = { a=<23> b=<$hex>,  a=<24> b=<$hex>} *$nl *}"
+
     if {$lang == "c++"} {
        gdb_test "print cps" "=  a=<8> b=<$hex>"
        gdb_test "print cpss" " = {$nl *zss = 9, *$nl *s =  a=<10> b=<$hex>$nl}"