* gas/hppa/basic/basic.exp (do_system): Adjust for removal of lha

	instructions from system.s.
	* gas/hppa/basic/system.s (lha): Remove.

	* hppa.h (pa_opcodes): Remove lha entries.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 31f56dd..93ed0b0 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-12  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+       * gas/hppa/basic/basic.exp (do_system): Adjust for removal of lha
+       instructions from system.s.
+       * gas/hppa/basic/system.s (lha): Remove.
+
 2005-10-12  Jan Beulich  <jbeulich@novell.com>
 
        * gas/ia64/forward.[sd]: New.

diff --git a/gas/testsuite/gas/hppa/basic/basic.exp b/gas/testsuite/gas/hppa/basic/basic.exp
index 5cfd603..5ad43b3 100644 (file)
--- a/gas/testsuite/gas/hppa/basic/basic.exp
+++ b/gas/testsuite/gas/hppa/basic/basic.exp
@@ -2881,12 +2881,10 @@ proc do_system {} {
            -re "^ +\[0-9\]+ 0048 04A41346\[^\n]*\n"    { set x [expr $x+1] }
            -re "^ +\[0-9\]+ 004c 04A41366\[^\n]*\n"    { set x [expr $x+1] }
            -re "^ +\[0-9\]+ 0050 04A41306\[^\n]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 0054 04A41326\[^\n]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 0058 04A41306\[^\n]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 005c 04A41040\[^\n]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 0060 04A42040\[^\n]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 0064 04A41000\[^\n]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 0068 04A42000\[^\n]*\n"    { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 0054 04A41040\[^\n]*\n"    { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 0058 04A42040\[^\n]*\n"    { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 005c 04A41000\[^\n]*\n"    { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 0060 04A42000\[^\n]*\n"    { set x [expr $x+1] }
            -re "\[^\n\]*\n"                            { }
            timeout                             { perror "timeout\n"; break }
            eof                                 { break }
@@ -2898,7 +2896,7 @@ proc do_system {} {
     gas_finish
 
     # Did we find what we were looking for?  If not, flunk it.
-    if [expr $x==27] then { pass $testname } else { fail $testname }
+    if [expr $x==25] then { pass $testname } else { fail $testname }
 }
 
 proc do_system2 {} {

diff --git a/gas/testsuite/gas/hppa/basic/system.s b/gas/testsuite/gas/hppa/basic/system.s
index 2cadc39..857ea49 100644 (file)
--- a/gas/testsuite/gas/hppa/basic/system.s
+++ b/gas/testsuite/gas/hppa/basic/system.s
@@ -28,8 +28,6 @@
        
        lpa %r4(%sr0,%r5),%r6
        lpa,m %r4(%sr0,%r5),%r6
-       lha %r4(%sr0,%r5),%r6
-       lha,m %r4(%sr0,%r5),%r6
        lci %r4(%sr0,%r5),%r6
 
        idtlba %r4,(%sr0,%r5)

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index cf31d8d..15aca11 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-12  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+       * hppa.h (pa_opcodes): Remove lha entries.
+
 2005-10-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        * hppa.h (FLAG_STRICT): Revise comment.

diff --git a/include/opcode/hppa.h b/include/opcode/hppa.h
index af1be47..9bb78e1 100644 (file)
--- a/include/opcode/hppa.h
+++ b/include/opcode/hppa.h
@@ -755,10 +755,8 @@ static const struct pa_opcode pa_opcodes[] =
 { "probewi",   0x040031c0, 0xfc003fe0, "(s,b),R,t", pa10, 0},
 { "lpa",       0x04001340, 0xfc00ffc0, "cZx(b),t", pa10, 0},
 { "lpa",       0x04001340, 0xfc003fc0, "cZx(s,b),t", pa10, 0},
-{ "lha",       0x04001300, 0xfc00ffc0, "cZx(b),t", pa10, 0},
-{ "lha",       0x04001300, 0xfc003fc0, "cZx(s,b),t", pa10, 0},
-{ "lci",       0x04001300, 0xfc00ffe0, "x(b),t", pa10, 0},
-{ "lci",       0x04001300, 0xfc003fe0, "x(s,b),t", pa10, 0},
+{ "lci",       0x04001300, 0xfc00ffe0, "x(b),t", pa11, 0},
+{ "lci",       0x04001300, 0xfc003fe0, "x(s,b),t", pa11, 0},
 { "pdtlb",     0x04001600, 0xfc00ffdf, "cLcZx(b)", pa20, FLAG_STRICT},
 { "pdtlb",     0x04001600, 0xfc003fdf, "cLcZx(s,b)", pa20, FLAG_STRICT},
 { "pdtlb",     0x04001600, 0xfc1fffdf, "cLcZ@(b)", pa20, FLAG_STRICT},