Tue Dec 8 13:16:53 1998 Dave Brolley <brolley@cygnus.com>

	* sim/fr30/testutils.inc (set_s_user): Correct Mask.
	(set_s_system): Correct Mask.
	* sim/fr30/ld.cgs (ld): Move previously failing test back
	into place.

diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index 3a6b081b4e379d1e812c2edfbcf7fab04780eb5c..36747923a11c2a3d7c8738da9dfc6bfc658dddf7 100644 (file)
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,5 +1,17 @@
+Tue Dec  8 13:16:53 1998  Dave Brolley  <brolley@cygnus.com>
+
+       * sim/fr30/testutils.inc (set_s_user): Correct Mask.
+       (set_s_system): Correct Mask.
+       * sim/fr30/ld.cgs (ld): Move previously failing test back
+       into place.
+
 Thu Dec  3 14:20:03 1998  Dave Brolley  <brolley@cygnus.com>
 
+       * sim/fr30/ld.cgs: Implement more loads.
+       * sim/fr30/call.cgs: New testcase.
+       * sim/fr30/testutils.inc (testr_h_dr): New macro.
+       (set_s_user,set_s_system): New macros.
+
        * sim/fr30: New Directory.
 
 Wed Nov 18 10:50:19 1998  Andrew Cagney  <cagney@b1.cygnus.com>

diff --git a/sim/testsuite/sim/fr30/ld.cgs b/sim/testsuite/sim/fr30/ld.cgs
index 1d7ae0751ca299afba191d6cc1e4a6d8f605a30c..9ff8a75d74d1ee8c29f4b33e2e80a347bcff7a77 100644 (file)
--- a/sim/testsuite/sim/fr30/ld.cgs
+++ b/sim/testsuite/sim/fr30/ld.cgs
@@ -151,6 +151,12 @@ ld:
        test_h_gr       0xdeadbeef,r7
        testr_h_gr      sp,r9           ; should have been incremented
 
+       mvr_h_gr        r8,sp           ; restore original stack pointer
+       set_cc          0x0f            ; condition codes should not change
+       ld              @r15+,sp
+       test_cc         1 1 1 1
+       test_h_gr       0xdeadbeef,sp   ; should not have been incremented
+
        ; Test ld @$R15+,$Rs
        mvr_h_gr        r8,sp           ; restore original stack pointer
        set_cc          0x0f            ; condition codes should not change
@@ -211,10 +217,4 @@ ld:
        test_h_dr       0xdeadbeef,ssp
        test_h_gr       0xdeadbeef,sp   ; should not have been incremented
 
-       mvr_h_gr        r8,sp           ; restore original stack pointer
-       set_cc          0x0f            ; condition codes should not change
-       ld              @r15+,sp
-       test_cc         1 1 1 1
-       test_h_gr       0xdeadbeef,sp   ; should not have been incremented
-
        pass

diff --git a/sim/testsuite/sim/fr30/testutils.inc b/sim/testsuite/sim/fr30/testutils.inc
index 06b106347dc6629e42430315b21c398ea6d5750d..90e18dd38138ca68a5e1083bdc1d9ffc96226167 100644 (file)
--- a/sim/testsuite/sim/fr30/testutils.inc
+++ b/sim/testsuite/sim/fr30/testutils.inc
@@ -120,6 +120,12 @@ testr_gr\@:
        test_h_gr \val r5
        .endm
 
+; Compare a general register with word in memory
+       .macro testr_h_mem reg addr
+       ldmem_h_gr \addr r5
+       testr_h_gr \reg r5
+       .endm
+
 ; Set the condition codes
        .macro set_cc mask
        andccr  0xf0
@@ -128,11 +134,11 @@ testr_gr\@:
 
 ; Set the stack mode
        .macro set_s_user
-       orccr   0x10
+       orccr   0x20
        .endm
 
        .macro set_s_system
-       andccr  0xef
+       andccr  0x1f
        .endm
 
 ; Test the condition codes