backends/

2006-08-03  Roland McGrath  <roland@redhat.com>

	* sparc_regs.c (sparc_register_name): List 32 FPU regs only for
	EM_SPARC.  EM_SPARC32PLUS also has 64.


tests/
2006-08-03  Roland McGrath  <roland@redhat.com>

	* run-allregs.sh: Add sparc cases.
	* testfile30.bz2: New data file.
	* testfile31.bz2: New data file.
	* Makefile.am (EXTRA_DIST): Add them.

7 files changed, 186 insertions, 3 deletions

diff --git a/backends/ChangeLog b/backends/ChangeLog
index 949f8375..1f3b7303 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-03  Roland McGrath  <roland@redhat.com>
+
+	* sparc_regs.c (sparc_register_name): List 32 FPU regs only for
+	EM_SPARC.  EM_SPARC32PLUS also has 64.
+
 2006-07-21  Roland McGrath  <roland@redhat.com>
 
 	* i386_regs.c (i386_register_name): Fix return value when using stpcpy.
diff --git a/backends/sparc_regs.c b/backends/sparc_regs.c
index 8ee2a0cb..820878e1 100644
--- a/backends/sparc_regs.c
+++ b/backends/sparc_regs.c
@@ -1,5 +1,5 @@
 /* Register names and numbers for SPARC DWARF.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2006 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@ sparc_register_name (Ebl *ebl,
 		     int regno, char *name, size_t namelen,
 		     const char **prefix, const char **setname)
 {
-  const int nfp = ebl->machine == EM_SPARCV9 ? 64 : 32;
+  const int nfp = ebl->machine == EM_SPARC ? 32 : 64;
 
   if (name == NULL)
     return 32 + nfp;
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 070b2f52..fc795084 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-03  Roland McGrath  <roland@redhat.com>
+
+	* run-allregs.sh: Add sparc cases.
+	* testfile30.bz2: New data file.
+	* testfile31.bz2: New data file.
+	* Makefile.am (EXTRA_DIST): Add them.
+
 2006-07-21  Roland McGrath  <roland@redhat.com>
 
 	* allregs.c (struct reginfo): Increase size of name.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0ceef1b9..ab17761a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -113,7 +113,8 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \
 	     testfile26.bz2 testfile27.bz2 \
 	     coverage.sh test-subr.sh test-wrapper.sh run-readelf-test1.sh \
 	     run-bug1-test.sh testfile28.bz2 testfile28.rdwr.bz2 \
-	     testfile29.bz2 testfile29.rdwr.bz2
+	     testfile29.bz2 testfile29.rdwr.bz2 \
+	     testfile30.bz2 testfile31.bz2
 
 installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir) \
 			      bindir=$(DESTDIR)$(bindir) \
diff --git a/tests/run-allregs.sh b/tests/run-allregs.sh
index 480a8029..bdd1ca23 100755
--- a/tests/run-allregs.sh
+++ b/tests/run-allregs.sh
@@ -1238,4 +1238,174 @@ control registers:
 	 65: %pswa (pswa)
 EOF
 
+regs_test testfile30 <<\EOF
+integer registers:
+	  0: %g0 (g0)
+	  1: %g1 (g1)
+	  2: %g2 (g2)
+	  3: %g3 (g3)
+	  4: %g4 (g4)
+	  5: %g5 (g5)
+	  6: %g6 (g6)
+	  7: %g7 (g7)
+	  8: %o0 (o0)
+	  9: %o1 (o1)
+	 10: %o2 (o2)
+	 11: %o3 (o3)
+	 12: %o4 (o4)
+	 13: %o5 (o5)
+	 14: %o6 (o6)
+	 15: %o7 (o7)
+	 16: %l0 (l0)
+	 17: %l1 (l1)
+	 18: %l2 (l2)
+	 19: %l3 (l3)
+	 20: %l4 (l4)
+	 21: %l5 (l5)
+	 22: %l6 (l6)
+	 23: %l7 (l7)
+	 24: %i0 (i0)
+	 25: %i1 (i1)
+	 26: %i2 (i2)
+	 27: %i3 (i3)
+	 28: %i4 (i4)
+	 29: %i5 (i5)
+	 30: %i6 (i6)
+	 31: %i7 (i7)
+FPU registers:
+	 32: %f0 (f0)
+	 33: %f1 (f1)
+	 34: %f2 (f2)
+	 35: %f3 (f3)
+	 36: %f4 (f4)
+	 37: %f5 (f5)
+	 38: %f6 (f6)
+	 39: %f7 (f7)
+	 40: %f8 (f8)
+	 41: %f9 (f9)
+	 42: %f10 (f10)
+	 43: %f11 (f11)
+	 44: %f12 (f12)
+	 45: %f13 (f13)
+	 46: %f14 (f14)
+	 47: %f15 (f15)
+	 48: %f16 (f16)
+	 49: %f17 (f17)
+	 50: %f18 (f18)
+	 51: %f19 (f19)
+	 52: %f20 (f20)
+	 53: %f21 (f21)
+	 54: %f22 (f22)
+	 55: %f23 (f23)
+	 56: %f24 (f24)
+	 57: %f25 (f25)
+	 58: %f26 (f26)
+	 59: %f27 (f27)
+	 60: %f28 (f28)
+	 61: %f29 (f29)
+	 62: %f30 (f30)
+	 63: %f31 (f31)
+EOF
+
+regs_test testfile31 <<\EOF
+integer registers:
+	  0: %g0 (g0)
+	  1: %g1 (g1)
+	  2: %g2 (g2)
+	  3: %g3 (g3)
+	  4: %g4 (g4)
+	  5: %g5 (g5)
+	  6: %g6 (g6)
+	  7: %g7 (g7)
+	  8: %o0 (o0)
+	  9: %o1 (o1)
+	 10: %o2 (o2)
+	 11: %o3 (o3)
+	 12: %o4 (o4)
+	 13: %o5 (o5)
+	 14: %o6 (o6)
+	 15: %o7 (o7)
+	 16: %l0 (l0)
+	 17: %l1 (l1)
+	 18: %l2 (l2)
+	 19: %l3 (l3)
+	 20: %l4 (l4)
+	 21: %l5 (l5)
+	 22: %l6 (l6)
+	 23: %l7 (l7)
+	 24: %i0 (i0)
+	 25: %i1 (i1)
+	 26: %i2 (i2)
+	 27: %i3 (i3)
+	 28: %i4 (i4)
+	 29: %i5 (i5)
+	 30: %i6 (i6)
+	 31: %i7 (i7)
+FPU registers:
+	 32: %f0 (f0)
+	 33: %f1 (f1)
+	 34: %f2 (f2)
+	 35: %f3 (f3)
+	 36: %f4 (f4)
+	 37: %f5 (f5)
+	 38: %f6 (f6)
+	 39: %f7 (f7)
+	 40: %f8 (f8)
+	 41: %f9 (f9)
+	 42: %f10 (f10)
+	 43: %f11 (f11)
+	 44: %f12 (f12)
+	 45: %f13 (f13)
+	 46: %f14 (f14)
+	 47: %f15 (f15)
+	 48: %f16 (f16)
+	 49: %f17 (f17)
+	 50: %f18 (f18)
+	 51: %f19 (f19)
+	 52: %f20 (f20)
+	 53: %f21 (f21)
+	 54: %f22 (f22)
+	 55: %f23 (f23)
+	 56: %f24 (f24)
+	 57: %f25 (f25)
+	 58: %f26 (f26)
+	 59: %f27 (f27)
+	 60: %f28 (f28)
+	 61: %f29 (f29)
+	 62: %f30 (f30)
+	 63: %f31 (f31)
+	 64: %f32 (f32)
+	 65: %f33 (f33)
+	 66: %f34 (f34)
+	 67: %f35 (f35)
+	 68: %f36 (f36)
+	 69: %f37 (f37)
+	 70: %f38 (f38)
+	 71: %f39 (f39)
+	 72: %f40 (f40)
+	 73: %f41 (f41)
+	 74: %f42 (f42)
+	 75: %f43 (f43)
+	 76: %f44 (f44)
+	 77: %f45 (f45)
+	 78: %f46 (f46)
+	 79: %f47 (f47)
+	 80: %f48 (f48)
+	 81: %f49 (f49)
+	 82: %f50 (f50)
+	 83: %f51 (f51)
+	 84: %f52 (f52)
+	 85: %f53 (f53)
+	 86: %f54 (f54)
+	 87: %f55 (f55)
+	 88: %f56 (f56)
+	 89: %f57 (f57)
+	 90: %f58 (f58)
+	 91: %f59 (f59)
+	 92: %f60 (f60)
+	 93: %f61 (f61)
+	 94: %f62 (f62)
+	 95: %f63 (f63)
+EOF
+
 exit 0
diff --git a/tests/testfile30.bz2 b/tests/testfile30.bz2
new file mode 100644
index 00000000..9ee93c00
--- /dev/null
+++ b/tests/testfile30.bz2
diff --git a/tests/testfile31.bz2 b/tests/testfile31.bz2
new file mode 100644
index 00000000..73451d22
--- /dev/null
+++ b/tests/testfile31.bz2