2004-06-16 Andrew Cagney <cagney@gnu.org>

	* gdb.base/long_long.exp, gdb.base/long_long.c: Rewrite.

3 files changed, 283 insertions, 231 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 745cb21..349ac47 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-16  Andrew Cagney  <cagney@gnu.org>
+
+	* gdb.base/long_long.exp, gdb.base/long_long.c: Rewrite.
+
 2004-06-15  Michael Chastain  <mec.gnu@mindspring.com>
 
 	* gdb.base/long_long.c: Add copyright notice.
diff --git a/gdb/testsuite/gdb.base/long_long.c b/gdb/testsuite/gdb.base/long_long.c
index 1d30e4c..3cc7c1f 100644
--- a/gdb/testsuite/gdb.base/long_long.c
+++ b/gdb/testsuite/gdb.base/long_long.c
@@ -27,55 +27,74 @@
  * cc +e +DA2.0 -g -o long_long long_long.c
  */
 
-#ifdef PROTOTYPES
-long long callee(long long i)
-#else
-long long callee( i )
-long long i;
-#endif
+enum { MAX_BYTES = 16 };
+
+void
+pack (unsigned char b[MAX_BYTES], int size, int nr)
 {
-   register long long result;
+  static long long val[] = { 0x123456789abcdefLL, 01234567123456701234567LL, 12345678901234567890ULL};
+  volatile static int e = 1;
+  int i;
+  for (i = 0; i < nr; i++)
+    {
+      int offset;
+      if (*(char *)&e)
+	/* Little endian.  */
+	offset = sizeof (long long) - size;
+      else
+	/* Big endian endian.  */
+	offset = 0;
+      memcpy (b + size * i, (char *) val + sizeof (long long) * i + offset, size);
+    }
+}
 
-   result  = 0x12345678;
-   result  = result << i;
-   result += 0x9abcdef0;
+unsigned char b[MAX_BYTES];
+unsigned char h[MAX_BYTES];
+unsigned char w[MAX_BYTES];
+unsigned char g[MAX_BYTES];
 
-   return result;
-}
+unsigned char c[MAX_BYTES];
+unsigned char s[MAX_BYTES];
+unsigned char i[MAX_BYTES];
+unsigned char l[MAX_BYTES];
+unsigned char ll[MAX_BYTES];
 
 int known_types()
 {
-   long long bin = 0, oct = 0, dec = 0, hex = 0;
-
-   /* Known values, filling the full 64 bits.
-    */
-   bin = 0x123456789abcdefLL; /* 64 bits = 16 hex digits */
-   oct = 01234567123456701234567LL; /*  = 21+ octal digits */
-   dec = 12345678901234567890ULL;    /*  = 19+ decimal digits */
-
-   /* Stop here and look!
-    */
-   hex = bin - dec | oct;
-
-   return 0;
+  /* A union is used here as, hopefully it has well defined packing
+     rules.  */
+  struct {
+    long long bin, oct, dec, hex;    
+  } val;
+  memset (&val, 0, sizeof val);
+
+  /* Known values, filling the full 64 bits.  */
+  val.bin = 0x123456789abcdefLL; /* 64 bits = 16 hex digits */
+  val.oct = 01234567123456701234567LL; /*  = 21+ octal digits */
+  val.dec = 12345678901234567890ULL;    /*  = 19+ decimal digits */
+
+  /* Stop here and look!  */
+  val.hex = val.bin - val.dec | val.oct;
+
+  return 0;
 }
 
 int main() {
 
-   register long long x, y;
-   register long long i;
-   
-   x = (long long) 0xfedcba9876543210LL;
-   y = x++;
-   x +=y;
-   i = 11;
-   x = callee( i );
-   y += x;
+   /* Pack Byte, Half, Word and Giant arrays with byte-orderd values.
+      That way "(gdb) x" gives the same output on different
+      architectures.  */
+   pack (b, 1, 2);
+   pack (h, 2, 2);
+   pack (w, 4, 2);
+   pack (g, 8, 2);
+   pack (c, sizeof (char), 2);
+   pack (s, sizeof (short), 2);
+   pack (i, sizeof (int), 2);
+   pack (l, sizeof (long), 2);
+   pack (ll, sizeof (long long), 2);
 
    known_types();
    
    return 0;
 }
