* gas/v850/basic.exp (mem_tests): Test instruction bit patterns.

        xfail sst and sld tests.
        (mov_tests): Remove bogus xfail.
        * gas/v850/mem.s: sst and sld instructions can only index from
        "ep" register.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 19f278378c84aefe959325e160707df54f80636b..2e22f158ff7dd307e8ebdccc293a050154221e46 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,6 +1,12 @@
 start-sanitize-v850
 Fri Aug 23 11:02:55 1996  Jeffrey A Law  (law@cygnus.com)
 
+       * gas/v850/basic.exp (mem_tests): Test instruction bit patterns.
+       xfail sst and sld tests.
+       (mov_tests): Remove bogus xfail.
+       * gas/v850/mem.s: sst and sld instructions can only index from
+       "ep" register.
+
        * gas/v850/basic.exp (logical_tests): Test instruction bit patterns.
        Update addresses.
        * gas/v850/logical.s: Tweak constants for better testing.

diff --git a/gas/testsuite/gas/v850/basic.exp b/gas/testsuite/gas/v850/basic.exp
index d883fc768d5c94a6a7ea1dcf43205b96a3898f1c..cf6e866c182e442ca1d1789f9608779b1d94253a 100755 (executable)
--- a/gas/testsuite/gas/v850/basic.exp
+++ b/gas/testsuite/gas/v850/basic.exp
@@ -258,15 +258,15 @@ proc do_mem {} {
     # of instructions (as these tests to).
     while 1 {
        expect {
-           -re "^ +\[0-9\]+ 0000\[^\n\]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 0004\[^\n\]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 0008\[^\n\]*\n"    { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 0000 05370500\[^\n\]*\n"   { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 0004 25370400\[^\n\]*\n"   { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 0008 25370500\[^\n\]*\n"   { set x [expr $x+1] }
            -re "^ +\[0-9\]+ 000c\[^\n\]*\n"    { set x [expr $x+1] }
            -re "^ +\[0-9\]+ 000e\[^\n\]*\n"    { set x [expr $x+1] }
            -re "^ +\[0-9\]+ 0010\[^\n\]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 0012\[^\n\]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 0016\[^\n\]*\n"    { set x [expr $x+1] }
-           -re "^ +\[0-9\]+ 001a\[^\n\]*\n"    { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 0012 462F0500\[^\n\]*\n"   { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 0016 662F0400\[^\n\]*\n"   { set x [expr $x+1] }
+           -re "^ +\[0-9\]+ 001a 662F0500\[^\n\]*\n"   { set x [expr $x+1] }
            -re "^ +\[0-9\]+ 001e\[^\n\]*\n"    { set x [expr $x+1] }
            -re "^ +\[0-9\]+ 0020\[^\n\]*\n"    { set x [expr $x+1] }
            -re "^ +\[0-9\]+ 0022\[^\n\]*\n"    { set x [expr $x+1] }
@@ -282,6 +282,12 @@ proc do_mem {} {
 
     # Did we find what we were looking for?  If not, flunk it.
     if [expr $x==12] then { pass $testname } else { fail $testname }
+
+    setup_xfail v850*-*-*
+    fail "sld and sst instructions improperly assembled."
+
+    setup_xfail v850*-*-*
+    fail "sld and sst instructions did not catch improper index assembled."
 }
 
 proc do_misc {} {
@@ -344,7 +350,7 @@ proc do_move {} {
     gas_finish
 
     # Did we find what we were looking for?  If not, flunk it.
-    if [expr $x==4] then { pass $testname } else { setup_xfail "*-*-*" ; fail $testname }
+    if [expr $x==4] then { pass $testname } else { fail $testname }
 }
 
 if [istarget v850*-*-*] then {

diff --git a/gas/testsuite/gas/v850/mem.s b/gas/testsuite/gas/v850/mem.s
index a87ff55c992f256a04f8f36a4bda27f60d678289..00e895292abc3310dda7cc4ad9ef64a1fc9772b7 100644 (file)
--- a/gas/testsuite/gas/v850/mem.s
+++ b/gas/testsuite/gas/v850/mem.s
@@ -5,12 +5,12 @@ memory:
        ld.b 5[r5],r6
        ld.h 4[r5],r6
        ld.w 4[r5],r6
-       sld.b -64[r5],r6
-       sld.h 128[r5],r6
-       sld.w 128[r5],r6
+       sld.b -64[ep],r6
+       sld.h 128[ep],r6
+       sld.w 128[ep],r6
        st.b r5,5[r6]
        st.h r5,4[r6]
        st.w r5,4[r6]
-       sst.b r5,63[r6]
-       sst.h r5,128[r6]
-       sst.w r5,128[r6]
+       sst.b r5,63[ep]
+       sst.h r5,128[ep]
+       sst.w r5,128[ep]