-
-
-
diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp
index 6d9f8e9..b36b30b 100644
--- a/gdb/testsuite/gdb.base/long_long.exp
+++ b/gdb/testsuite/gdb.base/long_long.exp
@@ -1,5 +1,7 @@
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# This testcase is part of GDB, the GNU debugger.
+
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 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
@@ -62,61 +64,111 @@ if { ![runto known_types] } then {
 set target_bigendian_p 1
 send_gdb "show endian\n"
 gdb_expect {
-    -re ".*little endian.*$gdb_prompt $" { set target_bigendian_p 0 }
-    -re ".*big endian.*$gdb_prompt $" { }
-    -re ".*$gdb_prompt $" {
+    -re "little endian.*$gdb_prompt $" { set target_bigendian_p 0 }
+    -re "big endian.*$gdb_prompt $" { }
+    -re "$gdb_prompt $" {
 	 fail "getting target endian"
     }
     default	{ fail "(timeout) getting target endian" }
 }
 
-# Detect targets with 2-byte integers.  Yes, it's not general to assume
-# that all others have 4-byte ints, but don't worry about it until one
-# actually exists.
+# Detect the size of the target's basic types.
 
-set sizeof_int 4
-send_gdb "print sizeof(int)\n"
-gdb_expect {
-    -re ".* = 2.*$gdb_prompt $" { set sizeof_int 2 }
-    -re ".*$gdb_prompt $" { }
-    default { }
+proc get_valueof { fmt exp default } {
+    global gdb_prompt
+    send_gdb "print${fmt} ${exp}\n"
+    gdb_expect {
+	-re "\\$\[0-9\]* = (\[-\]*\[0-9\]*).*$gdb_prompt $" {
+	    set val $expect_out(1,string)
+	    pass "get value of ${exp} ($val)"
+	}
+	timeout {
+	    set size ${default}
+	    fail "get value of ${exp} (timeout)"
+	}
+    }
+    return ${val}
 }
 
-# Detect targets with 2-byte pointers.  Assume all others use 4-bytes.
-set sizeof_ptr 4
-send_gdb "print sizeof(void*)\n"
-gdb_expect {
-    -re ".* = 2.*$gdb_prompt $" { set sizeof_ptr 2 }
-    -re ".*$gdb_prompt $" { }
-    default { }
+proc get_sizeof { type default } {
+    return [get_valueof "/d" "sizeof (${type})" $default]
 }
 
-# Detect targets with 4-byte shorts.  Assume all others use 2-bytes.
+set sizeof_char [get_sizeof "char" 1]
+set sizeof_short [get_sizeof "short" 2]
+set sizeof_int [get_sizeof "int" 4]
+set sizeof_long [get_sizeof "long" 4]
+set sizeof_long_long [get_sizeof "long long" 8]
+set sizeof_data_ptr [get_sizeof "void *" 4]
+set sizeof_double [get_sizeof "double" 8]
+set sizeof_long_double [get_sizeof "long double" 8]
+
+# Tests to handle ISA/ABI variants
+
+proc pat2 { n pats } {
+    set i 0
+    while { $n > 1 } {
+	set n [expr $n / 2]
+	incr i
+    }
+    return [lindex $pats $i]
+}
 
-set sizeof_short 2
-send_gdb "print sizeof(short)\n"
-gdb_expect {
-    -re ".* = 4.*$gdb_prompt $" { set sizeof_short 4 }
-    -re ".*$gdb_prompt $" { }
-    default { }
+proc gdb_test_xxx { test pat name } {
+    if { $pat == "" } {
+	setup_kfail *-*-* gdb/1672
+	gdb_test $test "xxx" $name
+    } else {
+	gdb_test $test $pat $name
+    }
 }
 
-# Detect targets with 4-byte doubles.
+proc gdb_test_bi { test be le } {
+    global target_bigendian_p
 
-set sizeof_double 8
-send_gdb "print sizeof(double)\n"
-gdb_expect {
-    -re ".* = 4.*$gdb_prompt $" { set sizeof_double 4 }
-    -re ".*$gdb_prompt $" { }
-    default { }
+    if { $target_bigendian_p } {
+	gdb_test_xxx $test $be $test
+    } else {
+	gdb_test_xxx $test $le $test
+    }
 }
 
-set sizeof_long_double 8
-send_gdb "print sizeof(long double)\n"
-gdb_expect {
-    -re ".* = 4.*$gdb_prompt $" { set sizeof_long_double 4 }
-    -re ".*$gdb_prompt $" { }
-    default { }
+proc gdb_test_ptr { test args } {
+    global sizeof_data_ptr
+
+    gdb_test_xxx $test [pat2 $sizeof_data_ptr $args] $test
+}
+
+proc gdb_test_xptr { examine args } {
+    global sizeof_data_ptr
+    set x [pat2 $sizeof_data_ptr $args]
+    # X is of the form { VARIABLE PATTERN }
+    gdb_test_xxx "$examine [lindex $x 0]" [lindex $x 1] "$examine"
+}
+
+proc gdb_test_char { test args } {
+    global sizeof_char
+    gdb_test_xxx $test [pat2 $sizeof_char $args] $test
+}
+
+proc gdb_test_short { test args } {
+    global sizeof_short
+    gdb_test_xxx $test [pat2 $sizeof_short $args] $test
+}
+
+proc gdb_test_int { test args } {
+    global sizeof_int
+    gdb_test_xxx $test [pat2 $sizeof_int $args] $test
+}
+
+proc gdb_test_long { test args } {
+    global sizeof_long
+    gdb_test_xxx $test [pat2 $sizeof_long $args] $test
+}
+
+proc gdb_test_long_long { test args } {
+    global sizeof_long_long
+    gdb_test_xxx $test [pat2 $sizeof_long_long $args] $test
 }
 
 gdb_breakpoint [gdb_get_line_number "Stop here and look"]
@@ -124,33 +176,29 @@ gdb_continue_to_breakpoint "Stop here and look"
 
 # Check the hack for long long prints.
 #
-gdb_test "p/x hex" ".*0x0*0.*" "hex print p/x"
-gdb_test "p/x dec" ".*0xab54a98ceb1f0ad2.*" "decimal print p/x"
+gdb_test "p/x val.hex" "0x0*0" "hex print p/x"
+gdb_test "p/x val.dec" "0xab54a98ceb1f0ad2" "decimal print p/x"
 # see if 'p/<code>' is handled same as 'p /<code>'
 #
-gdb_test "p /x dec" ".*0xab54a98ceb1f0ad2.*" "default print dec"
-gdb_test "p /x bin" ".*0x0*123456789abcdef.*" "default print bin"
-gdb_test "p /x oct" ".*0xa72ee53977053977.*" "default print oct"
-gdb_test "p hex" ".*= 0*x*0*0.*" "default print hex"
+gdb_test "p /x val.dec" "0xab54a98ceb1f0ad2" "default print val.dec"
+gdb_test "p /x val.bin" "0x123456789abcdef" "default print val.bin"
+gdb_test "p /x val.oct" "0xa72ee53977053977" "default print val.oct"
+gdb_test "p val.hex" "= 0" "default print hex"
 
-gdb_test "p/u dec" ".*12345678901234567890.*" "decimal print p/u"
-gdb_test "p/t bin" ".*0*100100011010001010110011110001001101010111100110111101111.*" "binary print"
-gdb_test "p/o oct" ".*01234567123456701234567.*" "octal print"
-gdb_test "p /d bin" ".*81985529216486895.*" "print +ve long long"
-gdb_test "p/d dec" ".*-6101065172474983726.*" "decimal print p/d"
+gdb_test "p/u val.dec" "12345678901234567890" "decimal print p/u"
+gdb_test "p/t val.bin" "100100011010001010110011110001001101010111100110111101111" "binary print"
+gdb_test "p/o val.oct" "01234567123456701234567" "octal print"
+gdb_test "p /d val.bin" "81985529216486895" "print +ve long long"
+gdb_test "p/d val.dec" "-6101065172474983726" "decimal print p/d"
 
 # Try all the combinations to bump up coverage.
 #
-gdb_test "p/d oct" ".*-6399925985474168457.*"
-gdb_test "p/u oct" ".*12046818088235383159.*"
-gdb_test "p/o oct" ".*.*"
-gdb_test "p/t oct" ".*1010011100101110111001010011100101110111000001010011100101110111.*"
-if { $sizeof_ptr == 2 } {
-  gdb_test "p/a oct" ".*0x.*3977.*"
-} else {
-  gdb_test "p/a oct" ".*0x.*77053977.*"
-}
-gdb_test "p/c oct" ".*'w'.*"
+gdb_test "p/d val.oct" "-6399925985474168457"
+gdb_test "p/u val.oct" "12046818088235383159"
+gdb_test "p/o val.oct" ""
+gdb_test "p/t val.oct" "1010011100101110111001010011100101110111000001010011100101110111"
+gdb_test_ptr "p/a val.oct" "" "" "0x77053977" "0xa72ee53977053977"
+gdb_test "p/c val.oct" "'w'"
 
 if { $sizeof_double == 8 || $sizeof_long_double == 8 } {
     # ARM floating point numbers are not strictly little endian or big endian,
@@ -161,149 +209,130 @@ if { $sizeof_double == 8 || $sizeof_long_double == 8 } {
 	    [istarget "xscale*-*-*"] || \
 	    [istarget "strongarm*-*-*"] } then {
 	# assume the long long represents a floating point double in ARM format
-	gdb_test "p/f oct" ".*2.1386676354387559e\\+265.*"
+	gdb_test "p/f val.oct" "2.1386676354387559e\\+265"
     } else {
 	# assume the long long represents a floating point double in little
 	# endian format
-	gdb_test "p/f oct" ".*-5.9822653797615723e-120.*"
+	gdb_test "p/f val.oct" "-5.9822653797615723e-120"
     }
-
 } else {
-
-    gdb_test "p/f oct" ".*-2.42716126e-15.*"
-
+    gdb_test "p/f val.oct" "-2.42716126e-15"
 }
 
-if { $target_bigendian_p } {
-
-    if { $sizeof_int == 4 } {
-
-	gdb_test "p/d *(int *)&oct" ".*-1490098887.*"
-	gdb_test "p/u *(int *)&oct" ".*2804868409.*"
-	gdb_test "p/o *(int *)&oct" ".*024713562471.*"
-	gdb_test "p/t *(int *)&oct" ".*10100111001011101110010100111001.*"
-
-	if { $sizeof_ptr == 2 } {
-	    gdb_test "p/a *(int *)&oct" ".*0xe539.*"
-	} else {
-	    gdb_test "p/a *(int *)&oct" ".*0xf*a72ee539.*"
-	}
-
-	gdb_test "p/c *(int *)&oct" ".*57 '9'.*"
-	gdb_test "p/f *(int *)&oct" ".*-2.42716126e-15.*"
-
-    } else {
-
-	gdb_test "p/d *(int *)&oct" ".*-22738.*"
-	gdb_test "p/u *(int *)&oct" ".*42798.*"
-	gdb_test "p/o *(int *)&oct" ".*0123456.*"
-	gdb_test "p/t *(int *)&oct" ".*1010011100101110.*"
-
-	if { $sizeof_ptr == 2 } {
-	    gdb_test "p/a *(int *)&oct" ".*0xa72e.*"
-	} else {
-	    gdb_test "p/a *(int *)&oct" ".*0xffffa72e.*"
-	}
-	gdb_test "p/c *(int *)&oct" ".*46 '.'.*"
-	gdb_test "p/f *(int *)&oct" ".*-22738.*"
-
-    }
-
-    if { $sizeof_short == 2 } {
-	gdb_test "p/d *(short *)&oct" ".*-22738.*"
-	gdb_test "p/u *(short *)&oct" ".*42798.*"
-	gdb_test "p/o *(short *)&oct" ".*0123456.*"
-	gdb_test "p/t *(short *)&oct" ".*1010011100101110.*"
-	if { $sizeof_ptr == 2 } {
-	    gdb_test "p/a *(short *)&oct" ".*0xa72e.*"
-	} else {
-	    gdb_test "p/a *(short *)&oct" ".*0xf*ffffa72e.*"
-	}
-	gdb_test "p/c *(short *)&oct" ".* 46 '.'.*"
-	gdb_test "p/f *(short *)&oct" ".*-22738.*"
-    } else {
-	gdb_test "p/d *(short *)&oct" ".*-1490098887.*"
-	gdb_test "p/u *(short *)&oct" ".*2804868409.*"
-	gdb_test "p/o *(short *)&oct" ".*024713562471.*"
-	gdb_test "p/t *(short *)&oct" ".*10100111001011101110010100111001.*"
-	gdb_test "p/a *(short *)&oct" ".*0xf*a72ee539.*"
-	gdb_test "p/c *(short *)&oct" ".* 57 '9'.*"
-	gdb_test "p/f *(short *)&oct" ".*-2.42716126e-15.*"
-    }
-
-    gdb_test "x/x &oct" ".*0xa72ee539.*"
-    gdb_test "x/d &oct" ".*.-1490098887*"
-    gdb_test "x/u &oct" ".*2804868409.*"
-    gdb_test "x/o &oct" ".*024713562471.*"
-    gdb_test "x/t &oct" ".*10100111001011101110010100111001.*"
-    if { $sizeof_ptr == 2 } {
-	gdb_test "x/a &oct" ".*0xa72e.*"
-    } else {
-	gdb_test "x/a &oct" ".*0xa72ee539.*"
-    }
-    gdb_test "x/c &oct" ".*-89 .*"
-    # FIXME GDB's output is correct, but this longer match fails.
-    # gdb_test "x/c &oct" ".*-89 '\\\\247'.*"
-    if { $sizeof_double == 8 || $sizeof_long_double == 8 } {
-	gdb_test "x/f &oct" ".*-5.9822653797615723e-120.*"
-    } else {
-	gdb_test "x/f &oct" ".*-2.42716126e-15.*"
-    }
-
-    # FIXME Fill in the results for all the following tests.  (But be careful
-    # about looking at locations with unspecified contents!)
-
-    gdb_test "x/2x &oct" ".*0xa72ee53977053977.*"
-    gdb_test "x/2d &oct" ".*-6399925985474168457.*"
-    gdb_test "x/2u &oct" ".*.*"
-    gdb_test "x/2o &oct" ".*.*"
-    gdb_test "x/2t &oct" ".*.*"
-    gdb_test "x/2a &oct" ".*.*"
-    gdb_test "x/2c &oct" ".*.*"
-    gdb_test "x/2f &oct" ".*.*"
-
-    gdb_test "x/2bx &oct" ".*.*"
-    gdb_test "x/2bd &oct" ".*.*"
-    gdb_test "x/2bu &oct" ".*.*"
-    gdb_test "x/2bo &oct" ".*.*"
-    gdb_test "x/2bt &oct" ".*.*"
-    gdb_test "x/2ba &oct" ".*.*"
-    gdb_test "x/2bc &oct" ".*.*"
-    gdb_test "x/2bf &oct" ".*.*"
-
-    gdb_test "x/2hx &oct" ".*.*"
-    gdb_test "x/2hd &oct" ".*.*"
-    gdb_test "x/2hu &oct" ".*.*"
-    gdb_test "x/2ho &oct" ".*.*"
-    gdb_test "x/2ht &oct" ".*.*"
-    gdb_test "x/2ha &oct" ".*.*"
-    gdb_test "x/2hc &oct" ".*.*"
-    gdb_test "x/2hf &oct" ".*.*"
-
-    gdb_test "x/2wx &oct" ".*.*"
-    gdb_test "x/2wd &oct" ".*.*"
-    gdb_test "x/2wu &oct" ".*.*"
-    gdb_test "x/2wo &oct" ".*.*"
-    gdb_test "x/2wt &oct" ".*.*"
-    gdb_test "x/2wa &oct" ".*.*"
-    gdb_test "x/2wc &oct" ".*.*"
-    gdb_test "x/2wf &oct" ".*.*"
-
-    gdb_test "x/2gx &oct" ".*.*"
-    gdb_test "x/2gd &oct" ".*.*"
-    gdb_test "x/2gu &oct" ".*.*"
-    gdb_test "x/2go &oct" ".*.*"
-    gdb_test "x/2gt &oct" ".*.*"
-    gdb_test "x/2ga &oct" ".*.*"
-    gdb_test "x/2gc &oct" ".*.*"
-    gdb_test "x/2gf &oct" ".*.*"
-
+gdb_test_char "p/x *(char *)c" "0x1"
+gdb_test_char "p/d *(char *)c" "1"
+gdb_test_char "p/u *(char *)c" "1"
+gdb_test_char "p/o *(char *)c" "01"
+gdb_test_char "p/t *(char *)c" "1"
+gdb_test_char "p/a *(char *)c" "0x1"
+gdb_test_char "p/f *(char *)c" "1"
+gdb_test_char "p/c *(char *)c" "1 '.001'"
+
+gdb_test_short "p/x *(short *)s" "" "0x123" ""
+gdb_test_short "p/d *(short *)s" "" "291" ""
+gdb_test_short "p/u *(short *)s" "" "291" ""
+gdb_test_short "p/o *(short *)s" "" "0443" ""
+gdb_test_short "p/t *(short *)s" "" "100100011" ""
+gdb_test_short "p/a *(short *)s" "" "0x123" ""
+gdb_test_short "p/f *(short *)s" "" "291" ""
+gdb_test_short "p/c *(short *)s" "" "35 '.'" ""
+
+gdb_test_int "p/x *(int *)i" "" "0x123" "0x1234567" ""
+gdb_test_int "p/d *(int *)i" "" "291" "19088743" ""
+gdb_test_int "p/u *(int *)i" "" "291" "19088743" ""
+gdb_test_int "p/o *(int *)i" "" "0443" "0110642547" ""
+gdb_test_int "p/t *(int *)i" "" "100100011" "1001000110100010101100111" ""
+gdb_test_int "p/a *(int *)i" "" "" "0x1234567" ""
+gdb_test_int "p/f *(int *)i" "" "291" "2.99881655e-38" ""
+gdb_test_int "p/c *(int *)i" "" "35 '.'" "103 'g'" ""
+
+gdb_test_long "p/x *(long *)l" "" "0x123" "0x1234567" "0x123456789abcdef"
+gdb_test_long "p/d *(long *)l" "" "291" "19088743" "81985529216486895"
+gdb_test_long "p/u *(long *)l" "" "291" "19088743" "81985529216486895"
+gdb_test_long "p/o *(long *)l" "" "0443" "0110642547" "04432126361152746757"
+gdb_test_long "p/t *(long *)l" "" "100100011" "1001000110100010101100111" "100100011010001010110011110001001101010111100110111101111"
+gdb_test_ptr "p/a *(long *)l" "" "" "0x1234567" "0x123456789abcdef"
+gdb_test_long "p/f *(long *)l" "" "291" "2.99881655e-38" "3.5127005640885037e-303"
+gdb_test_long "p/c *(long *)l" "" "35 '.'" "103 'g'" "-17 '.*'"
+
+gdb_test_long_long "p/x *(long long *)ll" "" "" "" "0x123456789abcdef"
+gdb_test_long_long "p/d *(long long *)ll" "" "" "" "81985529216486895"
+gdb_test_long_long "p/u *(long long *)ll" "" "" "" "81985529216486895"
+gdb_test_long_long "p/o *(long long *)ll" "" "" "" "04432126361152746757"
+gdb_test_long_long "p/t *(long long *)ll" "" "" "" "100100011010001010110011110001001101010111100110111101111"
+gdb_test_ptr "p/a *(long long *)ll" "" "" "0x89abcdef" "0x123456789abcdef"
+gdb_test_long_long "p/f *(long long *)ll" "" "" "" "3.5127005640885037e-303"
+gdb_test_long_long "p/c *(long long *)ll" "" "" "" "-17 '.*'"
+
+# Implict Word size (except for a, c, and f)
+
+gdb_test "x/w w" "" "set examine size to w"
+gdb_test "x/x w" "0x01234567"
+gdb_test "x/d w" "19088743"
+gdb_test "x/u w" "19088743"
+gdb_test "x/o w" "0110642547"
+gdb_test "x/t w" "00000001001000110100010101100111"
+gdb_test_xptr "x/a" { b "" } { h "" } { w "0x1234567" } { g "0x123456789abcdef" }
+gdb_test "x/c b" "1 '.001'"
+if { $sizeof_double == 8 || $sizeof_long_double == 8 } {
+    gdb_test "x/f &val.oct" "-5.9822653797615723e-120"
 } else {
+    gdb_test "x/f &val.oct" "-2.42716126e-15"
+}
 
-    # FIXME Add little-endian versions of these tests, or define a
-    # gdb_test_bi with two strings to match on.
+# Implict Giant size (except for a, c, and f)
 
+gdb_test "x/g g" "" "set examine size to g"
+gdb_test "x/2x g" "0x0123456789abcdef.*0xa72ee53977053977"
+gdb_test "x/2d g" "81985529216486895.*-6399925985474168457"
+gdb_test "x/2u g" "81985529216486895.*12046818088235383159"
+gdb_test "x/2o g" "04432126361152746757.*01234567123456701234567"
+gdb_test "x/2t g" "0000000100100011010001010110011110001001101010111100110111101111.*1010011100101110111001010011100101110111000001010011100101110111"
+gdb_test_xptr "x/2a" { b "" } { h "" } { w "0x1234567.*0xa72ee539" } { g "0x123456789abcdef.*0xa72ee53977053977" }
+gdb_test "x/2c b" "1 '.001'.*-89 '.'"
+if { $sizeof_double == 8 || $sizeof_long_double == 8 } {
+    gdb_test "x/2f &val.oct" "-5.9822653797615723e-120.*-5.9041889495880968e-100"
+} else {
+    gdb_test "x/2f &val.oct" "-2.42716126e-15"
 }
 
+# Explicit sizes, and two memory locations ...
+
+gdb_test "x/2bx b" "0x01.*0xa7"
+gdb_test "x/2bd b" "1.*-89"
+gdb_test "x/2bu b" "1.*167"
+gdb_test "x/2bo b" "01.*0247"
+gdb_test "x/2bt b" "00000001.*10100111"
+gdb_test_ptr "x/2ba b" "" "" "0x1.*0xffffffa7" "0x1.*0xffffffffffffffa7"
+gdb_test "x/2bc b" "1 '.001'.*-89 '.'"
+gdb_test "x/2bf b" "1.*-89"
+
+gdb_test "x/2hx h" "0x0123.*0xa72e"
+gdb_test "x/2hd h" "291.*-22738"
+gdb_test "x/2hu h" "291.*42798"
+gdb_test "x/2ho h" "0443.*0123456"
+gdb_test "x/2ht h" "0000000100100011.*1010011100101110"
+gdb_test_ptr "x/2ha h" "" ""  "0x123.*0xffffa72e" "0x123.*0xffffffffffffa72e"
+gdb_test "x/2hc h" "35 '.'.*46 '.'"
+gdb_test "x/2hf h" "291.*-22738"
+
+gdb_test "x/2wx w" "0x01234567.*0xa72ee539"
+gdb_test "x/2wd w" "19088743.*-1490098887"
+gdb_test "x/2wu w" "19088743.*2804868409"
+gdb_test "x/2wo w" "0110642547.*024713562471"
+gdb_test "x/2wt w" "00000001001000110100010101100111.*10100111001011101110010100111001"
+gdb_test_ptr "x/2wa w" "" ""  "0x1234567.*0xa72ee539" "0x1234567.*0xffffffffa72ee539"
+gdb_test "x/2wc w" "103 'g'.*57 '9'"
+gdb_test "x/2wf w" "2.99881655e-38.*-2.42716126e-15"
+
+gdb_test "x/2gx g" "0x0123456789abcdef.*0xa72ee53977053977"
+gdb_test "x/2gd g" "81985529216486895.*-6399925985474168457"
+gdb_test "x/2gu g" "81985529216486895.*12046818088235383159"
+gdb_test "x/2go g" "04432126361152746757.*01234567123456701234567"
+gdb_test "x/2gt g" "0000000100100011010001010110011110001001101010111100110111101111.*1010011100101110111001010011100101110111000001010011100101110111"
+gdb_test_ptr "x/2ga g" "" "" "0x89abcdef.*0x77053977" "0x123456789abcdef.*0xa72ee53977053977"
+gdb_test "x/2gc g" "-17 '.'.*119 'w'"
+gdb_test "x/2gf g" "3.5127005640885037e-303.*-5.9822653797615723e-120"
+
 gdb_exit
 return 0