sim: testsuite: flatten tree

Now that all port tests live under testsuite/sim/*/, and none live
in testsuite/ directly, flatten the structure by moving all of the
dirs under testsuite/sim/ to testsuite/ directly.

We need to stop passing --tool to dejagnu so that it searches all
dirs and not just ones that start with "sim".  Since we have no
other dirs in this tree, and no plans to add any, should be fine.

diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index fc5806e36b679e943f813ec36639df7d6841a847..4271705fb30bdc82cd599b3e673619149ebbe9c6 100644 (file)
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-15  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (site.exp): Delete tool setting.
+       * sim/*/: Move subdirs up a directory.
+
 2021-01-15  Mike Frysinger  <vapier@gentoo.org>
 
        * configure, configure.ac: Delete.

diff --git a/sim/testsuite/Makefile.in b/sim/testsuite/Makefile.in
index 1f75db6a5539d1cc43fdbae3892ee025def9feb6..1e4604cea68c305edcfb28d6711244ef5317bd45 100644 (file)
--- a/sim/testsuite/Makefile.in
+++ b/sim/testsuite/Makefile.in
@@ -127,7 +127,6 @@ site.exp: Makefile
        @echo '## these variables are automatically generated by make ##' > $@-t
        @echo '# Do not edit here.  If you wish to override these values' >> $@-t
        @echo '# edit the last section' >> $@-t
-       @echo 'set tool sim' >> $@-t
        @echo 'set srcdir $(srcdir)' >> $@-t
        @echo 'set objdir' `pwd` >> $@-t
        @echo 'set arch $(arch)' >> $@-t

diff --git a/sim/testsuite/sim/aarch64/ChangeLog b/sim/testsuite/aarch64/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/aarch64/ChangeLog
rename to sim/testsuite/aarch64/ChangeLog

diff --git a/sim/testsuite/sim/aarch64/adds.s b/sim/testsuite/aarch64/adds.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/adds.s
rename to sim/testsuite/aarch64/adds.s

diff --git a/sim/testsuite/sim/aarch64/addv.s b/sim/testsuite/aarch64/addv.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/addv.s
rename to sim/testsuite/aarch64/addv.s

diff --git a/sim/testsuite/sim/aarch64/allinsn.exp b/sim/testsuite/aarch64/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/aarch64/allinsn.exp
rename to sim/testsuite/aarch64/allinsn.exp

diff --git a/sim/testsuite/sim/aarch64/bit.s b/sim/testsuite/aarch64/bit.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/bit.s
rename to sim/testsuite/aarch64/bit.s

diff --git a/sim/testsuite/sim/aarch64/cmtst.s b/sim/testsuite/aarch64/cmtst.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/cmtst.s
rename to sim/testsuite/aarch64/cmtst.s

diff --git a/sim/testsuite/sim/aarch64/cnt.s b/sim/testsuite/aarch64/cnt.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/cnt.s
rename to sim/testsuite/aarch64/cnt.s

diff --git a/sim/testsuite/sim/aarch64/fcmXX.s b/sim/testsuite/aarch64/fcmXX.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/fcmXX.s
rename to sim/testsuite/aarch64/fcmXX.s

diff --git a/sim/testsuite/sim/aarch64/fcmp.s b/sim/testsuite/aarch64/fcmp.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/fcmp.s
rename to sim/testsuite/aarch64/fcmp.s

diff --git a/sim/testsuite/sim/aarch64/fcsel.s b/sim/testsuite/aarch64/fcsel.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/fcsel.s
rename to sim/testsuite/aarch64/fcsel.s

diff --git a/sim/testsuite/sim/aarch64/fcvtl.s b/sim/testsuite/aarch64/fcvtl.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/fcvtl.s
rename to sim/testsuite/aarch64/fcvtl.s

diff --git a/sim/testsuite/sim/aarch64/fcvtz.s b/sim/testsuite/aarch64/fcvtz.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/fcvtz.s
rename to sim/testsuite/aarch64/fcvtz.s

diff --git a/sim/testsuite/sim/aarch64/fminnm.s b/sim/testsuite/aarch64/fminnm.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/fminnm.s
rename to sim/testsuite/aarch64/fminnm.s

diff --git a/sim/testsuite/sim/aarch64/fstur.s b/sim/testsuite/aarch64/fstur.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/fstur.s
rename to sim/testsuite/aarch64/fstur.s

diff --git a/sim/testsuite/sim/aarch64/ldn_multiple.s b/sim/testsuite/aarch64/ldn_multiple.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/ldn_multiple.s
rename to sim/testsuite/aarch64/ldn_multiple.s

diff --git a/sim/testsuite/sim/aarch64/ldn_single.s b/sim/testsuite/aarch64/ldn_single.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/ldn_single.s
rename to sim/testsuite/aarch64/ldn_single.s

diff --git a/sim/testsuite/sim/aarch64/ldnr.s b/sim/testsuite/aarch64/ldnr.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/ldnr.s
rename to sim/testsuite/aarch64/ldnr.s

diff --git a/sim/testsuite/sim/aarch64/mla.s b/sim/testsuite/aarch64/mla.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/mla.s
rename to sim/testsuite/aarch64/mla.s

diff --git a/sim/testsuite/sim/aarch64/mls.s b/sim/testsuite/aarch64/mls.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/mls.s
rename to sim/testsuite/aarch64/mls.s

diff --git a/sim/testsuite/sim/aarch64/mul.s b/sim/testsuite/aarch64/mul.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/mul.s
rename to sim/testsuite/aarch64/mul.s

diff --git a/sim/testsuite/sim/aarch64/pass.s b/sim/testsuite/aarch64/pass.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/pass.s
rename to sim/testsuite/aarch64/pass.s

diff --git a/sim/testsuite/sim/aarch64/stn_multiple.s b/sim/testsuite/aarch64/stn_multiple.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/stn_multiple.s
rename to sim/testsuite/aarch64/stn_multiple.s

diff --git a/sim/testsuite/sim/aarch64/stn_single.s b/sim/testsuite/aarch64/stn_single.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/stn_single.s
rename to sim/testsuite/aarch64/stn_single.s

diff --git a/sim/testsuite/sim/aarch64/sumov.s b/sim/testsuite/aarch64/sumov.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/sumov.s
rename to sim/testsuite/aarch64/sumov.s

diff --git a/sim/testsuite/sim/aarch64/sumulh.s b/sim/testsuite/aarch64/sumulh.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/sumulh.s
rename to sim/testsuite/aarch64/sumulh.s

diff --git a/sim/testsuite/sim/aarch64/tbnz.s b/sim/testsuite/aarch64/tbnz.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/tbnz.s
rename to sim/testsuite/aarch64/tbnz.s

diff --git a/sim/testsuite/sim/aarch64/testutils.inc b/sim/testsuite/aarch64/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/aarch64/testutils.inc
rename to sim/testsuite/aarch64/testutils.inc

diff --git a/sim/testsuite/sim/aarch64/uzp.s b/sim/testsuite/aarch64/uzp.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/uzp.s
rename to sim/testsuite/aarch64/uzp.s

diff --git a/sim/testsuite/sim/aarch64/xtl.s b/sim/testsuite/aarch64/xtl.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/xtl.s
rename to sim/testsuite/aarch64/xtl.s

diff --git a/sim/testsuite/sim/aarch64/xtn.s b/sim/testsuite/aarch64/xtn.s
similarity index 100%
rename from sim/testsuite/sim/aarch64/xtn.s
rename to sim/testsuite/aarch64/xtn.s

diff --git a/sim/testsuite/sim/arm/ChangeLog b/sim/testsuite/arm/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/arm/ChangeLog
rename to sim/testsuite/arm/ChangeLog

diff --git a/sim/testsuite/sim/arm/adc.cgs b/sim/testsuite/arm/adc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/adc.cgs
rename to sim/testsuite/arm/adc.cgs

diff --git a/sim/testsuite/sim/arm/add.cgs b/sim/testsuite/arm/add.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/add.cgs
rename to sim/testsuite/arm/add.cgs

diff --git a/sim/testsuite/sim/arm/allinsn.exp b/sim/testsuite/arm/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/arm/allinsn.exp
rename to sim/testsuite/arm/allinsn.exp

diff --git a/sim/testsuite/sim/arm/and.cgs b/sim/testsuite/arm/and.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/and.cgs
rename to sim/testsuite/arm/and.cgs

diff --git a/sim/testsuite/sim/arm/b.cgs b/sim/testsuite/arm/b.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/b.cgs
rename to sim/testsuite/arm/b.cgs

diff --git a/sim/testsuite/sim/arm/bic.cgs b/sim/testsuite/arm/bic.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/bic.cgs
rename to sim/testsuite/arm/bic.cgs

diff --git a/sim/testsuite/sim/arm/bl.cgs b/sim/testsuite/arm/bl.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/bl.cgs
rename to sim/testsuite/arm/bl.cgs

diff --git a/sim/testsuite/sim/arm/bx.cgs b/sim/testsuite/arm/bx.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/bx.cgs
rename to sim/testsuite/arm/bx.cgs

diff --git a/sim/testsuite/sim/arm/cmn.cgs b/sim/testsuite/arm/cmn.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/cmn.cgs
rename to sim/testsuite/arm/cmn.cgs

diff --git a/sim/testsuite/sim/arm/cmp.cgs b/sim/testsuite/arm/cmp.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/cmp.cgs
rename to sim/testsuite/arm/cmp.cgs

diff --git a/sim/testsuite/sim/arm/eor.cgs b/sim/testsuite/arm/eor.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/eor.cgs
rename to sim/testsuite/arm/eor.cgs

diff --git a/sim/testsuite/sim/arm/hello.ms b/sim/testsuite/arm/hello.ms
similarity index 100%
rename from sim/testsuite/sim/arm/hello.ms
rename to sim/testsuite/arm/hello.ms

diff --git a/sim/testsuite/sim/arm/iwmmxt/iwmmxt.exp b/sim/testsuite/arm/iwmmxt/iwmmxt.exp
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/iwmmxt.exp
rename to sim/testsuite/arm/iwmmxt/iwmmxt.exp

diff --git a/sim/testsuite/sim/arm/iwmmxt/tbcst.cgs b/sim/testsuite/arm/iwmmxt/tbcst.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/tbcst.cgs
rename to sim/testsuite/arm/iwmmxt/tbcst.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/testutils.inc b/sim/testsuite/arm/iwmmxt/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/testutils.inc
rename to sim/testsuite/arm/iwmmxt/testutils.inc

diff --git a/sim/testsuite/sim/arm/iwmmxt/textrm.cgs b/sim/testsuite/arm/iwmmxt/textrm.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/textrm.cgs
rename to sim/testsuite/arm/iwmmxt/textrm.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/tinsr.cgs b/sim/testsuite/arm/iwmmxt/tinsr.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/tinsr.cgs
rename to sim/testsuite/arm/iwmmxt/tinsr.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/tmia.cgs b/sim/testsuite/arm/iwmmxt/tmia.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/tmia.cgs
rename to sim/testsuite/arm/iwmmxt/tmia.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/tmiaph.cgs b/sim/testsuite/arm/iwmmxt/tmiaph.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/tmiaph.cgs
rename to sim/testsuite/arm/iwmmxt/tmiaph.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/tmiaxy.cgs b/sim/testsuite/arm/iwmmxt/tmiaxy.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/tmiaxy.cgs
rename to sim/testsuite/arm/iwmmxt/tmiaxy.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/tmovmsk.cgs b/sim/testsuite/arm/iwmmxt/tmovmsk.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/tmovmsk.cgs
rename to sim/testsuite/arm/iwmmxt/tmovmsk.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wacc.cgs b/sim/testsuite/arm/iwmmxt/wacc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wacc.cgs
rename to sim/testsuite/arm/iwmmxt/wacc.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wadd.cgs b/sim/testsuite/arm/iwmmxt/wadd.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wadd.cgs
rename to sim/testsuite/arm/iwmmxt/wadd.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/waligni.cgs b/sim/testsuite/arm/iwmmxt/waligni.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/waligni.cgs
rename to sim/testsuite/arm/iwmmxt/waligni.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/walignr.cgs b/sim/testsuite/arm/iwmmxt/walignr.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/walignr.cgs
rename to sim/testsuite/arm/iwmmxt/walignr.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wand.cgs b/sim/testsuite/arm/iwmmxt/wand.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wand.cgs
rename to sim/testsuite/arm/iwmmxt/wand.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wandn.cgs b/sim/testsuite/arm/iwmmxt/wandn.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wandn.cgs
rename to sim/testsuite/arm/iwmmxt/wandn.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wavg2.cgs b/sim/testsuite/arm/iwmmxt/wavg2.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wavg2.cgs
rename to sim/testsuite/arm/iwmmxt/wavg2.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wcmpeq.cgs b/sim/testsuite/arm/iwmmxt/wcmpeq.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wcmpeq.cgs
rename to sim/testsuite/arm/iwmmxt/wcmpeq.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wcmpgt.cgs b/sim/testsuite/arm/iwmmxt/wcmpgt.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wcmpgt.cgs
rename to sim/testsuite/arm/iwmmxt/wcmpgt.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wmac.cgs b/sim/testsuite/arm/iwmmxt/wmac.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wmac.cgs
rename to sim/testsuite/arm/iwmmxt/wmac.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wmadd.cgs b/sim/testsuite/arm/iwmmxt/wmadd.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wmadd.cgs
rename to sim/testsuite/arm/iwmmxt/wmadd.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wmax.cgs b/sim/testsuite/arm/iwmmxt/wmax.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wmax.cgs
rename to sim/testsuite/arm/iwmmxt/wmax.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wmin.cgs b/sim/testsuite/arm/iwmmxt/wmin.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wmin.cgs
rename to sim/testsuite/arm/iwmmxt/wmin.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wmov.cgs b/sim/testsuite/arm/iwmmxt/wmov.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wmov.cgs
rename to sim/testsuite/arm/iwmmxt/wmov.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wmul.cgs b/sim/testsuite/arm/iwmmxt/wmul.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wmul.cgs
rename to sim/testsuite/arm/iwmmxt/wmul.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wor.cgs b/sim/testsuite/arm/iwmmxt/wor.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wor.cgs
rename to sim/testsuite/arm/iwmmxt/wor.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wpack.cgs b/sim/testsuite/arm/iwmmxt/wpack.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wpack.cgs
rename to sim/testsuite/arm/iwmmxt/wpack.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wror.cgs b/sim/testsuite/arm/iwmmxt/wror.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wror.cgs
rename to sim/testsuite/arm/iwmmxt/wror.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wsad.cgs b/sim/testsuite/arm/iwmmxt/wsad.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wsad.cgs
rename to sim/testsuite/arm/iwmmxt/wsad.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wshufh.cgs b/sim/testsuite/arm/iwmmxt/wshufh.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wshufh.cgs
rename to sim/testsuite/arm/iwmmxt/wshufh.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wsll.cgs b/sim/testsuite/arm/iwmmxt/wsll.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wsll.cgs
rename to sim/testsuite/arm/iwmmxt/wsll.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wsra.cgs b/sim/testsuite/arm/iwmmxt/wsra.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wsra.cgs
rename to sim/testsuite/arm/iwmmxt/wsra.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wsrl.cgs b/sim/testsuite/arm/iwmmxt/wsrl.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wsrl.cgs
rename to sim/testsuite/arm/iwmmxt/wsrl.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wsub.cgs b/sim/testsuite/arm/iwmmxt/wsub.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wsub.cgs
rename to sim/testsuite/arm/iwmmxt/wsub.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wunpckeh.cgs b/sim/testsuite/arm/iwmmxt/wunpckeh.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wunpckeh.cgs
rename to sim/testsuite/arm/iwmmxt/wunpckeh.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wunpckel.cgs b/sim/testsuite/arm/iwmmxt/wunpckel.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wunpckel.cgs
rename to sim/testsuite/arm/iwmmxt/wunpckel.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wunpckih.cgs b/sim/testsuite/arm/iwmmxt/wunpckih.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wunpckih.cgs
rename to sim/testsuite/arm/iwmmxt/wunpckih.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wunpckil.cgs b/sim/testsuite/arm/iwmmxt/wunpckil.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wunpckil.cgs
rename to sim/testsuite/arm/iwmmxt/wunpckil.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wxor.cgs b/sim/testsuite/arm/iwmmxt/wxor.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wxor.cgs
rename to sim/testsuite/arm/iwmmxt/wxor.cgs

diff --git a/sim/testsuite/sim/arm/iwmmxt/wzero.cgs b/sim/testsuite/arm/iwmmxt/wzero.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/iwmmxt/wzero.cgs
rename to sim/testsuite/arm/iwmmxt/wzero.cgs

diff --git a/sim/testsuite/sim/arm/ldm.cgs b/sim/testsuite/arm/ldm.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/ldm.cgs
rename to sim/testsuite/arm/ldm.cgs

diff --git a/sim/testsuite/sim/arm/ldr.cgs b/sim/testsuite/arm/ldr.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/ldr.cgs
rename to sim/testsuite/arm/ldr.cgs

diff --git a/sim/testsuite/sim/arm/ldrb.cgs b/sim/testsuite/arm/ldrb.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/ldrb.cgs
rename to sim/testsuite/arm/ldrb.cgs

diff --git a/sim/testsuite/sim/arm/ldrh.cgs b/sim/testsuite/arm/ldrh.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/ldrh.cgs
rename to sim/testsuite/arm/ldrh.cgs

diff --git a/sim/testsuite/sim/arm/ldrsb.cgs b/sim/testsuite/arm/ldrsb.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/ldrsb.cgs
rename to sim/testsuite/arm/ldrsb.cgs

diff --git a/sim/testsuite/sim/arm/ldrsh.cgs b/sim/testsuite/arm/ldrsh.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/ldrsh.cgs
rename to sim/testsuite/arm/ldrsh.cgs

diff --git a/sim/testsuite/sim/arm/misaligned1.ms b/sim/testsuite/arm/misaligned1.ms
similarity index 100%
rename from sim/testsuite/sim/arm/misaligned1.ms
rename to sim/testsuite/arm/misaligned1.ms

diff --git a/sim/testsuite/sim/arm/misaligned2.ms b/sim/testsuite/arm/misaligned2.ms
similarity index 100%
rename from sim/testsuite/sim/arm/misaligned2.ms
rename to sim/testsuite/arm/misaligned2.ms

diff --git a/sim/testsuite/sim/arm/misaligned3.ms b/sim/testsuite/arm/misaligned3.ms
similarity index 100%
rename from sim/testsuite/sim/arm/misaligned3.ms
rename to sim/testsuite/arm/misaligned3.ms

diff --git a/sim/testsuite/sim/arm/misc.exp b/sim/testsuite/arm/misc.exp
similarity index 100%
rename from sim/testsuite/sim/arm/misc.exp
rename to sim/testsuite/arm/misc.exp

diff --git a/sim/testsuite/sim/arm/mla.cgs b/sim/testsuite/arm/mla.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/mla.cgs
rename to sim/testsuite/arm/mla.cgs

diff --git a/sim/testsuite/sim/arm/mov.cgs b/sim/testsuite/arm/mov.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/mov.cgs
rename to sim/testsuite/arm/mov.cgs

diff --git a/sim/testsuite/sim/arm/movw-movt.ms b/sim/testsuite/arm/movw-movt.ms
similarity index 100%
rename from sim/testsuite/sim/arm/movw-movt.ms
rename to sim/testsuite/arm/movw-movt.ms

diff --git a/sim/testsuite/sim/arm/mrs.cgs b/sim/testsuite/arm/mrs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/mrs.cgs
rename to sim/testsuite/arm/mrs.cgs

diff --git a/sim/testsuite/sim/arm/msr.cgs b/sim/testsuite/arm/msr.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/msr.cgs
rename to sim/testsuite/arm/msr.cgs

diff --git a/sim/testsuite/sim/arm/mul.cgs b/sim/testsuite/arm/mul.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/mul.cgs
rename to sim/testsuite/arm/mul.cgs

diff --git a/sim/testsuite/sim/arm/mvn.cgs b/sim/testsuite/arm/mvn.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/mvn.cgs
rename to sim/testsuite/arm/mvn.cgs

diff --git a/sim/testsuite/sim/arm/orr.cgs b/sim/testsuite/arm/orr.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/orr.cgs
rename to sim/testsuite/arm/orr.cgs

diff --git a/sim/testsuite/sim/arm/rsb.cgs b/sim/testsuite/arm/rsb.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/rsb.cgs
rename to sim/testsuite/arm/rsb.cgs

diff --git a/sim/testsuite/sim/arm/rsc.cgs b/sim/testsuite/arm/rsc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/rsc.cgs
rename to sim/testsuite/arm/rsc.cgs

diff --git a/sim/testsuite/sim/arm/sbc.cgs b/sim/testsuite/arm/sbc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/sbc.cgs
rename to sim/testsuite/arm/sbc.cgs

diff --git a/sim/testsuite/sim/arm/smlal.cgs b/sim/testsuite/arm/smlal.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/smlal.cgs
rename to sim/testsuite/arm/smlal.cgs

diff --git a/sim/testsuite/sim/arm/smull.cgs b/sim/testsuite/arm/smull.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/smull.cgs
rename to sim/testsuite/arm/smull.cgs

diff --git a/sim/testsuite/sim/arm/stm.cgs b/sim/testsuite/arm/stm.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/stm.cgs
rename to sim/testsuite/arm/stm.cgs

diff --git a/sim/testsuite/sim/arm/str.cgs b/sim/testsuite/arm/str.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/str.cgs
rename to sim/testsuite/arm/str.cgs

diff --git a/sim/testsuite/sim/arm/strb.cgs b/sim/testsuite/arm/strb.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/strb.cgs
rename to sim/testsuite/arm/strb.cgs

diff --git a/sim/testsuite/sim/arm/strh.cgs b/sim/testsuite/arm/strh.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/strh.cgs
rename to sim/testsuite/arm/strh.cgs

diff --git a/sim/testsuite/sim/arm/sub.cgs b/sim/testsuite/arm/sub.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/sub.cgs
rename to sim/testsuite/arm/sub.cgs

diff --git a/sim/testsuite/sim/arm/swi.cgs b/sim/testsuite/arm/swi.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/swi.cgs
rename to sim/testsuite/arm/swi.cgs

diff --git a/sim/testsuite/sim/arm/swp.cgs b/sim/testsuite/arm/swp.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/swp.cgs
rename to sim/testsuite/arm/swp.cgs

diff --git a/sim/testsuite/sim/arm/swpb.cgs b/sim/testsuite/arm/swpb.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/swpb.cgs
rename to sim/testsuite/arm/swpb.cgs

diff --git a/sim/testsuite/sim/arm/teq.cgs b/sim/testsuite/arm/teq.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/teq.cgs
rename to sim/testsuite/arm/teq.cgs

diff --git a/sim/testsuite/sim/arm/testutils.inc b/sim/testsuite/arm/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/arm/testutils.inc
rename to sim/testsuite/arm/testutils.inc

diff --git a/sim/testsuite/sim/arm/thumb/adc.cgs b/sim/testsuite/arm/thumb/adc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/adc.cgs
rename to sim/testsuite/arm/thumb/adc.cgs

diff --git a/sim/testsuite/sim/arm/thumb/add-hd-hs.cgs b/sim/testsuite/arm/thumb/add-hd-hs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/add-hd-hs.cgs
rename to sim/testsuite/arm/thumb/add-hd-hs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/add-hd-rs.cgs b/sim/testsuite/arm/thumb/add-hd-rs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/add-hd-rs.cgs
rename to sim/testsuite/arm/thumb/add-hd-rs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/add-rd-hs.cgs b/sim/testsuite/arm/thumb/add-rd-hs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/add-rd-hs.cgs
rename to sim/testsuite/arm/thumb/add-rd-hs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/add-sp.cgs b/sim/testsuite/arm/thumb/add-sp.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/add-sp.cgs
rename to sim/testsuite/arm/thumb/add-sp.cgs

diff --git a/sim/testsuite/sim/arm/thumb/add.cgs b/sim/testsuite/arm/thumb/add.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/add.cgs
rename to sim/testsuite/arm/thumb/add.cgs

diff --git a/sim/testsuite/sim/arm/thumb/addi.cgs b/sim/testsuite/arm/thumb/addi.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/addi.cgs
rename to sim/testsuite/arm/thumb/addi.cgs

diff --git a/sim/testsuite/sim/arm/thumb/addi8.cgs b/sim/testsuite/arm/thumb/addi8.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/addi8.cgs
rename to sim/testsuite/arm/thumb/addi8.cgs

diff --git a/sim/testsuite/sim/arm/thumb/allthumb.exp b/sim/testsuite/arm/thumb/allthumb.exp
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/allthumb.exp
rename to sim/testsuite/arm/thumb/allthumb.exp

diff --git a/sim/testsuite/sim/arm/thumb/and.cgs b/sim/testsuite/arm/thumb/and.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/and.cgs
rename to sim/testsuite/arm/thumb/and.cgs

diff --git a/sim/testsuite/sim/arm/thumb/asr.cgs b/sim/testsuite/arm/thumb/asr.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/asr.cgs
rename to sim/testsuite/arm/thumb/asr.cgs

diff --git a/sim/testsuite/sim/arm/thumb/b.cgs b/sim/testsuite/arm/thumb/b.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/b.cgs
rename to sim/testsuite/arm/thumb/b.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bcc.cgs b/sim/testsuite/arm/thumb/bcc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bcc.cgs
rename to sim/testsuite/arm/thumb/bcc.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bcs.cgs b/sim/testsuite/arm/thumb/bcs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bcs.cgs
rename to sim/testsuite/arm/thumb/bcs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/beq.cgs b/sim/testsuite/arm/thumb/beq.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/beq.cgs
rename to sim/testsuite/arm/thumb/beq.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bge.cgs b/sim/testsuite/arm/thumb/bge.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bge.cgs
rename to sim/testsuite/arm/thumb/bge.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bgt.cgs b/sim/testsuite/arm/thumb/bgt.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bgt.cgs
rename to sim/testsuite/arm/thumb/bgt.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bhi.cgs b/sim/testsuite/arm/thumb/bhi.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bhi.cgs
rename to sim/testsuite/arm/thumb/bhi.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bic.cgs b/sim/testsuite/arm/thumb/bic.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bic.cgs
rename to sim/testsuite/arm/thumb/bic.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bl-hi.cgs b/sim/testsuite/arm/thumb/bl-hi.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bl-hi.cgs
rename to sim/testsuite/arm/thumb/bl-hi.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bl-lo.cgs b/sim/testsuite/arm/thumb/bl-lo.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bl-lo.cgs
rename to sim/testsuite/arm/thumb/bl-lo.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ble.cgs b/sim/testsuite/arm/thumb/ble.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ble.cgs
rename to sim/testsuite/arm/thumb/ble.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bls.cgs b/sim/testsuite/arm/thumb/bls.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bls.cgs
rename to sim/testsuite/arm/thumb/bls.cgs

diff --git a/sim/testsuite/sim/arm/thumb/blt.cgs b/sim/testsuite/arm/thumb/blt.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/blt.cgs
rename to sim/testsuite/arm/thumb/blt.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bmi.cgs b/sim/testsuite/arm/thumb/bmi.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bmi.cgs
rename to sim/testsuite/arm/thumb/bmi.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bne.cgs b/sim/testsuite/arm/thumb/bne.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bne.cgs
rename to sim/testsuite/arm/thumb/bne.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bpl.cgs b/sim/testsuite/arm/thumb/bpl.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bpl.cgs
rename to sim/testsuite/arm/thumb/bpl.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bvc.cgs b/sim/testsuite/arm/thumb/bvc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bvc.cgs
rename to sim/testsuite/arm/thumb/bvc.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bvs.cgs b/sim/testsuite/arm/thumb/bvs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bvs.cgs
rename to sim/testsuite/arm/thumb/bvs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bx-hs.cgs b/sim/testsuite/arm/thumb/bx-hs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bx-hs.cgs
rename to sim/testsuite/arm/thumb/bx-hs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/bx-rs.cgs b/sim/testsuite/arm/thumb/bx-rs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/bx-rs.cgs
rename to sim/testsuite/arm/thumb/bx-rs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/cmn.cgs b/sim/testsuite/arm/thumb/cmn.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/cmn.cgs
rename to sim/testsuite/arm/thumb/cmn.cgs

diff --git a/sim/testsuite/sim/arm/thumb/cmp-hd-hs.cgs b/sim/testsuite/arm/thumb/cmp-hd-hs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/cmp-hd-hs.cgs
rename to sim/testsuite/arm/thumb/cmp-hd-hs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/cmp-hd-rs.cgs b/sim/testsuite/arm/thumb/cmp-hd-rs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/cmp-hd-rs.cgs
rename to sim/testsuite/arm/thumb/cmp-hd-rs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/cmp-rd-hs.cgs b/sim/testsuite/arm/thumb/cmp-rd-hs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/cmp-rd-hs.cgs
rename to sim/testsuite/arm/thumb/cmp-rd-hs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/cmp.cgs b/sim/testsuite/arm/thumb/cmp.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/cmp.cgs
rename to sim/testsuite/arm/thumb/cmp.cgs

diff --git a/sim/testsuite/sim/arm/thumb/eor.cgs b/sim/testsuite/arm/thumb/eor.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/eor.cgs
rename to sim/testsuite/arm/thumb/eor.cgs

diff --git a/sim/testsuite/sim/arm/thumb/lda-pc.cgs b/sim/testsuite/arm/thumb/lda-pc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/lda-pc.cgs
rename to sim/testsuite/arm/thumb/lda-pc.cgs

diff --git a/sim/testsuite/sim/arm/thumb/lda-sp.cgs b/sim/testsuite/arm/thumb/lda-sp.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/lda-sp.cgs
rename to sim/testsuite/arm/thumb/lda-sp.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldmia.cgs b/sim/testsuite/arm/thumb/ldmia.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldmia.cgs
rename to sim/testsuite/arm/thumb/ldmia.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldr-imm.cgs b/sim/testsuite/arm/thumb/ldr-imm.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldr-imm.cgs
rename to sim/testsuite/arm/thumb/ldr-imm.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldr-pc.cgs b/sim/testsuite/arm/thumb/ldr-pc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldr-pc.cgs
rename to sim/testsuite/arm/thumb/ldr-pc.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldr-sprel.cgs b/sim/testsuite/arm/thumb/ldr-sprel.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldr-sprel.cgs
rename to sim/testsuite/arm/thumb/ldr-sprel.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldr.cgs b/sim/testsuite/arm/thumb/ldr.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldr.cgs
rename to sim/testsuite/arm/thumb/ldr.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldrb-imm.cgs b/sim/testsuite/arm/thumb/ldrb-imm.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldrb-imm.cgs
rename to sim/testsuite/arm/thumb/ldrb-imm.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldrb.cgs b/sim/testsuite/arm/thumb/ldrb.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldrb.cgs
rename to sim/testsuite/arm/thumb/ldrb.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldrh-imm.cgs b/sim/testsuite/arm/thumb/ldrh-imm.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldrh-imm.cgs
rename to sim/testsuite/arm/thumb/ldrh-imm.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldrh.cgs b/sim/testsuite/arm/thumb/ldrh.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldrh.cgs
rename to sim/testsuite/arm/thumb/ldrh.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldsb.cgs b/sim/testsuite/arm/thumb/ldsb.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldsb.cgs
rename to sim/testsuite/arm/thumb/ldsb.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ldsh.cgs b/sim/testsuite/arm/thumb/ldsh.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ldsh.cgs
rename to sim/testsuite/arm/thumb/ldsh.cgs

diff --git a/sim/testsuite/sim/arm/thumb/lsl.cgs b/sim/testsuite/arm/thumb/lsl.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/lsl.cgs
rename to sim/testsuite/arm/thumb/lsl.cgs

diff --git a/sim/testsuite/sim/arm/thumb/lsr.cgs b/sim/testsuite/arm/thumb/lsr.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/lsr.cgs
rename to sim/testsuite/arm/thumb/lsr.cgs

diff --git a/sim/testsuite/sim/arm/thumb/mov-hd-hs.cgs b/sim/testsuite/arm/thumb/mov-hd-hs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/mov-hd-hs.cgs
rename to sim/testsuite/arm/thumb/mov-hd-hs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/mov-hd-rs.cgs b/sim/testsuite/arm/thumb/mov-hd-rs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/mov-hd-rs.cgs
rename to sim/testsuite/arm/thumb/mov-hd-rs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/mov-rd-hs.cgs b/sim/testsuite/arm/thumb/mov-rd-hs.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/mov-rd-hs.cgs
rename to sim/testsuite/arm/thumb/mov-rd-hs.cgs

diff --git a/sim/testsuite/sim/arm/thumb/mov.cgs b/sim/testsuite/arm/thumb/mov.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/mov.cgs
rename to sim/testsuite/arm/thumb/mov.cgs

diff --git a/sim/testsuite/sim/arm/thumb/mul.cgs b/sim/testsuite/arm/thumb/mul.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/mul.cgs
rename to sim/testsuite/arm/thumb/mul.cgs

diff --git a/sim/testsuite/sim/arm/thumb/mvn.cgs b/sim/testsuite/arm/thumb/mvn.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/mvn.cgs
rename to sim/testsuite/arm/thumb/mvn.cgs

diff --git a/sim/testsuite/sim/arm/thumb/neg.cgs b/sim/testsuite/arm/thumb/neg.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/neg.cgs
rename to sim/testsuite/arm/thumb/neg.cgs

diff --git a/sim/testsuite/sim/arm/thumb/orr.cgs b/sim/testsuite/arm/thumb/orr.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/orr.cgs
rename to sim/testsuite/arm/thumb/orr.cgs

diff --git a/sim/testsuite/sim/arm/thumb/pop-pc.cgs b/sim/testsuite/arm/thumb/pop-pc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/pop-pc.cgs
rename to sim/testsuite/arm/thumb/pop-pc.cgs

diff --git a/sim/testsuite/sim/arm/thumb/pop.cgs b/sim/testsuite/arm/thumb/pop.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/pop.cgs
rename to sim/testsuite/arm/thumb/pop.cgs

diff --git a/sim/testsuite/sim/arm/thumb/push-lr.cgs b/sim/testsuite/arm/thumb/push-lr.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/push-lr.cgs
rename to sim/testsuite/arm/thumb/push-lr.cgs

diff --git a/sim/testsuite/sim/arm/thumb/push.cgs b/sim/testsuite/arm/thumb/push.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/push.cgs
rename to sim/testsuite/arm/thumb/push.cgs

diff --git a/sim/testsuite/sim/arm/thumb/ror.cgs b/sim/testsuite/arm/thumb/ror.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/ror.cgs
rename to sim/testsuite/arm/thumb/ror.cgs

diff --git a/sim/testsuite/sim/arm/thumb/sbc.cgs b/sim/testsuite/arm/thumb/sbc.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/sbc.cgs
rename to sim/testsuite/arm/thumb/sbc.cgs

diff --git a/sim/testsuite/sim/arm/thumb/stmia.cgs b/sim/testsuite/arm/thumb/stmia.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/stmia.cgs
rename to sim/testsuite/arm/thumb/stmia.cgs

diff --git a/sim/testsuite/sim/arm/thumb/str-imm.cgs b/sim/testsuite/arm/thumb/str-imm.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/str-imm.cgs
rename to sim/testsuite/arm/thumb/str-imm.cgs

diff --git a/sim/testsuite/sim/arm/thumb/str-sprel.cgs b/sim/testsuite/arm/thumb/str-sprel.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/str-sprel.cgs
rename to sim/testsuite/arm/thumb/str-sprel.cgs

diff --git a/sim/testsuite/sim/arm/thumb/str.cgs b/sim/testsuite/arm/thumb/str.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/str.cgs
rename to sim/testsuite/arm/thumb/str.cgs

diff --git a/sim/testsuite/sim/arm/thumb/strb-imm.cgs b/sim/testsuite/arm/thumb/strb-imm.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/strb-imm.cgs
rename to sim/testsuite/arm/thumb/strb-imm.cgs

diff --git a/sim/testsuite/sim/arm/thumb/strb.cgs b/sim/testsuite/arm/thumb/strb.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/strb.cgs
rename to sim/testsuite/arm/thumb/strb.cgs

diff --git a/sim/testsuite/sim/arm/thumb/strh-imm.cgs b/sim/testsuite/arm/thumb/strh-imm.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/strh-imm.cgs
rename to sim/testsuite/arm/thumb/strh-imm.cgs

diff --git a/sim/testsuite/sim/arm/thumb/strh.cgs b/sim/testsuite/arm/thumb/strh.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/strh.cgs
rename to sim/testsuite/arm/thumb/strh.cgs

diff --git a/sim/testsuite/sim/arm/thumb/sub-sp.cgs b/sim/testsuite/arm/thumb/sub-sp.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/sub-sp.cgs
rename to sim/testsuite/arm/thumb/sub-sp.cgs

diff --git a/sim/testsuite/sim/arm/thumb/sub.cgs b/sim/testsuite/arm/thumb/sub.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/sub.cgs
rename to sim/testsuite/arm/thumb/sub.cgs

diff --git a/sim/testsuite/sim/arm/thumb/subi.cgs b/sim/testsuite/arm/thumb/subi.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/subi.cgs
rename to sim/testsuite/arm/thumb/subi.cgs

diff --git a/sim/testsuite/sim/arm/thumb/subi8.cgs b/sim/testsuite/arm/thumb/subi8.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/subi8.cgs
rename to sim/testsuite/arm/thumb/subi8.cgs

diff --git a/sim/testsuite/sim/arm/thumb/swi.cgs b/sim/testsuite/arm/thumb/swi.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/swi.cgs
rename to sim/testsuite/arm/thumb/swi.cgs

diff --git a/sim/testsuite/sim/arm/thumb/testutils.inc b/sim/testsuite/arm/thumb/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/testutils.inc
rename to sim/testsuite/arm/thumb/testutils.inc

diff --git a/sim/testsuite/sim/arm/thumb/tst.cgs b/sim/testsuite/arm/thumb/tst.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/thumb/tst.cgs
rename to sim/testsuite/arm/thumb/tst.cgs

diff --git a/sim/testsuite/sim/arm/tst.cgs b/sim/testsuite/arm/tst.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/tst.cgs
rename to sim/testsuite/arm/tst.cgs

diff --git a/sim/testsuite/sim/arm/umlal.cgs b/sim/testsuite/arm/umlal.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/umlal.cgs
rename to sim/testsuite/arm/umlal.cgs

diff --git a/sim/testsuite/sim/arm/umull.cgs b/sim/testsuite/arm/umull.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/umull.cgs
rename to sim/testsuite/arm/umull.cgs

diff --git a/sim/testsuite/sim/arm/xscale/blx.cgs b/sim/testsuite/arm/xscale/blx.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/xscale/blx.cgs
rename to sim/testsuite/arm/xscale/blx.cgs

diff --git a/sim/testsuite/sim/arm/xscale/mia.cgs b/sim/testsuite/arm/xscale/mia.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/xscale/mia.cgs
rename to sim/testsuite/arm/xscale/mia.cgs

diff --git a/sim/testsuite/sim/arm/xscale/miaph.cgs b/sim/testsuite/arm/xscale/miaph.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/xscale/miaph.cgs
rename to sim/testsuite/arm/xscale/miaph.cgs

diff --git a/sim/testsuite/sim/arm/xscale/miaxy.cgs b/sim/testsuite/arm/xscale/miaxy.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/xscale/miaxy.cgs
rename to sim/testsuite/arm/xscale/miaxy.cgs

diff --git a/sim/testsuite/sim/arm/xscale/mra.cgs b/sim/testsuite/arm/xscale/mra.cgs
similarity index 100%
rename from sim/testsuite/sim/arm/xscale/mra.cgs
rename to sim/testsuite/arm/xscale/mra.cgs

diff --git a/sim/testsuite/sim/arm/xscale/testutils.inc b/sim/testsuite/arm/xscale/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/arm/xscale/testutils.inc
rename to sim/testsuite/arm/xscale/testutils.inc

diff --git a/sim/testsuite/sim/arm/xscale/xscale.exp b/sim/testsuite/arm/xscale/xscale.exp
similarity index 100%
rename from sim/testsuite/sim/arm/xscale/xscale.exp
rename to sim/testsuite/arm/xscale/xscale.exp

diff --git a/sim/testsuite/sim/avr/ChangeLog b/sim/testsuite/avr/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/avr/ChangeLog
rename to sim/testsuite/avr/ChangeLog

diff --git a/sim/testsuite/sim/avr/allinsn.exp b/sim/testsuite/avr/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/avr/allinsn.exp
rename to sim/testsuite/avr/allinsn.exp

diff --git a/sim/testsuite/sim/avr/pass.s b/sim/testsuite/avr/pass.s
similarity index 100%
rename from sim/testsuite/sim/avr/pass.s
rename to sim/testsuite/avr/pass.s

diff --git a/sim/testsuite/sim/avr/testutils.inc b/sim/testsuite/avr/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/avr/testutils.inc
rename to sim/testsuite/avr/testutils.inc

diff --git a/sim/testsuite/sim/bfin/.gitignore b/sim/testsuite/bfin/.gitignore
similarity index 100%
rename from sim/testsuite/sim/bfin/.gitignore
rename to sim/testsuite/bfin/.gitignore

diff --git a/sim/testsuite/sim/bfin/10272_small.s b/sim/testsuite/bfin/10272_small.s
similarity index 100%
rename from sim/testsuite/sim/bfin/10272_small.s
rename to sim/testsuite/bfin/10272_small.s

diff --git a/sim/testsuite/sim/bfin/10436.s b/sim/testsuite/bfin/10436.s
similarity index 100%
rename from sim/testsuite/sim/bfin/10436.s
rename to sim/testsuite/bfin/10436.s

diff --git a/sim/testsuite/sim/bfin/10622.s b/sim/testsuite/bfin/10622.s
similarity index 100%
rename from sim/testsuite/sim/bfin/10622.s
rename to sim/testsuite/bfin/10622.s

diff --git a/sim/testsuite/sim/bfin/10742.s b/sim/testsuite/bfin/10742.s
similarity index 100%
rename from sim/testsuite/sim/bfin/10742.s
rename to sim/testsuite/bfin/10742.s

diff --git a/sim/testsuite/sim/bfin/10799.s b/sim/testsuite/bfin/10799.s
similarity index 100%
rename from sim/testsuite/sim/bfin/10799.s
rename to sim/testsuite/bfin/10799.s

diff --git a/sim/testsuite/sim/bfin/11080.s b/sim/testsuite/bfin/11080.s
similarity index 100%
rename from sim/testsuite/sim/bfin/11080.s
rename to sim/testsuite/bfin/11080.s

diff --git a/sim/testsuite/sim/bfin/7641.s b/sim/testsuite/bfin/7641.s
similarity index 100%
rename from sim/testsuite/sim/bfin/7641.s
rename to sim/testsuite/bfin/7641.s

diff --git a/sim/testsuite/sim/bfin/ChangeLog b/sim/testsuite/bfin/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/bfin/ChangeLog
rename to sim/testsuite/bfin/ChangeLog

diff --git a/sim/testsuite/sim/bfin/PN_generator.s b/sim/testsuite/bfin/PN_generator.s
similarity index 100%
rename from sim/testsuite/sim/bfin/PN_generator.s
rename to sim/testsuite/bfin/PN_generator.s

diff --git a/sim/testsuite/sim/bfin/a0.s b/sim/testsuite/bfin/a0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a0.s
rename to sim/testsuite/bfin/a0.s

diff --git a/sim/testsuite/sim/bfin/a0shift.S b/sim/testsuite/bfin/a0shift.S
similarity index 100%
rename from sim/testsuite/sim/bfin/a0shift.S
rename to sim/testsuite/bfin/a0shift.S

diff --git a/sim/testsuite/sim/bfin/a1.s b/sim/testsuite/bfin/a1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a1.s
rename to sim/testsuite/bfin/a1.s

diff --git a/sim/testsuite/sim/bfin/a10.s b/sim/testsuite/bfin/a10.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a10.s
rename to sim/testsuite/bfin/a10.s

diff --git a/sim/testsuite/sim/bfin/a11.S b/sim/testsuite/bfin/a11.S
similarity index 100%
rename from sim/testsuite/sim/bfin/a11.S
rename to sim/testsuite/bfin/a11.S

diff --git a/sim/testsuite/sim/bfin/a12.s b/sim/testsuite/bfin/a12.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a12.s
rename to sim/testsuite/bfin/a12.s

diff --git a/sim/testsuite/sim/bfin/a2.s b/sim/testsuite/bfin/a2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a2.s
rename to sim/testsuite/bfin/a2.s

diff --git a/sim/testsuite/sim/bfin/a20.S b/sim/testsuite/bfin/a20.S
similarity index 100%
rename from sim/testsuite/sim/bfin/a20.S
rename to sim/testsuite/bfin/a20.S

diff --git a/sim/testsuite/sim/bfin/a21.s b/sim/testsuite/bfin/a21.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a21.s
rename to sim/testsuite/bfin/a21.s

diff --git a/sim/testsuite/sim/bfin/a22.s b/sim/testsuite/bfin/a22.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a22.s
rename to sim/testsuite/bfin/a22.s

diff --git a/sim/testsuite/sim/bfin/a23.s b/sim/testsuite/bfin/a23.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a23.s
rename to sim/testsuite/bfin/a23.s

diff --git a/sim/testsuite/sim/bfin/a24.s b/sim/testsuite/bfin/a24.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a24.s
rename to sim/testsuite/bfin/a24.s

diff --git a/sim/testsuite/sim/bfin/a25.s b/sim/testsuite/bfin/a25.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a25.s
rename to sim/testsuite/bfin/a25.s

diff --git a/sim/testsuite/sim/bfin/a26.s b/sim/testsuite/bfin/a26.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a26.s
rename to sim/testsuite/bfin/a26.s

diff --git a/sim/testsuite/sim/bfin/a3.s b/sim/testsuite/bfin/a3.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a3.s
rename to sim/testsuite/bfin/a3.s

diff --git a/sim/testsuite/sim/bfin/a30.s b/sim/testsuite/bfin/a30.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a30.s
rename to sim/testsuite/bfin/a30.s

diff --git a/sim/testsuite/sim/bfin/a4.s b/sim/testsuite/bfin/a4.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a4.s
rename to sim/testsuite/bfin/a4.s

diff --git a/sim/testsuite/sim/bfin/a5.s b/sim/testsuite/bfin/a5.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a5.s
rename to sim/testsuite/bfin/a5.s

diff --git a/sim/testsuite/sim/bfin/a6.s b/sim/testsuite/bfin/a6.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a6.s
rename to sim/testsuite/bfin/a6.s

diff --git a/sim/testsuite/sim/bfin/a7.s b/sim/testsuite/bfin/a7.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a7.s
rename to sim/testsuite/bfin/a7.s

diff --git a/sim/testsuite/sim/bfin/a8.s b/sim/testsuite/bfin/a8.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a8.s
rename to sim/testsuite/bfin/a8.s

diff --git a/sim/testsuite/sim/bfin/a9.s b/sim/testsuite/bfin/a9.s
similarity index 100%
rename from sim/testsuite/sim/bfin/a9.s
rename to sim/testsuite/bfin/a9.s

diff --git a/sim/testsuite/sim/bfin/abs-2.S b/sim/testsuite/bfin/abs-2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/abs-2.S
rename to sim/testsuite/bfin/abs-2.S

diff --git a/sim/testsuite/sim/bfin/abs-3.S b/sim/testsuite/bfin/abs-3.S
similarity index 100%
rename from sim/testsuite/sim/bfin/abs-3.S
rename to sim/testsuite/bfin/abs-3.S

diff --git a/sim/testsuite/sim/bfin/abs-4.S b/sim/testsuite/bfin/abs-4.S
similarity index 100%
rename from sim/testsuite/sim/bfin/abs-4.S
rename to sim/testsuite/bfin/abs-4.S

diff --git a/sim/testsuite/sim/bfin/abs.S b/sim/testsuite/bfin/abs.S
similarity index 100%
rename from sim/testsuite/sim/bfin/abs.S
rename to sim/testsuite/bfin/abs.S

diff --git a/sim/testsuite/sim/bfin/abs_acc.s b/sim/testsuite/bfin/abs_acc.s
similarity index 100%
rename from sim/testsuite/sim/bfin/abs_acc.s
rename to sim/testsuite/bfin/abs_acc.s

diff --git a/sim/testsuite/sim/bfin/acc-rot.s b/sim/testsuite/bfin/acc-rot.s
similarity index 100%
rename from sim/testsuite/sim/bfin/acc-rot.s
rename to sim/testsuite/bfin/acc-rot.s

diff --git a/sim/testsuite/sim/bfin/acp5_19.s b/sim/testsuite/bfin/acp5_19.s
similarity index 100%
rename from sim/testsuite/sim/bfin/acp5_19.s
rename to sim/testsuite/bfin/acp5_19.s

diff --git a/sim/testsuite/sim/bfin/acp5_4.s b/sim/testsuite/bfin/acp5_4.s
similarity index 100%
rename from sim/testsuite/sim/bfin/acp5_4.s
rename to sim/testsuite/bfin/acp5_4.s

diff --git a/sim/testsuite/sim/bfin/add_imm7.s b/sim/testsuite/bfin/add_imm7.s
similarity index 100%
rename from sim/testsuite/sim/bfin/add_imm7.s
rename to sim/testsuite/bfin/add_imm7.s

diff --git a/sim/testsuite/sim/bfin/add_shift.S b/sim/testsuite/bfin/add_shift.S
similarity index 100%
rename from sim/testsuite/sim/bfin/add_shift.S
rename to sim/testsuite/bfin/add_shift.S

diff --git a/sim/testsuite/sim/bfin/add_sub_acc.s b/sim/testsuite/bfin/add_sub_acc.s
similarity index 100%
rename from sim/testsuite/sim/bfin/add_sub_acc.s
rename to sim/testsuite/bfin/add_sub_acc.s

diff --git a/sim/testsuite/sim/bfin/addsub_flags.S b/sim/testsuite/bfin/addsub_flags.S
similarity index 100%
rename from sim/testsuite/sim/bfin/addsub_flags.S
rename to sim/testsuite/bfin/addsub_flags.S

diff --git a/sim/testsuite/sim/bfin/algnbug1.s b/sim/testsuite/bfin/algnbug1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/algnbug1.s
rename to sim/testsuite/bfin/algnbug1.s

diff --git a/sim/testsuite/sim/bfin/algnbug2.s b/sim/testsuite/bfin/algnbug2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/algnbug2.s
rename to sim/testsuite/bfin/algnbug2.s

diff --git a/sim/testsuite/sim/bfin/allinsn.exp b/sim/testsuite/bfin/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/bfin/allinsn.exp
rename to sim/testsuite/bfin/allinsn.exp

diff --git a/sim/testsuite/sim/bfin/argc.c b/sim/testsuite/bfin/argc.c
similarity index 100%
rename from sim/testsuite/sim/bfin/argc.c
rename to sim/testsuite/bfin/argc.c

diff --git a/sim/testsuite/sim/bfin/ashift.s b/sim/testsuite/bfin/ashift.s
similarity index 100%
rename from sim/testsuite/sim/bfin/ashift.s
rename to sim/testsuite/bfin/ashift.s

diff --git a/sim/testsuite/sim/bfin/ashift_flags.s b/sim/testsuite/bfin/ashift_flags.s
similarity index 100%
rename from sim/testsuite/sim/bfin/ashift_flags.s
rename to sim/testsuite/bfin/ashift_flags.s

diff --git a/sim/testsuite/sim/bfin/ashift_left.s b/sim/testsuite/bfin/ashift_left.s
similarity index 100%
rename from sim/testsuite/sim/bfin/ashift_left.s
rename to sim/testsuite/bfin/ashift_left.s

diff --git a/sim/testsuite/sim/bfin/b0.S b/sim/testsuite/bfin/b0.S
similarity index 100%
rename from sim/testsuite/sim/bfin/b0.S
rename to sim/testsuite/bfin/b0.S

diff --git a/sim/testsuite/sim/bfin/b1.s b/sim/testsuite/bfin/b1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/b1.s
rename to sim/testsuite/bfin/b1.s

diff --git a/sim/testsuite/sim/bfin/b2.S b/sim/testsuite/bfin/b2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/b2.S
rename to sim/testsuite/bfin/b2.S

diff --git a/sim/testsuite/sim/bfin/brcc.s b/sim/testsuite/bfin/brcc.s
similarity index 100%
rename from sim/testsuite/sim/bfin/brcc.s
rename to sim/testsuite/bfin/brcc.s

diff --git a/sim/testsuite/sim/bfin/brevadd.s b/sim/testsuite/bfin/brevadd.s
similarity index 100%
rename from sim/testsuite/sim/bfin/brevadd.s
rename to sim/testsuite/bfin/brevadd.s

diff --git a/sim/testsuite/sim/bfin/byteop16m.s b/sim/testsuite/bfin/byteop16m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/byteop16m.s
rename to sim/testsuite/bfin/byteop16m.s

diff --git a/sim/testsuite/sim/bfin/byteop16p.s b/sim/testsuite/bfin/byteop16p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/byteop16p.s
rename to sim/testsuite/bfin/byteop16p.s

diff --git a/sim/testsuite/sim/bfin/byteop1p.s b/sim/testsuite/bfin/byteop1p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/byteop1p.s
rename to sim/testsuite/bfin/byteop1p.s

diff --git a/sim/testsuite/sim/bfin/byteop2p.s b/sim/testsuite/bfin/byteop2p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/byteop2p.s
rename to sim/testsuite/bfin/byteop2p.s

diff --git a/sim/testsuite/sim/bfin/byteop3p.s b/sim/testsuite/bfin/byteop3p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/byteop3p.s
rename to sim/testsuite/bfin/byteop3p.s

diff --git a/sim/testsuite/sim/bfin/byteunpack.s b/sim/testsuite/bfin/byteunpack.s
similarity index 100%
rename from sim/testsuite/sim/bfin/byteunpack.s
rename to sim/testsuite/bfin/byteunpack.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_arith_r_sft.s b/sim/testsuite/bfin/c_alu2op_arith_r_sft.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_arith_r_sft.s
rename to sim/testsuite/bfin/c_alu2op_arith_r_sft.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_conv_b.s b/sim/testsuite/bfin/c_alu2op_conv_b.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_conv_b.s
rename to sim/testsuite/bfin/c_alu2op_conv_b.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_conv_h.s b/sim/testsuite/bfin/c_alu2op_conv_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_conv_h.s
rename to sim/testsuite/bfin/c_alu2op_conv_h.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_conv_mix.s b/sim/testsuite/bfin/c_alu2op_conv_mix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_conv_mix.s
rename to sim/testsuite/bfin/c_alu2op_conv_mix.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_conv_neg.s b/sim/testsuite/bfin/c_alu2op_conv_neg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_conv_neg.s
rename to sim/testsuite/bfin/c_alu2op_conv_neg.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_conv_toggle.s b/sim/testsuite/bfin/c_alu2op_conv_toggle.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_conv_toggle.s
rename to sim/testsuite/bfin/c_alu2op_conv_toggle.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_conv_xb.s b/sim/testsuite/bfin/c_alu2op_conv_xb.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_conv_xb.s
rename to sim/testsuite/bfin/c_alu2op_conv_xb.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_conv_xh.s b/sim/testsuite/bfin/c_alu2op_conv_xh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_conv_xh.s
rename to sim/testsuite/bfin/c_alu2op_conv_xh.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_divq.s b/sim/testsuite/bfin/c_alu2op_divq.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_divq.s
rename to sim/testsuite/bfin/c_alu2op_divq.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_divs.s b/sim/testsuite/bfin/c_alu2op_divs.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_divs.s
rename to sim/testsuite/bfin/c_alu2op_divs.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_log_l_sft.s b/sim/testsuite/bfin/c_alu2op_log_l_sft.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_log_l_sft.s
rename to sim/testsuite/bfin/c_alu2op_log_l_sft.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_log_r_sft.s b/sim/testsuite/bfin/c_alu2op_log_r_sft.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_log_r_sft.s
rename to sim/testsuite/bfin/c_alu2op_log_r_sft.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_shadd_1.s b/sim/testsuite/bfin/c_alu2op_shadd_1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_shadd_1.s
rename to sim/testsuite/bfin/c_alu2op_shadd_1.s

diff --git a/sim/testsuite/sim/bfin/c_alu2op_shadd_2.s b/sim/testsuite/bfin/c_alu2op_shadd_2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_alu2op_shadd_2.s
rename to sim/testsuite/bfin/c_alu2op_shadd_2.s

diff --git a/sim/testsuite/sim/bfin/c_br_preg_killed_ac.s b/sim/testsuite/bfin/c_br_preg_killed_ac.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_br_preg_killed_ac.s
rename to sim/testsuite/bfin/c_br_preg_killed_ac.s

diff --git a/sim/testsuite/sim/bfin/c_br_preg_killed_ex1.s b/sim/testsuite/bfin/c_br_preg_killed_ex1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_br_preg_killed_ex1.s
rename to sim/testsuite/bfin/c_br_preg_killed_ex1.s

diff --git a/sim/testsuite/sim/bfin/c_br_preg_stall_ac.s b/sim/testsuite/bfin/c_br_preg_stall_ac.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_br_preg_stall_ac.s
rename to sim/testsuite/bfin/c_br_preg_stall_ac.s

diff --git a/sim/testsuite/sim/bfin/c_br_preg_stall_ex1.s b/sim/testsuite/bfin/c_br_preg_stall_ex1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_br_preg_stall_ex1.s
rename to sim/testsuite/bfin/c_br_preg_stall_ex1.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_bp1.s b/sim/testsuite/bfin/c_brcc_bp1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_bp1.s
rename to sim/testsuite/bfin/c_brcc_bp1.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_bp2.s b/sim/testsuite/bfin/c_brcc_bp2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_bp2.s
rename to sim/testsuite/bfin/c_brcc_bp2.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_bp3.s b/sim/testsuite/bfin/c_brcc_bp3.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_bp3.s
rename to sim/testsuite/bfin/c_brcc_bp3.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_bp4.s b/sim/testsuite/bfin/c_brcc_bp4.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_bp4.s
rename to sim/testsuite/bfin/c_brcc_bp4.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_brf_bp.s b/sim/testsuite/bfin/c_brcc_brf_bp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_brf_bp.s
rename to sim/testsuite/bfin/c_brcc_brf_bp.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_brf_brt_bp.s b/sim/testsuite/bfin/c_brcc_brf_brt_bp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_brf_brt_bp.s
rename to sim/testsuite/bfin/c_brcc_brf_brt_bp.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_brf_brt_nbp.s b/sim/testsuite/bfin/c_brcc_brf_brt_nbp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_brf_brt_nbp.s
rename to sim/testsuite/bfin/c_brcc_brf_brt_nbp.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_brf_fbkwd.s b/sim/testsuite/bfin/c_brcc_brf_fbkwd.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_brf_fbkwd.s
rename to sim/testsuite/bfin/c_brcc_brf_fbkwd.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_brf_nbp.s b/sim/testsuite/bfin/c_brcc_brf_nbp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_brf_nbp.s
rename to sim/testsuite/bfin/c_brcc_brf_nbp.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_brt_bp.s b/sim/testsuite/bfin/c_brcc_brt_bp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_brt_bp.s
rename to sim/testsuite/bfin/c_brcc_brt_bp.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_brt_nbp.s b/sim/testsuite/bfin/c_brcc_brt_nbp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_brt_nbp.s
rename to sim/testsuite/bfin/c_brcc_brt_nbp.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_kills_dhits.s b/sim/testsuite/bfin/c_brcc_kills_dhits.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_kills_dhits.s
rename to sim/testsuite/bfin/c_brcc_kills_dhits.s

diff --git a/sim/testsuite/sim/bfin/c_brcc_kills_dmiss.s b/sim/testsuite/bfin/c_brcc_kills_dmiss.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_brcc_kills_dmiss.s
rename to sim/testsuite/bfin/c_brcc_kills_dmiss.s

diff --git a/sim/testsuite/sim/bfin/c_cactrl_iflush_pr.s b/sim/testsuite/bfin/c_cactrl_iflush_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cactrl_iflush_pr.s
rename to sim/testsuite/bfin/c_cactrl_iflush_pr.s

diff --git a/sim/testsuite/sim/bfin/c_cactrl_iflush_pr_pp.s b/sim/testsuite/bfin/c_cactrl_iflush_pr_pp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cactrl_iflush_pr_pp.s
rename to sim/testsuite/bfin/c_cactrl_iflush_pr_pp.s

diff --git a/sim/testsuite/sim/bfin/c_calla_ljump.s b/sim/testsuite/bfin/c_calla_ljump.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_calla_ljump.s
rename to sim/testsuite/bfin/c_calla_ljump.s

diff --git a/sim/testsuite/sim/bfin/c_calla_subr.s b/sim/testsuite/bfin/c_calla_subr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_calla_subr.s
rename to sim/testsuite/bfin/c_calla_subr.s

diff --git a/sim/testsuite/sim/bfin/c_cc2dreg.s b/sim/testsuite/bfin/c_cc2dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc2dreg.s
rename to sim/testsuite/bfin/c_cc2dreg.s

diff --git a/sim/testsuite/sim/bfin/c_cc2stat_cc_ac.S b/sim/testsuite/bfin/c_cc2stat_cc_ac.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc2stat_cc_ac.S
rename to sim/testsuite/bfin/c_cc2stat_cc_ac.S

diff --git a/sim/testsuite/sim/bfin/c_cc2stat_cc_an.s b/sim/testsuite/bfin/c_cc2stat_cc_an.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc2stat_cc_an.s
rename to sim/testsuite/bfin/c_cc2stat_cc_an.s

diff --git a/sim/testsuite/sim/bfin/c_cc2stat_cc_aq.s b/sim/testsuite/bfin/c_cc2stat_cc_aq.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc2stat_cc_aq.s
rename to sim/testsuite/bfin/c_cc2stat_cc_aq.s

diff --git a/sim/testsuite/sim/bfin/c_cc2stat_cc_av0.S b/sim/testsuite/bfin/c_cc2stat_cc_av0.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc2stat_cc_av0.S
rename to sim/testsuite/bfin/c_cc2stat_cc_av0.S

diff --git a/sim/testsuite/sim/bfin/c_cc2stat_cc_av1.S b/sim/testsuite/bfin/c_cc2stat_cc_av1.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc2stat_cc_av1.S
rename to sim/testsuite/bfin/c_cc2stat_cc_av1.S

diff --git a/sim/testsuite/sim/bfin/c_cc2stat_cc_az.s b/sim/testsuite/bfin/c_cc2stat_cc_az.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc2stat_cc_az.s
rename to sim/testsuite/bfin/c_cc2stat_cc_az.s

diff --git a/sim/testsuite/sim/bfin/c_cc_flag_ccmv_depend.S b/sim/testsuite/bfin/c_cc_flag_ccmv_depend.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc_flag_ccmv_depend.S
rename to sim/testsuite/bfin/c_cc_flag_ccmv_depend.S

diff --git a/sim/testsuite/sim/bfin/c_cc_flagdreg_mvbrsft.s b/sim/testsuite/bfin/c_cc_flagdreg_mvbrsft.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc_flagdreg_mvbrsft.s
rename to sim/testsuite/bfin/c_cc_flagdreg_mvbrsft.s

diff --git a/sim/testsuite/sim/bfin/c_cc_flagdreg_mvbrsft_s1.s b/sim/testsuite/bfin/c_cc_flagdreg_mvbrsft_s1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc_flagdreg_mvbrsft_s1.s
rename to sim/testsuite/bfin/c_cc_flagdreg_mvbrsft_s1.s

diff --git a/sim/testsuite/sim/bfin/c_cc_flagdreg_mvbrsft_sn.s b/sim/testsuite/bfin/c_cc_flagdreg_mvbrsft_sn.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc_flagdreg_mvbrsft_sn.s
rename to sim/testsuite/bfin/c_cc_flagdreg_mvbrsft_sn.s

diff --git a/sim/testsuite/sim/bfin/c_cc_regmvlogi_mvbrsft.s b/sim/testsuite/bfin/c_cc_regmvlogi_mvbrsft.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc_regmvlogi_mvbrsft.s
rename to sim/testsuite/bfin/c_cc_regmvlogi_mvbrsft.s

diff --git a/sim/testsuite/sim/bfin/c_cc_regmvlogi_mvbrsft_s1.s b/sim/testsuite/bfin/c_cc_regmvlogi_mvbrsft_s1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc_regmvlogi_mvbrsft_s1.s
rename to sim/testsuite/bfin/c_cc_regmvlogi_mvbrsft_s1.s

diff --git a/sim/testsuite/sim/bfin/c_cc_regmvlogi_mvbrsft_sn.S b/sim/testsuite/bfin/c_cc_regmvlogi_mvbrsft_sn.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_cc_regmvlogi_mvbrsft_sn.S
rename to sim/testsuite/bfin/c_cc_regmvlogi_mvbrsft_sn.S

diff --git a/sim/testsuite/sim/bfin/c_ccflag_a0a1.S b/sim/testsuite/bfin/c_ccflag_a0a1.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccflag_a0a1.S
rename to sim/testsuite/bfin/c_ccflag_a0a1.S

diff --git a/sim/testsuite/sim/bfin/c_ccflag_dr_dr.s b/sim/testsuite/bfin/c_ccflag_dr_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccflag_dr_dr.s
rename to sim/testsuite/bfin/c_ccflag_dr_dr.s

diff --git a/sim/testsuite/sim/bfin/c_ccflag_dr_dr_uu.s b/sim/testsuite/bfin/c_ccflag_dr_dr_uu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccflag_dr_dr_uu.s
rename to sim/testsuite/bfin/c_ccflag_dr_dr_uu.s

diff --git a/sim/testsuite/sim/bfin/c_ccflag_dr_imm3.s b/sim/testsuite/bfin/c_ccflag_dr_imm3.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccflag_dr_imm3.s
rename to sim/testsuite/bfin/c_ccflag_dr_imm3.s

diff --git a/sim/testsuite/sim/bfin/c_ccflag_dr_imm3_uu.s b/sim/testsuite/bfin/c_ccflag_dr_imm3_uu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccflag_dr_imm3_uu.s
rename to sim/testsuite/bfin/c_ccflag_dr_imm3_uu.s

diff --git a/sim/testsuite/sim/bfin/c_ccflag_pr_imm3.s b/sim/testsuite/bfin/c_ccflag_pr_imm3.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccflag_pr_imm3.s
rename to sim/testsuite/bfin/c_ccflag_pr_imm3.s

diff --git a/sim/testsuite/sim/bfin/c_ccflag_pr_imm3_uu.s b/sim/testsuite/bfin/c_ccflag_pr_imm3_uu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccflag_pr_imm3_uu.s
rename to sim/testsuite/bfin/c_ccflag_pr_imm3_uu.s

diff --git a/sim/testsuite/sim/bfin/c_ccflag_pr_pr.s b/sim/testsuite/bfin/c_ccflag_pr_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccflag_pr_pr.s
rename to sim/testsuite/bfin/c_ccflag_pr_pr.s

diff --git a/sim/testsuite/sim/bfin/c_ccflag_pr_pr_uu.s b/sim/testsuite/bfin/c_ccflag_pr_pr_uu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccflag_pr_pr_uu.s
rename to sim/testsuite/bfin/c_ccflag_pr_pr_uu.s

diff --git a/sim/testsuite/sim/bfin/c_ccmv_cc_dr_dr.s b/sim/testsuite/bfin/c_ccmv_cc_dr_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccmv_cc_dr_dr.s
rename to sim/testsuite/bfin/c_ccmv_cc_dr_dr.s

diff --git a/sim/testsuite/sim/bfin/c_ccmv_cc_dr_pr.s b/sim/testsuite/bfin/c_ccmv_cc_dr_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccmv_cc_dr_pr.s
rename to sim/testsuite/bfin/c_ccmv_cc_dr_pr.s

diff --git a/sim/testsuite/sim/bfin/c_ccmv_cc_pr_pr.s b/sim/testsuite/bfin/c_ccmv_cc_pr_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccmv_cc_pr_pr.s
rename to sim/testsuite/bfin/c_ccmv_cc_pr_pr.s

diff --git a/sim/testsuite/sim/bfin/c_ccmv_ncc_dr_dr.s b/sim/testsuite/bfin/c_ccmv_ncc_dr_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccmv_ncc_dr_dr.s
rename to sim/testsuite/bfin/c_ccmv_ncc_dr_dr.s

diff --git a/sim/testsuite/sim/bfin/c_ccmv_ncc_dr_pr.s b/sim/testsuite/bfin/c_ccmv_ncc_dr_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccmv_ncc_dr_pr.s
rename to sim/testsuite/bfin/c_ccmv_ncc_dr_pr.s

diff --git a/sim/testsuite/sim/bfin/c_ccmv_ncc_pr_pr.s b/sim/testsuite/bfin/c_ccmv_ncc_pr_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ccmv_ncc_pr_pr.s
rename to sim/testsuite/bfin/c_ccmv_ncc_pr_pr.s

diff --git a/sim/testsuite/sim/bfin/c_comp3op_dr_and_dr.s b/sim/testsuite/bfin/c_comp3op_dr_and_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_comp3op_dr_and_dr.s
rename to sim/testsuite/bfin/c_comp3op_dr_and_dr.s

diff --git a/sim/testsuite/sim/bfin/c_comp3op_dr_minus_dr.s b/sim/testsuite/bfin/c_comp3op_dr_minus_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_comp3op_dr_minus_dr.s
rename to sim/testsuite/bfin/c_comp3op_dr_minus_dr.s

diff --git a/sim/testsuite/sim/bfin/c_comp3op_dr_mix.s b/sim/testsuite/bfin/c_comp3op_dr_mix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_comp3op_dr_mix.s
rename to sim/testsuite/bfin/c_comp3op_dr_mix.s

diff --git a/sim/testsuite/sim/bfin/c_comp3op_dr_or_dr.s b/sim/testsuite/bfin/c_comp3op_dr_or_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_comp3op_dr_or_dr.s
rename to sim/testsuite/bfin/c_comp3op_dr_or_dr.s

diff --git a/sim/testsuite/sim/bfin/c_comp3op_dr_plus_dr.s b/sim/testsuite/bfin/c_comp3op_dr_plus_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_comp3op_dr_plus_dr.s
rename to sim/testsuite/bfin/c_comp3op_dr_plus_dr.s

diff --git a/sim/testsuite/sim/bfin/c_comp3op_dr_xor_dr.s b/sim/testsuite/bfin/c_comp3op_dr_xor_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_comp3op_dr_xor_dr.s
rename to sim/testsuite/bfin/c_comp3op_dr_xor_dr.s

diff --git a/sim/testsuite/sim/bfin/c_comp3op_pr_plus_pr_sh1.s b/sim/testsuite/bfin/c_comp3op_pr_plus_pr_sh1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_comp3op_pr_plus_pr_sh1.s
rename to sim/testsuite/bfin/c_comp3op_pr_plus_pr_sh1.s

diff --git a/sim/testsuite/sim/bfin/c_comp3op_pr_plus_pr_sh2.s b/sim/testsuite/bfin/c_comp3op_pr_plus_pr_sh2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_comp3op_pr_plus_pr_sh2.s
rename to sim/testsuite/bfin/c_comp3op_pr_plus_pr_sh2.s

diff --git a/sim/testsuite/sim/bfin/c_compi2opd_dr_add_i7_n.s b/sim/testsuite/bfin/c_compi2opd_dr_add_i7_n.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_compi2opd_dr_add_i7_n.s
rename to sim/testsuite/bfin/c_compi2opd_dr_add_i7_n.s

diff --git a/sim/testsuite/sim/bfin/c_compi2opd_dr_add_i7_p.s b/sim/testsuite/bfin/c_compi2opd_dr_add_i7_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_compi2opd_dr_add_i7_p.s
rename to sim/testsuite/bfin/c_compi2opd_dr_add_i7_p.s

diff --git a/sim/testsuite/sim/bfin/c_compi2opd_dr_eq_i7_n.s b/sim/testsuite/bfin/c_compi2opd_dr_eq_i7_n.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_compi2opd_dr_eq_i7_n.s
rename to sim/testsuite/bfin/c_compi2opd_dr_eq_i7_n.s

diff --git a/sim/testsuite/sim/bfin/c_compi2opd_dr_eq_i7_p.s b/sim/testsuite/bfin/c_compi2opd_dr_eq_i7_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_compi2opd_dr_eq_i7_p.s
rename to sim/testsuite/bfin/c_compi2opd_dr_eq_i7_p.s

diff --git a/sim/testsuite/sim/bfin/c_compi2opd_flags.S b/sim/testsuite/bfin/c_compi2opd_flags.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_compi2opd_flags.S
rename to sim/testsuite/bfin/c_compi2opd_flags.S

diff --git a/sim/testsuite/sim/bfin/c_compi2opd_flags_2.S b/sim/testsuite/bfin/c_compi2opd_flags_2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_compi2opd_flags_2.S
rename to sim/testsuite/bfin/c_compi2opd_flags_2.S

diff --git a/sim/testsuite/sim/bfin/c_compi2opp_pr_add_i7_n.s b/sim/testsuite/bfin/c_compi2opp_pr_add_i7_n.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_compi2opp_pr_add_i7_n.s
rename to sim/testsuite/bfin/c_compi2opp_pr_add_i7_n.s

diff --git a/sim/testsuite/sim/bfin/c_compi2opp_pr_add_i7_p.s b/sim/testsuite/bfin/c_compi2opp_pr_add_i7_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_compi2opp_pr_add_i7_p.s
rename to sim/testsuite/bfin/c_compi2opp_pr_add_i7_p.s

diff --git a/sim/testsuite/sim/bfin/c_compi2opp_pr_eq_i7_n.s b/sim/testsuite/bfin/c_compi2opp_pr_eq_i7_n.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_compi2opp_pr_eq_i7_n.s
rename to sim/testsuite/bfin/c_compi2opp_pr_eq_i7_n.s

diff --git a/sim/testsuite/sim/bfin/c_compi2opp_pr_eq_i7_p.s b/sim/testsuite/bfin/c_compi2opp_pr_eq_i7_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_compi2opp_pr_eq_i7_p.s
rename to sim/testsuite/bfin/c_compi2opp_pr_eq_i7_p.s

diff --git a/sim/testsuite/sim/bfin/c_dagmodik_lnz_imgebl.s b/sim/testsuite/bfin/c_dagmodik_lnz_imgebl.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dagmodik_lnz_imgebl.s
rename to sim/testsuite/bfin/c_dagmodik_lnz_imgebl.s

diff --git a/sim/testsuite/sim/bfin/c_dagmodik_lnz_imltbl.s b/sim/testsuite/bfin/c_dagmodik_lnz_imltbl.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dagmodik_lnz_imltbl.s
rename to sim/testsuite/bfin/c_dagmodik_lnz_imltbl.s

diff --git a/sim/testsuite/sim/bfin/c_dagmodik_lz_inc_dec.s b/sim/testsuite/bfin/c_dagmodik_lz_inc_dec.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dagmodik_lz_inc_dec.s
rename to sim/testsuite/bfin/c_dagmodik_lz_inc_dec.s

diff --git a/sim/testsuite/sim/bfin/c_dagmodim_lnz_imgebl.s b/sim/testsuite/bfin/c_dagmodim_lnz_imgebl.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dagmodim_lnz_imgebl.s
rename to sim/testsuite/bfin/c_dagmodim_lnz_imgebl.s

diff --git a/sim/testsuite/sim/bfin/c_dagmodim_lnz_imltbl.s b/sim/testsuite/bfin/c_dagmodim_lnz_imltbl.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dagmodim_lnz_imltbl.s
rename to sim/testsuite/bfin/c_dagmodim_lnz_imltbl.s

diff --git a/sim/testsuite/sim/bfin/c_dagmodim_lz_inc_dec.s b/sim/testsuite/bfin/c_dagmodim_lz_inc_dec.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dagmodim_lz_inc_dec.s
rename to sim/testsuite/bfin/c_dagmodim_lz_inc_dec.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_a0_pm_a1.s b/sim/testsuite/bfin/c_dsp32alu_a0_pm_a1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_a0_pm_a1.s
rename to sim/testsuite/bfin/c_dsp32alu_a0_pm_a1.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_a0a1s.s b/sim/testsuite/bfin/c_dsp32alu_a0a1s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_a0a1s.s
rename to sim/testsuite/bfin/c_dsp32alu_a0a1s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_a_abs_a.s b/sim/testsuite/bfin/c_dsp32alu_a_abs_a.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_a_abs_a.s
rename to sim/testsuite/bfin/c_dsp32alu_a_abs_a.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_a_neg_a.s b/sim/testsuite/bfin/c_dsp32alu_a_neg_a.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_a_neg_a.s
rename to sim/testsuite/bfin/c_dsp32alu_a_neg_a.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_aa_absabs.s b/sim/testsuite/bfin/c_dsp32alu_aa_absabs.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_aa_absabs.s
rename to sim/testsuite/bfin/c_dsp32alu_aa_absabs.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_aa_negneg.s b/sim/testsuite/bfin/c_dsp32alu_aa_negneg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_aa_negneg.s
rename to sim/testsuite/bfin/c_dsp32alu_aa_negneg.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_abs.s b/sim/testsuite/bfin/c_dsp32alu_abs.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_abs.s
rename to sim/testsuite/bfin/c_dsp32alu_abs.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_absabs.s b/sim/testsuite/bfin/c_dsp32alu_absabs.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_absabs.s
rename to sim/testsuite/bfin/c_dsp32alu_absabs.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_alhwx.s b/sim/testsuite/bfin/c_dsp32alu_alhwx.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_alhwx.s
rename to sim/testsuite/bfin/c_dsp32alu_alhwx.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_awx.s b/sim/testsuite/bfin/c_dsp32alu_awx.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_awx.s
rename to sim/testsuite/bfin/c_dsp32alu_awx.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_byteop1ew.s b/sim/testsuite/bfin/c_dsp32alu_byteop1ew.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_byteop1ew.s
rename to sim/testsuite/bfin/c_dsp32alu_byteop1ew.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_byteop2.s b/sim/testsuite/bfin/c_dsp32alu_byteop2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_byteop2.s
rename to sim/testsuite/bfin/c_dsp32alu_byteop2.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_byteop3.s b/sim/testsuite/bfin/c_dsp32alu_byteop3.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_byteop3.s
rename to sim/testsuite/bfin/c_dsp32alu_byteop3.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_bytepack.s b/sim/testsuite/bfin/c_dsp32alu_bytepack.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_bytepack.s
rename to sim/testsuite/bfin/c_dsp32alu_bytepack.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_byteunpack.s b/sim/testsuite/bfin/c_dsp32alu_byteunpack.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_byteunpack.s
rename to sim/testsuite/bfin/c_dsp32alu_byteunpack.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_disalnexcpt.s b/sim/testsuite/bfin/c_dsp32alu_disalnexcpt.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_disalnexcpt.s
rename to sim/testsuite/bfin/c_dsp32alu_disalnexcpt.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_max.s b/sim/testsuite/bfin/c_dsp32alu_max.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_max.s
rename to sim/testsuite/bfin/c_dsp32alu_max.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_maxmax.s b/sim/testsuite/bfin/c_dsp32alu_maxmax.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_maxmax.s
rename to sim/testsuite/bfin/c_dsp32alu_maxmax.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_min.s b/sim/testsuite/bfin/c_dsp32alu_min.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_min.s
rename to sim/testsuite/bfin/c_dsp32alu_min.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_minmin.s b/sim/testsuite/bfin/c_dsp32alu_minmin.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_minmin.s
rename to sim/testsuite/bfin/c_dsp32alu_minmin.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_mix.s b/sim/testsuite/bfin/c_dsp32alu_mix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_mix.s
rename to sim/testsuite/bfin/c_dsp32alu_mix.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_r_lh_a0pa1.s b/sim/testsuite/bfin/c_dsp32alu_r_lh_a0pa1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_r_lh_a0pa1.s
rename to sim/testsuite/bfin/c_dsp32alu_r_lh_a0pa1.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_r_negneg.s b/sim/testsuite/bfin/c_dsp32alu_r_negneg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_r_negneg.s
rename to sim/testsuite/bfin/c_dsp32alu_r_negneg.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rh_m.s b/sim/testsuite/bfin/c_dsp32alu_rh_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rh_m.s
rename to sim/testsuite/bfin/c_dsp32alu_rh_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rh_p.s b/sim/testsuite/bfin/c_dsp32alu_rh_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rh_p.s
rename to sim/testsuite/bfin/c_dsp32alu_rh_p.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rh_rnd12_m.s b/sim/testsuite/bfin/c_dsp32alu_rh_rnd12_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rh_rnd12_m.s
rename to sim/testsuite/bfin/c_dsp32alu_rh_rnd12_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rh_rnd12_p.s b/sim/testsuite/bfin/c_dsp32alu_rh_rnd12_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rh_rnd12_p.s
rename to sim/testsuite/bfin/c_dsp32alu_rh_rnd12_p.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rh_rnd20_m.s b/sim/testsuite/bfin/c_dsp32alu_rh_rnd20_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rh_rnd20_m.s
rename to sim/testsuite/bfin/c_dsp32alu_rh_rnd20_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rh_rnd20_p.s b/sim/testsuite/bfin/c_dsp32alu_rh_rnd20_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rh_rnd20_p.s
rename to sim/testsuite/bfin/c_dsp32alu_rh_rnd20_p.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rl_m.s b/sim/testsuite/bfin/c_dsp32alu_rl_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rl_m.s
rename to sim/testsuite/bfin/c_dsp32alu_rl_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rl_p.s b/sim/testsuite/bfin/c_dsp32alu_rl_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rl_p.s
rename to sim/testsuite/bfin/c_dsp32alu_rl_p.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rl_rnd12_m.s b/sim/testsuite/bfin/c_dsp32alu_rl_rnd12_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rl_rnd12_m.s
rename to sim/testsuite/bfin/c_dsp32alu_rl_rnd12_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rl_rnd12_p.s b/sim/testsuite/bfin/c_dsp32alu_rl_rnd12_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rl_rnd12_p.s
rename to sim/testsuite/bfin/c_dsp32alu_rl_rnd12_p.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rl_rnd20_m.s b/sim/testsuite/bfin/c_dsp32alu_rl_rnd20_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rl_rnd20_m.s
rename to sim/testsuite/bfin/c_dsp32alu_rl_rnd20_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rl_rnd20_p.s b/sim/testsuite/bfin/c_dsp32alu_rl_rnd20_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rl_rnd20_p.s
rename to sim/testsuite/bfin/c_dsp32alu_rl_rnd20_p.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rlh_rnd.s b/sim/testsuite/bfin/c_dsp32alu_rlh_rnd.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rlh_rnd.s
rename to sim/testsuite/bfin/c_dsp32alu_rlh_rnd.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rm.s b/sim/testsuite/bfin/c_dsp32alu_rm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rm.s
rename to sim/testsuite/bfin/c_dsp32alu_rm.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rmm.s b/sim/testsuite/bfin/c_dsp32alu_rmm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rmm.s
rename to sim/testsuite/bfin/c_dsp32alu_rmm.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rmp.s b/sim/testsuite/bfin/c_dsp32alu_rmp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rmp.s
rename to sim/testsuite/bfin/c_dsp32alu_rmp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rp.s b/sim/testsuite/bfin/c_dsp32alu_rp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rp.s
rename to sim/testsuite/bfin/c_dsp32alu_rp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rpm.s b/sim/testsuite/bfin/c_dsp32alu_rpm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rpm.s
rename to sim/testsuite/bfin/c_dsp32alu_rpm.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rpp.s b/sim/testsuite/bfin/c_dsp32alu_rpp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rpp.s
rename to sim/testsuite/bfin/c_dsp32alu_rpp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rr_lph_a1a0.s b/sim/testsuite/bfin/c_dsp32alu_rr_lph_a1a0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rr_lph_a1a0.s
rename to sim/testsuite/bfin/c_dsp32alu_rr_lph_a1a0.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rrpm.s b/sim/testsuite/bfin/c_dsp32alu_rrpm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rrpm.s
rename to sim/testsuite/bfin/c_dsp32alu_rrpm.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rrpm_aa.s b/sim/testsuite/bfin/c_dsp32alu_rrpm_aa.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rrpm_aa.s
rename to sim/testsuite/bfin/c_dsp32alu_rrpm_aa.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rrpmmp.s b/sim/testsuite/bfin/c_dsp32alu_rrpmmp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rrpmmp.s
rename to sim/testsuite/bfin/c_dsp32alu_rrpmmp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rrpmmp_sft.s b/sim/testsuite/bfin/c_dsp32alu_rrpmmp_sft.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rrpmmp_sft.s
rename to sim/testsuite/bfin/c_dsp32alu_rrpmmp_sft.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rrpmmp_sft_x.s b/sim/testsuite/bfin/c_dsp32alu_rrpmmp_sft_x.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rrpmmp_sft_x.s
rename to sim/testsuite/bfin/c_dsp32alu_rrpmmp_sft_x.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rrppmm.s b/sim/testsuite/bfin/c_dsp32alu_rrppmm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rrppmm.s
rename to sim/testsuite/bfin/c_dsp32alu_rrppmm.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rrppmm_sft.s b/sim/testsuite/bfin/c_dsp32alu_rrppmm_sft.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rrppmm_sft.s
rename to sim/testsuite/bfin/c_dsp32alu_rrppmm_sft.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_rrppmm_sft_x.s b/sim/testsuite/bfin/c_dsp32alu_rrppmm_sft_x.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_rrppmm_sft_x.s
rename to sim/testsuite/bfin/c_dsp32alu_rrppmm_sft_x.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_saa.s b/sim/testsuite/bfin/c_dsp32alu_saa.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_saa.s
rename to sim/testsuite/bfin/c_dsp32alu_saa.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_sat_aa.S b/sim/testsuite/bfin/c_dsp32alu_sat_aa.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_sat_aa.S
rename to sim/testsuite/bfin/c_dsp32alu_sat_aa.S

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_search.s b/sim/testsuite/bfin/c_dsp32alu_search.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_search.s
rename to sim/testsuite/bfin/c_dsp32alu_search.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32alu_sgn.s b/sim/testsuite/bfin/c_dsp32alu_sgn.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32alu_sgn.s
rename to sim/testsuite/bfin/c_dsp32alu_sgn.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_a1a0.s b/sim/testsuite/bfin/c_dsp32mac_a1a0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_a1a0.s
rename to sim/testsuite/bfin/c_dsp32mac_a1a0.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_a1a0_iuw32.s b/sim/testsuite/bfin/c_dsp32mac_a1a0_iuw32.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_a1a0_iuw32.s
rename to sim/testsuite/bfin/c_dsp32mac_a1a0_iuw32.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_a1a0_m.s b/sim/testsuite/bfin/c_dsp32mac_a1a0_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_a1a0_m.s
rename to sim/testsuite/bfin/c_dsp32mac_a1a0_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a0.s b/sim/testsuite/bfin/c_dsp32mac_dr_a0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a0.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a0.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_i.s b/sim/testsuite/bfin/c_dsp32mac_dr_a0_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_i.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a0_i.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_ih.s b/sim/testsuite/bfin/c_dsp32mac_dr_a0_ih.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_ih.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a0_ih.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_is.s b/sim/testsuite/bfin/c_dsp32mac_dr_a0_is.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_is.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a0_is.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_iu.s b/sim/testsuite/bfin/c_dsp32mac_dr_a0_iu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_iu.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a0_iu.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_m.s b/sim/testsuite/bfin/c_dsp32mac_dr_a0_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_m.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a0_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_s.s b/sim/testsuite/bfin/c_dsp32mac_dr_a0_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_s.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a0_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_t.s b/sim/testsuite/bfin/c_dsp32mac_dr_a0_t.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_t.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a0_t.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_tu.s b/sim/testsuite/bfin/c_dsp32mac_dr_a0_tu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_tu.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a0_tu.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_u.s b/sim/testsuite/bfin/c_dsp32mac_dr_a0_u.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a0_u.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a0_u.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_i.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_i.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1_i.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_ih.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1_ih.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_ih.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1_ih.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_is.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1_is.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_is.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1_is.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_iu.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1_iu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_iu.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1_iu.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_m.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_m.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_s.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_s.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_t.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1_t.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_t.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1_t.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_tu.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1_tu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_tu.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1_tu.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_u.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1_u.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1_u.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1_u.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1a0.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1a0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1a0.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1a0.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1a0_iutsh.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1a0_iutsh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1a0_iutsh.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1a0_iutsh.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_dr_a1a0_m.s b/sim/testsuite/bfin/c_dsp32mac_dr_a1a0_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_dr_a1a0_m.s
rename to sim/testsuite/bfin/c_dsp32mac_dr_a1a0_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_mix.s b/sim/testsuite/bfin/c_dsp32mac_mix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_mix.s
rename to sim/testsuite/bfin/c_dsp32mac_mix.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a0.s b/sim/testsuite/bfin/c_dsp32mac_pair_a0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a0.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a0.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a0_i.s b/sim/testsuite/bfin/c_dsp32mac_pair_a0_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a0_i.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a0_i.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a0_is.s b/sim/testsuite/bfin/c_dsp32mac_pair_a0_is.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a0_is.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a0_is.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a0_m.s b/sim/testsuite/bfin/c_dsp32mac_pair_a0_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a0_m.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a0_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a0_s.s b/sim/testsuite/bfin/c_dsp32mac_pair_a0_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a0_s.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a0_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a0_u.s b/sim/testsuite/bfin/c_dsp32mac_pair_a0_u.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a0_u.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a0_u.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1_i.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1_i.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1_i.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1_is.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1_is.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1_is.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1_is.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1_m.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1_m.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1_s.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1_s.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1_u.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1_u.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1_u.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1_u.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1a0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1a0.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0_i.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1a0_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0_i.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1a0_i.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0_is.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1a0_is.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0_is.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1a0_is.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0_m.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1a0_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0_m.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1a0_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0_s.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1a0_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0_s.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1a0_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0_u.s b/sim/testsuite/bfin/c_dsp32mac_pair_a1a0_u.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_a1a0_u.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_a1a0_u.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mac_pair_mix.s b/sim/testsuite/bfin/c_dsp32mac_pair_mix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mac_pair_mix.s
rename to sim/testsuite/bfin/c_dsp32mac_pair_mix.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr.s b/sim/testsuite/bfin/c_dsp32mult_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr.s
rename to sim/testsuite/bfin/c_dsp32mult_dr.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_i.s b/sim/testsuite/bfin/c_dsp32mult_dr_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_i.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_i.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_ih.s b/sim/testsuite/bfin/c_dsp32mult_dr_ih.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_ih.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_ih.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_is.s b/sim/testsuite/bfin/c_dsp32mult_dr_is.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_is.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_is.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_iu.s b/sim/testsuite/bfin/c_dsp32mult_dr_iu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_iu.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_iu.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_m.s b/sim/testsuite/bfin/c_dsp32mult_dr_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_m.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_m_i.s b/sim/testsuite/bfin/c_dsp32mult_dr_m_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_m_i.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_m_i.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_m_iutsh.s b/sim/testsuite/bfin/c_dsp32mult_dr_m_iutsh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_m_iutsh.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_m_iutsh.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_m_s.s b/sim/testsuite/bfin/c_dsp32mult_dr_m_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_m_s.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_m_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_m_t.s b/sim/testsuite/bfin/c_dsp32mult_dr_m_t.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_m_t.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_m_t.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_m_u.s b/sim/testsuite/bfin/c_dsp32mult_dr_m_u.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_m_u.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_m_u.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_mix.s b/sim/testsuite/bfin/c_dsp32mult_dr_mix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_mix.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_mix.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_s.s b/sim/testsuite/bfin/c_dsp32mult_dr_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_s.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_t.s b/sim/testsuite/bfin/c_dsp32mult_dr_t.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_t.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_t.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_tu.s b/sim/testsuite/bfin/c_dsp32mult_dr_tu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_tu.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_tu.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_dr_u.s b/sim/testsuite/bfin/c_dsp32mult_dr_u.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_dr_u.s
rename to sim/testsuite/bfin/c_dsp32mult_dr_u.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_pair.s b/sim/testsuite/bfin/c_dsp32mult_pair.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_pair.s
rename to sim/testsuite/bfin/c_dsp32mult_pair.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_pair_i.s b/sim/testsuite/bfin/c_dsp32mult_pair_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_pair_i.s
rename to sim/testsuite/bfin/c_dsp32mult_pair_i.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_pair_is.s b/sim/testsuite/bfin/c_dsp32mult_pair_is.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_pair_is.s
rename to sim/testsuite/bfin/c_dsp32mult_pair_is.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_pair_m.s b/sim/testsuite/bfin/c_dsp32mult_pair_m.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_pair_m.s
rename to sim/testsuite/bfin/c_dsp32mult_pair_m.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_pair_m_i.s b/sim/testsuite/bfin/c_dsp32mult_pair_m_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_pair_m_i.s
rename to sim/testsuite/bfin/c_dsp32mult_pair_m_i.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_pair_m_is.s b/sim/testsuite/bfin/c_dsp32mult_pair_m_is.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_pair_m_is.s
rename to sim/testsuite/bfin/c_dsp32mult_pair_m_is.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_pair_m_s.s b/sim/testsuite/bfin/c_dsp32mult_pair_m_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_pair_m_s.s
rename to sim/testsuite/bfin/c_dsp32mult_pair_m_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_pair_m_u.s b/sim/testsuite/bfin/c_dsp32mult_pair_m_u.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_pair_m_u.s
rename to sim/testsuite/bfin/c_dsp32mult_pair_m_u.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_pair_s.s b/sim/testsuite/bfin/c_dsp32mult_pair_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_pair_s.s
rename to sim/testsuite/bfin/c_dsp32mult_pair_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32mult_pair_u.s b/sim/testsuite/bfin/c_dsp32mult_pair_u.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32mult_pair_u.s
rename to sim/testsuite/bfin/c_dsp32mult_pair_u.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_a0alr.s b/sim/testsuite/bfin/c_dsp32shift_a0alr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_a0alr.s
rename to sim/testsuite/bfin/c_dsp32shift_a0alr.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_af.s b/sim/testsuite/bfin/c_dsp32shift_af.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_af.s
rename to sim/testsuite/bfin/c_dsp32shift_af.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_af_s.s b/sim/testsuite/bfin/c_dsp32shift_af_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_af_s.s
rename to sim/testsuite/bfin/c_dsp32shift_af_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ahalf_ln.s b/sim/testsuite/bfin/c_dsp32shift_ahalf_ln.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ahalf_ln.s
rename to sim/testsuite/bfin/c_dsp32shift_ahalf_ln.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ahalf_ln_s.s b/sim/testsuite/bfin/c_dsp32shift_ahalf_ln_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ahalf_ln_s.s
rename to sim/testsuite/bfin/c_dsp32shift_ahalf_ln_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ahalf_lp.s b/sim/testsuite/bfin/c_dsp32shift_ahalf_lp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ahalf_lp.s
rename to sim/testsuite/bfin/c_dsp32shift_ahalf_lp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ahalf_lp_s.s b/sim/testsuite/bfin/c_dsp32shift_ahalf_lp_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ahalf_lp_s.s
rename to sim/testsuite/bfin/c_dsp32shift_ahalf_lp_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ahalf_rn.s b/sim/testsuite/bfin/c_dsp32shift_ahalf_rn.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ahalf_rn.s
rename to sim/testsuite/bfin/c_dsp32shift_ahalf_rn.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ahalf_rn_s.s b/sim/testsuite/bfin/c_dsp32shift_ahalf_rn_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ahalf_rn_s.s
rename to sim/testsuite/bfin/c_dsp32shift_ahalf_rn_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ahalf_rp.s b/sim/testsuite/bfin/c_dsp32shift_ahalf_rp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ahalf_rp.s
rename to sim/testsuite/bfin/c_dsp32shift_ahalf_rp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ahalf_rp_s.s b/sim/testsuite/bfin/c_dsp32shift_ahalf_rp_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ahalf_rp_s.s
rename to sim/testsuite/bfin/c_dsp32shift_ahalf_rp_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ahh.s b/sim/testsuite/bfin/c_dsp32shift_ahh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ahh.s
rename to sim/testsuite/bfin/c_dsp32shift_ahh.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ahh_s.s b/sim/testsuite/bfin/c_dsp32shift_ahh_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ahh_s.s
rename to sim/testsuite/bfin/c_dsp32shift_ahh_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_align16.s b/sim/testsuite/bfin/c_dsp32shift_align16.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_align16.s
rename to sim/testsuite/bfin/c_dsp32shift_align16.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_align24.s b/sim/testsuite/bfin/c_dsp32shift_align24.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_align24.s
rename to sim/testsuite/bfin/c_dsp32shift_align24.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_align8.s b/sim/testsuite/bfin/c_dsp32shift_align8.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_align8.s
rename to sim/testsuite/bfin/c_dsp32shift_align8.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_amix.s b/sim/testsuite/bfin/c_dsp32shift_amix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_amix.s
rename to sim/testsuite/bfin/c_dsp32shift_amix.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_bitmux.s b/sim/testsuite/bfin/c_dsp32shift_bitmux.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_bitmux.s
rename to sim/testsuite/bfin/c_dsp32shift_bitmux.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_bxor.s b/sim/testsuite/bfin/c_dsp32shift_bxor.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_bxor.s
rename to sim/testsuite/bfin/c_dsp32shift_bxor.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_expadj_h.s b/sim/testsuite/bfin/c_dsp32shift_expadj_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_expadj_h.s
rename to sim/testsuite/bfin/c_dsp32shift_expadj_h.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_expadj_l.s b/sim/testsuite/bfin/c_dsp32shift_expadj_l.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_expadj_l.s
rename to sim/testsuite/bfin/c_dsp32shift_expadj_l.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_expadj_r.s b/sim/testsuite/bfin/c_dsp32shift_expadj_r.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_expadj_r.s
rename to sim/testsuite/bfin/c_dsp32shift_expadj_r.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_expexp_r.s b/sim/testsuite/bfin/c_dsp32shift_expexp_r.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_expexp_r.s
rename to sim/testsuite/bfin/c_dsp32shift_expexp_r.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_fdepx.s b/sim/testsuite/bfin/c_dsp32shift_fdepx.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_fdepx.s
rename to sim/testsuite/bfin/c_dsp32shift_fdepx.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_fextx.s b/sim/testsuite/bfin/c_dsp32shift_fextx.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_fextx.s
rename to sim/testsuite/bfin/c_dsp32shift_fextx.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_lf.s b/sim/testsuite/bfin/c_dsp32shift_lf.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_lf.s
rename to sim/testsuite/bfin/c_dsp32shift_lf.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_lhalf_ln.s b/sim/testsuite/bfin/c_dsp32shift_lhalf_ln.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_lhalf_ln.s
rename to sim/testsuite/bfin/c_dsp32shift_lhalf_ln.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_lhalf_lp.s b/sim/testsuite/bfin/c_dsp32shift_lhalf_lp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_lhalf_lp.s
rename to sim/testsuite/bfin/c_dsp32shift_lhalf_lp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_lhalf_rn.s b/sim/testsuite/bfin/c_dsp32shift_lhalf_rn.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_lhalf_rn.s
rename to sim/testsuite/bfin/c_dsp32shift_lhalf_rn.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_lhalf_rp.s b/sim/testsuite/bfin/c_dsp32shift_lhalf_rp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_lhalf_rp.s
rename to sim/testsuite/bfin/c_dsp32shift_lhalf_rp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_lhh.s b/sim/testsuite/bfin/c_dsp32shift_lhh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_lhh.s
rename to sim/testsuite/bfin/c_dsp32shift_lhh.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_lmix.s b/sim/testsuite/bfin/c_dsp32shift_lmix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_lmix.s
rename to sim/testsuite/bfin/c_dsp32shift_lmix.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_ones.s b/sim/testsuite/bfin/c_dsp32shift_ones.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_ones.s
rename to sim/testsuite/bfin/c_dsp32shift_ones.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_pack.s b/sim/testsuite/bfin/c_dsp32shift_pack.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_pack.s
rename to sim/testsuite/bfin/c_dsp32shift_pack.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_rot.s b/sim/testsuite/bfin/c_dsp32shift_rot.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_rot.s
rename to sim/testsuite/bfin/c_dsp32shift_rot.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_rot_mix.s b/sim/testsuite/bfin/c_dsp32shift_rot_mix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_rot_mix.s
rename to sim/testsuite/bfin/c_dsp32shift_rot_mix.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_signbits_r.s b/sim/testsuite/bfin/c_dsp32shift_signbits_r.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_signbits_r.s
rename to sim/testsuite/bfin/c_dsp32shift_signbits_r.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_signbits_rh.s b/sim/testsuite/bfin/c_dsp32shift_signbits_rh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_signbits_rh.s
rename to sim/testsuite/bfin/c_dsp32shift_signbits_rh.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_signbits_rl.s b/sim/testsuite/bfin/c_dsp32shift_signbits_rl.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_signbits_rl.s
rename to sim/testsuite/bfin/c_dsp32shift_signbits_rl.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_vmax.s b/sim/testsuite/bfin/c_dsp32shift_vmax.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_vmax.s
rename to sim/testsuite/bfin/c_dsp32shift_vmax.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shift_vmaxvmax.s b/sim/testsuite/bfin/c_dsp32shift_vmaxvmax.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shift_vmaxvmax.s
rename to sim/testsuite/bfin/c_dsp32shift_vmaxvmax.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_a0alr.s b/sim/testsuite/bfin/c_dsp32shiftim_a0alr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_a0alr.s
rename to sim/testsuite/bfin/c_dsp32shiftim_a0alr.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_af.s b/sim/testsuite/bfin/c_dsp32shiftim_af.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_af.s
rename to sim/testsuite/bfin/c_dsp32shiftim_af.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_af_s.s b/sim/testsuite/bfin/c_dsp32shiftim_af_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_af_s.s
rename to sim/testsuite/bfin/c_dsp32shiftim_af_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_ln.s b/sim/testsuite/bfin/c_dsp32shiftim_ahalf_ln.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_ln.s
rename to sim/testsuite/bfin/c_dsp32shiftim_ahalf_ln.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_ln_s.s b/sim/testsuite/bfin/c_dsp32shiftim_ahalf_ln_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_ln_s.s
rename to sim/testsuite/bfin/c_dsp32shiftim_ahalf_ln_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_lp.s b/sim/testsuite/bfin/c_dsp32shiftim_ahalf_lp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_lp.s
rename to sim/testsuite/bfin/c_dsp32shiftim_ahalf_lp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_lp_s.s b/sim/testsuite/bfin/c_dsp32shiftim_ahalf_lp_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_lp_s.s
rename to sim/testsuite/bfin/c_dsp32shiftim_ahalf_lp_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_rn.s b/sim/testsuite/bfin/c_dsp32shiftim_ahalf_rn.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_rn.s
rename to sim/testsuite/bfin/c_dsp32shiftim_ahalf_rn.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_rn_s.s b/sim/testsuite/bfin/c_dsp32shiftim_ahalf_rn_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_rn_s.s
rename to sim/testsuite/bfin/c_dsp32shiftim_ahalf_rn_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_rp.s b/sim/testsuite/bfin/c_dsp32shiftim_ahalf_rp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_rp.s
rename to sim/testsuite/bfin/c_dsp32shiftim_ahalf_rp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_rp_s.s b/sim/testsuite/bfin/c_dsp32shiftim_ahalf_rp_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_ahalf_rp_s.s
rename to sim/testsuite/bfin/c_dsp32shiftim_ahalf_rp_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_ahh.s b/sim/testsuite/bfin/c_dsp32shiftim_ahh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_ahh.s
rename to sim/testsuite/bfin/c_dsp32shiftim_ahh.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_ahh_s.s b/sim/testsuite/bfin/c_dsp32shiftim_ahh_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_ahh_s.s
rename to sim/testsuite/bfin/c_dsp32shiftim_ahh_s.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_amix.s b/sim/testsuite/bfin/c_dsp32shiftim_amix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_amix.s
rename to sim/testsuite/bfin/c_dsp32shiftim_amix.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_lf.s b/sim/testsuite/bfin/c_dsp32shiftim_lf.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_lf.s
rename to sim/testsuite/bfin/c_dsp32shiftim_lf.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_lhalf_ln.s b/sim/testsuite/bfin/c_dsp32shiftim_lhalf_ln.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_lhalf_ln.s
rename to sim/testsuite/bfin/c_dsp32shiftim_lhalf_ln.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_lhalf_lp.s b/sim/testsuite/bfin/c_dsp32shiftim_lhalf_lp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_lhalf_lp.s
rename to sim/testsuite/bfin/c_dsp32shiftim_lhalf_lp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_lhalf_rn.s b/sim/testsuite/bfin/c_dsp32shiftim_lhalf_rn.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_lhalf_rn.s
rename to sim/testsuite/bfin/c_dsp32shiftim_lhalf_rn.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_lhalf_rp.s b/sim/testsuite/bfin/c_dsp32shiftim_lhalf_rp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_lhalf_rp.s
rename to sim/testsuite/bfin/c_dsp32shiftim_lhalf_rp.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_lhh.s b/sim/testsuite/bfin/c_dsp32shiftim_lhh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_lhh.s
rename to sim/testsuite/bfin/c_dsp32shiftim_lhh.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_lmix.s b/sim/testsuite/bfin/c_dsp32shiftim_lmix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_lmix.s
rename to sim/testsuite/bfin/c_dsp32shiftim_lmix.s

diff --git a/sim/testsuite/sim/bfin/c_dsp32shiftim_rot.s b/sim/testsuite/bfin/c_dsp32shiftim_rot.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dsp32shiftim_rot.s
rename to sim/testsuite/bfin/c_dsp32shiftim_rot.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_ld_dr_i.s b/sim/testsuite/bfin/c_dspldst_ld_dr_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_ld_dr_i.s
rename to sim/testsuite/bfin/c_dspldst_ld_dr_i.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_ld_dr_ipp.s b/sim/testsuite/bfin/c_dspldst_ld_dr_ipp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_ld_dr_ipp.s
rename to sim/testsuite/bfin/c_dspldst_ld_dr_ipp.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_ld_dr_ippm.s b/sim/testsuite/bfin/c_dspldst_ld_dr_ippm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_ld_dr_ippm.s
rename to sim/testsuite/bfin/c_dspldst_ld_dr_ippm.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_ld_drhi_i.s b/sim/testsuite/bfin/c_dspldst_ld_drhi_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_ld_drhi_i.s
rename to sim/testsuite/bfin/c_dspldst_ld_drhi_i.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_ld_drhi_ipp.s b/sim/testsuite/bfin/c_dspldst_ld_drhi_ipp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_ld_drhi_ipp.s
rename to sim/testsuite/bfin/c_dspldst_ld_drhi_ipp.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_ld_drlo_i.s b/sim/testsuite/bfin/c_dspldst_ld_drlo_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_ld_drlo_i.s
rename to sim/testsuite/bfin/c_dspldst_ld_drlo_i.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_ld_drlo_ipp.s b/sim/testsuite/bfin/c_dspldst_ld_drlo_ipp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_ld_drlo_ipp.s
rename to sim/testsuite/bfin/c_dspldst_ld_drlo_ipp.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_st_dr_i.s b/sim/testsuite/bfin/c_dspldst_st_dr_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_st_dr_i.s
rename to sim/testsuite/bfin/c_dspldst_st_dr_i.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_st_dr_ipp.s b/sim/testsuite/bfin/c_dspldst_st_dr_ipp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_st_dr_ipp.s
rename to sim/testsuite/bfin/c_dspldst_st_dr_ipp.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_st_dr_ippm.s b/sim/testsuite/bfin/c_dspldst_st_dr_ippm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_st_dr_ippm.s
rename to sim/testsuite/bfin/c_dspldst_st_dr_ippm.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_st_drhi_i.s b/sim/testsuite/bfin/c_dspldst_st_drhi_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_st_drhi_i.s
rename to sim/testsuite/bfin/c_dspldst_st_drhi_i.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_st_drhi_ipp.s b/sim/testsuite/bfin/c_dspldst_st_drhi_ipp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_st_drhi_ipp.s
rename to sim/testsuite/bfin/c_dspldst_st_drhi_ipp.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_st_drlo_i.s b/sim/testsuite/bfin/c_dspldst_st_drlo_i.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_st_drlo_i.s
rename to sim/testsuite/bfin/c_dspldst_st_drlo_i.s

diff --git a/sim/testsuite/sim/bfin/c_dspldst_st_drlo_ipp.s b/sim/testsuite/bfin/c_dspldst_st_drlo_ipp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_dspldst_st_drlo_ipp.s
rename to sim/testsuite/bfin/c_dspldst_st_drlo_ipp.s

diff --git a/sim/testsuite/sim/bfin/c_except_illopcode.S b/sim/testsuite/bfin/c_except_illopcode.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_except_illopcode.S
rename to sim/testsuite/bfin/c_except_illopcode.S

diff --git a/sim/testsuite/sim/bfin/c_except_sys_sstep.S b/sim/testsuite/bfin/c_except_sys_sstep.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_except_sys_sstep.S
rename to sim/testsuite/bfin/c_except_sys_sstep.S

diff --git a/sim/testsuite/sim/bfin/c_except_user_mode.S b/sim/testsuite/bfin/c_except_user_mode.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_except_user_mode.S
rename to sim/testsuite/bfin/c_except_user_mode.S

diff --git a/sim/testsuite/sim/bfin/c_interr_disable.S b/sim/testsuite/bfin/c_interr_disable.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_disable.S
rename to sim/testsuite/bfin/c_interr_disable.S

diff --git a/sim/testsuite/sim/bfin/c_interr_disable_enable.S b/sim/testsuite/bfin/c_interr_disable_enable.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_disable_enable.S
rename to sim/testsuite/bfin/c_interr_disable_enable.S

diff --git a/sim/testsuite/sim/bfin/c_interr_excpt.S b/sim/testsuite/bfin/c_interr_excpt.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_excpt.S
rename to sim/testsuite/bfin/c_interr_excpt.S

diff --git a/sim/testsuite/sim/bfin/c_interr_loopsetup_stld.S b/sim/testsuite/bfin/c_interr_loopsetup_stld.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_loopsetup_stld.S
rename to sim/testsuite/bfin/c_interr_loopsetup_stld.S

diff --git a/sim/testsuite/sim/bfin/c_interr_nested.S b/sim/testsuite/bfin/c_interr_nested.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_nested.S
rename to sim/testsuite/bfin/c_interr_nested.S

diff --git a/sim/testsuite/sim/bfin/c_interr_nmi.S b/sim/testsuite/bfin/c_interr_nmi.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_nmi.S
rename to sim/testsuite/bfin/c_interr_nmi.S

diff --git a/sim/testsuite/sim/bfin/c_interr_pending.S b/sim/testsuite/bfin/c_interr_pending.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_pending.S
rename to sim/testsuite/bfin/c_interr_pending.S

diff --git a/sim/testsuite/sim/bfin/c_interr_pending_2.S b/sim/testsuite/bfin/c_interr_pending_2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_pending_2.S
rename to sim/testsuite/bfin/c_interr_pending_2.S

diff --git a/sim/testsuite/sim/bfin/c_interr_timer.S b/sim/testsuite/bfin/c_interr_timer.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_timer.S
rename to sim/testsuite/bfin/c_interr_timer.S

diff --git a/sim/testsuite/sim/bfin/c_interr_timer_reload.S b/sim/testsuite/bfin/c_interr_timer_reload.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_timer_reload.S
rename to sim/testsuite/bfin/c_interr_timer_reload.S

diff --git a/sim/testsuite/sim/bfin/c_interr_timer_tcount.S b/sim/testsuite/bfin/c_interr_timer_tcount.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_timer_tcount.S
rename to sim/testsuite/bfin/c_interr_timer_tcount.S

diff --git a/sim/testsuite/sim/bfin/c_interr_timer_tscale.S b/sim/testsuite/bfin/c_interr_timer_tscale.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_interr_timer_tscale.S
rename to sim/testsuite/bfin/c_interr_timer_tscale.S

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_dreg.s b/sim/testsuite/bfin/c_ldimmhalf_dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_dreg.s
rename to sim/testsuite/bfin/c_ldimmhalf_dreg.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_drhi.s b/sim/testsuite/bfin/c_ldimmhalf_drhi.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_drhi.s
rename to sim/testsuite/bfin/c_ldimmhalf_drhi.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_drlo.s b/sim/testsuite/bfin/c_ldimmhalf_drlo.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_drlo.s
rename to sim/testsuite/bfin/c_ldimmhalf_drlo.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_h_dr.s b/sim/testsuite/bfin/c_ldimmhalf_h_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_h_dr.s
rename to sim/testsuite/bfin/c_ldimmhalf_h_dr.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_h_ibml.s b/sim/testsuite/bfin/c_ldimmhalf_h_ibml.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_h_ibml.s
rename to sim/testsuite/bfin/c_ldimmhalf_h_ibml.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_h_pr.s b/sim/testsuite/bfin/c_ldimmhalf_h_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_h_pr.s
rename to sim/testsuite/bfin/c_ldimmhalf_h_pr.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_l_dr.s b/sim/testsuite/bfin/c_ldimmhalf_l_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_l_dr.s
rename to sim/testsuite/bfin/c_ldimmhalf_l_dr.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_l_ibml.s b/sim/testsuite/bfin/c_ldimmhalf_l_ibml.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_l_ibml.s
rename to sim/testsuite/bfin/c_ldimmhalf_l_ibml.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_l_pr.s b/sim/testsuite/bfin/c_ldimmhalf_l_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_l_pr.s
rename to sim/testsuite/bfin/c_ldimmhalf_l_pr.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_lz_dr.s b/sim/testsuite/bfin/c_ldimmhalf_lz_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_lz_dr.s
rename to sim/testsuite/bfin/c_ldimmhalf_lz_dr.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_lz_ibml.s b/sim/testsuite/bfin/c_ldimmhalf_lz_ibml.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_lz_ibml.s
rename to sim/testsuite/bfin/c_ldimmhalf_lz_ibml.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_lz_pr.s b/sim/testsuite/bfin/c_ldimmhalf_lz_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_lz_pr.s
rename to sim/testsuite/bfin/c_ldimmhalf_lz_pr.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_lzhi_dr.s b/sim/testsuite/bfin/c_ldimmhalf_lzhi_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_lzhi_dr.s
rename to sim/testsuite/bfin/c_ldimmhalf_lzhi_dr.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_lzhi_ibml.s b/sim/testsuite/bfin/c_ldimmhalf_lzhi_ibml.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_lzhi_ibml.s
rename to sim/testsuite/bfin/c_ldimmhalf_lzhi_ibml.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_lzhi_pr.s b/sim/testsuite/bfin/c_ldimmhalf_lzhi_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_lzhi_pr.s
rename to sim/testsuite/bfin/c_ldimmhalf_lzhi_pr.s

diff --git a/sim/testsuite/sim/bfin/c_ldimmhalf_pibml.s b/sim/testsuite/bfin/c_ldimmhalf_pibml.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldimmhalf_pibml.s
rename to sim/testsuite/bfin/c_ldimmhalf_pibml.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p.s b/sim/testsuite/bfin/c_ldst_ld_d_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_b.s b/sim/testsuite/bfin/c_ldst_ld_d_p_b.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_b.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_b.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_h.s b/sim/testsuite/bfin/c_ldst_ld_d_p_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_h.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_h.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_mm.s b/sim/testsuite/bfin/c_ldst_ld_d_p_mm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_mm.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_mm.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_mm_b.s b/sim/testsuite/bfin/c_ldst_ld_d_p_mm_b.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_mm_b.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_mm_b.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_mm_h.s b/sim/testsuite/bfin/c_ldst_ld_d_p_mm_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_mm_h.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_mm_h.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_mm_xb.s b/sim/testsuite/bfin/c_ldst_ld_d_p_mm_xb.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_mm_xb.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_mm_xb.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_mm_xh.s b/sim/testsuite/bfin/c_ldst_ld_d_p_mm_xh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_mm_xh.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_mm_xh.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_pp.s b/sim/testsuite/bfin/c_ldst_ld_d_p_pp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_pp.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_pp.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_pp_b.s b/sim/testsuite/bfin/c_ldst_ld_d_p_pp_b.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_pp_b.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_pp_b.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_pp_h.s b/sim/testsuite/bfin/c_ldst_ld_d_p_pp_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_pp_h.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_pp_h.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_pp_xb.s b/sim/testsuite/bfin/c_ldst_ld_d_p_pp_xb.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_pp_xb.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_pp_xb.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_pp_xh.s b/sim/testsuite/bfin/c_ldst_ld_d_p_pp_xh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_pp_xh.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_pp_xh.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_ppmm_hbx.s b/sim/testsuite/bfin/c_ldst_ld_d_p_ppmm_hbx.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_ppmm_hbx.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_ppmm_hbx.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_xb.s b/sim/testsuite/bfin/c_ldst_ld_d_p_xb.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_xb.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_xb.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_d_p_xh.s b/sim/testsuite/bfin/c_ldst_ld_d_p_xh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_d_p_xh.s
rename to sim/testsuite/bfin/c_ldst_ld_d_p_xh.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_p_p.s b/sim/testsuite/bfin/c_ldst_ld_p_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_p_p.s
rename to sim/testsuite/bfin/c_ldst_ld_p_p.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_p_p_mm.s b/sim/testsuite/bfin/c_ldst_ld_p_p_mm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_p_p_mm.s
rename to sim/testsuite/bfin/c_ldst_ld_p_p_mm.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_ld_p_p_pp.s b/sim/testsuite/bfin/c_ldst_ld_p_p_pp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_ld_p_p_pp.s
rename to sim/testsuite/bfin/c_ldst_ld_p_p_pp.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_d.s b/sim/testsuite/bfin/c_ldst_st_p_d.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_d.s
rename to sim/testsuite/bfin/c_ldst_st_p_d.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_d_b.s b/sim/testsuite/bfin/c_ldst_st_p_d_b.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_d_b.s
rename to sim/testsuite/bfin/c_ldst_st_p_d_b.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_d_h.s b/sim/testsuite/bfin/c_ldst_st_p_d_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_d_h.s
rename to sim/testsuite/bfin/c_ldst_st_p_d_h.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_d_mm.s b/sim/testsuite/bfin/c_ldst_st_p_d_mm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_d_mm.s
rename to sim/testsuite/bfin/c_ldst_st_p_d_mm.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_d_mm_b.s b/sim/testsuite/bfin/c_ldst_st_p_d_mm_b.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_d_mm_b.s
rename to sim/testsuite/bfin/c_ldst_st_p_d_mm_b.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_d_mm_h.s b/sim/testsuite/bfin/c_ldst_st_p_d_mm_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_d_mm_h.s
rename to sim/testsuite/bfin/c_ldst_st_p_d_mm_h.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_d_pp.s b/sim/testsuite/bfin/c_ldst_st_p_d_pp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_d_pp.s
rename to sim/testsuite/bfin/c_ldst_st_p_d_pp.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_d_pp_b.s b/sim/testsuite/bfin/c_ldst_st_p_d_pp_b.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_d_pp_b.s
rename to sim/testsuite/bfin/c_ldst_st_p_d_pp_b.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_d_pp_h.s b/sim/testsuite/bfin/c_ldst_st_p_d_pp_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_d_pp_h.s
rename to sim/testsuite/bfin/c_ldst_st_p_d_pp_h.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_p.s b/sim/testsuite/bfin/c_ldst_st_p_p.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_p.s
rename to sim/testsuite/bfin/c_ldst_st_p_p.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_p_mm.s b/sim/testsuite/bfin/c_ldst_st_p_p_mm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_p_mm.s
rename to sim/testsuite/bfin/c_ldst_st_p_p_mm.s

diff --git a/sim/testsuite/sim/bfin/c_ldst_st_p_p_pp.s b/sim/testsuite/bfin/c_ldst_st_p_p_pp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldst_st_p_p_pp.s
rename to sim/testsuite/bfin/c_ldst_st_p_p_pp.s

diff --git a/sim/testsuite/sim/bfin/c_ldstidxl_ld_dr_b.s b/sim/testsuite/bfin/c_ldstidxl_ld_dr_b.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstidxl_ld_dr_b.s
rename to sim/testsuite/bfin/c_ldstidxl_ld_dr_b.s

diff --git a/sim/testsuite/sim/bfin/c_ldstidxl_ld_dr_h.s b/sim/testsuite/bfin/c_ldstidxl_ld_dr_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstidxl_ld_dr_h.s
rename to sim/testsuite/bfin/c_ldstidxl_ld_dr_h.s

diff --git a/sim/testsuite/sim/bfin/c_ldstidxl_ld_dr_xb.s b/sim/testsuite/bfin/c_ldstidxl_ld_dr_xb.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstidxl_ld_dr_xb.s
rename to sim/testsuite/bfin/c_ldstidxl_ld_dr_xb.s

diff --git a/sim/testsuite/sim/bfin/c_ldstidxl_ld_dr_xh.s b/sim/testsuite/bfin/c_ldstidxl_ld_dr_xh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstidxl_ld_dr_xh.s
rename to sim/testsuite/bfin/c_ldstidxl_ld_dr_xh.s

diff --git a/sim/testsuite/sim/bfin/c_ldstidxl_ld_dreg.s b/sim/testsuite/bfin/c_ldstidxl_ld_dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstidxl_ld_dreg.s
rename to sim/testsuite/bfin/c_ldstidxl_ld_dreg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstidxl_ld_preg.s b/sim/testsuite/bfin/c_ldstidxl_ld_preg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstidxl_ld_preg.s
rename to sim/testsuite/bfin/c_ldstidxl_ld_preg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstidxl_st_dr_b.s b/sim/testsuite/bfin/c_ldstidxl_st_dr_b.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstidxl_st_dr_b.s
rename to sim/testsuite/bfin/c_ldstidxl_st_dr_b.s

diff --git a/sim/testsuite/sim/bfin/c_ldstidxl_st_dr_h.s b/sim/testsuite/bfin/c_ldstidxl_st_dr_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstidxl_st_dr_h.s
rename to sim/testsuite/bfin/c_ldstidxl_st_dr_h.s

diff --git a/sim/testsuite/sim/bfin/c_ldstidxl_st_dreg.s b/sim/testsuite/bfin/c_ldstidxl_st_dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstidxl_st_dreg.s
rename to sim/testsuite/bfin/c_ldstidxl_st_dreg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstidxl_st_preg.s b/sim/testsuite/bfin/c_ldstidxl_st_preg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstidxl_st_preg.s
rename to sim/testsuite/bfin/c_ldstidxl_st_preg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstii_ld_dr_h.s b/sim/testsuite/bfin/c_ldstii_ld_dr_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstii_ld_dr_h.s
rename to sim/testsuite/bfin/c_ldstii_ld_dr_h.s

diff --git a/sim/testsuite/sim/bfin/c_ldstii_ld_dr_xh.s b/sim/testsuite/bfin/c_ldstii_ld_dr_xh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstii_ld_dr_xh.s
rename to sim/testsuite/bfin/c_ldstii_ld_dr_xh.s

diff --git a/sim/testsuite/sim/bfin/c_ldstii_ld_dreg.s b/sim/testsuite/bfin/c_ldstii_ld_dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstii_ld_dreg.s
rename to sim/testsuite/bfin/c_ldstii_ld_dreg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstii_ld_preg.s b/sim/testsuite/bfin/c_ldstii_ld_preg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstii_ld_preg.s
rename to sim/testsuite/bfin/c_ldstii_ld_preg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstii_st_dr_h.s b/sim/testsuite/bfin/c_ldstii_st_dr_h.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstii_st_dr_h.s
rename to sim/testsuite/bfin/c_ldstii_st_dr_h.s

diff --git a/sim/testsuite/sim/bfin/c_ldstii_st_dreg.s b/sim/testsuite/bfin/c_ldstii_st_dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstii_st_dreg.s
rename to sim/testsuite/bfin/c_ldstii_st_dreg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstii_st_preg.s b/sim/testsuite/bfin/c_ldstii_st_preg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstii_st_preg.s
rename to sim/testsuite/bfin/c_ldstii_st_preg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstiifp_ld_dreg.s b/sim/testsuite/bfin/c_ldstiifp_ld_dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstiifp_ld_dreg.s
rename to sim/testsuite/bfin/c_ldstiifp_ld_dreg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstiifp_ld_preg.s b/sim/testsuite/bfin/c_ldstiifp_ld_preg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstiifp_ld_preg.s
rename to sim/testsuite/bfin/c_ldstiifp_ld_preg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstiifp_st_dreg.s b/sim/testsuite/bfin/c_ldstiifp_st_dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstiifp_st_dreg.s
rename to sim/testsuite/bfin/c_ldstiifp_st_dreg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstiifp_st_preg.s b/sim/testsuite/bfin/c_ldstiifp_st_preg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstiifp_st_preg.s
rename to sim/testsuite/bfin/c_ldstiifp_st_preg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstpmod_ld_dr_hi.s b/sim/testsuite/bfin/c_ldstpmod_ld_dr_hi.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstpmod_ld_dr_hi.s
rename to sim/testsuite/bfin/c_ldstpmod_ld_dr_hi.s

diff --git a/sim/testsuite/sim/bfin/c_ldstpmod_ld_dr_lo.s b/sim/testsuite/bfin/c_ldstpmod_ld_dr_lo.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstpmod_ld_dr_lo.s
rename to sim/testsuite/bfin/c_ldstpmod_ld_dr_lo.s

diff --git a/sim/testsuite/sim/bfin/c_ldstpmod_ld_dreg.s b/sim/testsuite/bfin/c_ldstpmod_ld_dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstpmod_ld_dreg.s
rename to sim/testsuite/bfin/c_ldstpmod_ld_dreg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstpmod_ld_h_xh.s b/sim/testsuite/bfin/c_ldstpmod_ld_h_xh.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstpmod_ld_h_xh.s
rename to sim/testsuite/bfin/c_ldstpmod_ld_h_xh.s

diff --git a/sim/testsuite/sim/bfin/c_ldstpmod_ld_lohi.s b/sim/testsuite/bfin/c_ldstpmod_ld_lohi.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstpmod_ld_lohi.s
rename to sim/testsuite/bfin/c_ldstpmod_ld_lohi.s

diff --git a/sim/testsuite/sim/bfin/c_ldstpmod_st_dr_hi.s b/sim/testsuite/bfin/c_ldstpmod_st_dr_hi.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstpmod_st_dr_hi.s
rename to sim/testsuite/bfin/c_ldstpmod_st_dr_hi.s

diff --git a/sim/testsuite/sim/bfin/c_ldstpmod_st_dr_lo.s b/sim/testsuite/bfin/c_ldstpmod_st_dr_lo.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstpmod_st_dr_lo.s
rename to sim/testsuite/bfin/c_ldstpmod_st_dr_lo.s

diff --git a/sim/testsuite/sim/bfin/c_ldstpmod_st_dreg.s b/sim/testsuite/bfin/c_ldstpmod_st_dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstpmod_st_dreg.s
rename to sim/testsuite/bfin/c_ldstpmod_st_dreg.s

diff --git a/sim/testsuite/sim/bfin/c_ldstpmod_st_lohi.s b/sim/testsuite/bfin/c_ldstpmod_st_lohi.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ldstpmod_st_lohi.s
rename to sim/testsuite/bfin/c_ldstpmod_st_lohi.s

diff --git a/sim/testsuite/sim/bfin/c_linkage.s b/sim/testsuite/bfin/c_linkage.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_linkage.s
rename to sim/testsuite/bfin/c_linkage.s

diff --git a/sim/testsuite/sim/bfin/c_logi2op_alshft_mix.s b/sim/testsuite/bfin/c_logi2op_alshft_mix.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_alshft_mix.s
rename to sim/testsuite/bfin/c_logi2op_alshft_mix.s

diff --git a/sim/testsuite/sim/bfin/c_logi2op_arith_shft.s b/sim/testsuite/bfin/c_logi2op_arith_shft.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_arith_shft.s
rename to sim/testsuite/bfin/c_logi2op_arith_shft.s

diff --git a/sim/testsuite/sim/bfin/c_logi2op_bitclr.s b/sim/testsuite/bfin/c_logi2op_bitclr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_bitclr.s
rename to sim/testsuite/bfin/c_logi2op_bitclr.s

diff --git a/sim/testsuite/sim/bfin/c_logi2op_bitset.s b/sim/testsuite/bfin/c_logi2op_bitset.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_bitset.s
rename to sim/testsuite/bfin/c_logi2op_bitset.s

diff --git a/sim/testsuite/sim/bfin/c_logi2op_bittgl.s b/sim/testsuite/bfin/c_logi2op_bittgl.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_bittgl.s
rename to sim/testsuite/bfin/c_logi2op_bittgl.s

diff --git a/sim/testsuite/sim/bfin/c_logi2op_bittst.s b/sim/testsuite/bfin/c_logi2op_bittst.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_bittst.s
rename to sim/testsuite/bfin/c_logi2op_bittst.s

diff --git a/sim/testsuite/sim/bfin/c_logi2op_log_l_shft.s b/sim/testsuite/bfin/c_logi2op_log_l_shft.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_log_l_shft.s
rename to sim/testsuite/bfin/c_logi2op_log_l_shft.s

diff --git a/sim/testsuite/sim/bfin/c_logi2op_log_l_shft_astat.S b/sim/testsuite/bfin/c_logi2op_log_l_shft_astat.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_log_l_shft_astat.S
rename to sim/testsuite/bfin/c_logi2op_log_l_shft_astat.S

diff --git a/sim/testsuite/sim/bfin/c_logi2op_log_r_shft.s b/sim/testsuite/bfin/c_logi2op_log_r_shft.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_log_r_shft.s
rename to sim/testsuite/bfin/c_logi2op_log_r_shft.s

diff --git a/sim/testsuite/sim/bfin/c_logi2op_log_r_shft_astat.S b/sim/testsuite/bfin/c_logi2op_log_r_shft_astat.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_log_r_shft_astat.S
rename to sim/testsuite/bfin/c_logi2op_log_r_shft_astat.S

diff --git a/sim/testsuite/sim/bfin/c_logi2op_nbittst.s b/sim/testsuite/bfin/c_logi2op_nbittst.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_logi2op_nbittst.s
rename to sim/testsuite/bfin/c_logi2op_nbittst.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_nested.s b/sim/testsuite/bfin/c_loopsetup_nested.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_nested.s
rename to sim/testsuite/bfin/c_loopsetup_nested.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_nested_bot.s b/sim/testsuite/bfin/c_loopsetup_nested_bot.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_nested_bot.s
rename to sim/testsuite/bfin/c_loopsetup_nested_bot.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_nested_prelc.s b/sim/testsuite/bfin/c_loopsetup_nested_prelc.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_nested_prelc.s
rename to sim/testsuite/bfin/c_loopsetup_nested_prelc.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_nested_top.s b/sim/testsuite/bfin/c_loopsetup_nested_top.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_nested_top.s
rename to sim/testsuite/bfin/c_loopsetup_nested_top.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_overlap.s b/sim/testsuite/bfin/c_loopsetup_overlap.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_overlap.s
rename to sim/testsuite/bfin/c_loopsetup_overlap.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_preg_div2_lc0.s b/sim/testsuite/bfin/c_loopsetup_preg_div2_lc0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_preg_div2_lc0.s
rename to sim/testsuite/bfin/c_loopsetup_preg_div2_lc0.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_preg_div2_lc1.s b/sim/testsuite/bfin/c_loopsetup_preg_div2_lc1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_preg_div2_lc1.s
rename to sim/testsuite/bfin/c_loopsetup_preg_div2_lc1.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_preg_lc0.s b/sim/testsuite/bfin/c_loopsetup_preg_lc0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_preg_lc0.s
rename to sim/testsuite/bfin/c_loopsetup_preg_lc0.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_preg_lc1.s b/sim/testsuite/bfin/c_loopsetup_preg_lc1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_preg_lc1.s
rename to sim/testsuite/bfin/c_loopsetup_preg_lc1.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_preg_stld.s b/sim/testsuite/bfin/c_loopsetup_preg_stld.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_preg_stld.s
rename to sim/testsuite/bfin/c_loopsetup_preg_stld.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_prelc.s b/sim/testsuite/bfin/c_loopsetup_prelc.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_prelc.s
rename to sim/testsuite/bfin/c_loopsetup_prelc.s

diff --git a/sim/testsuite/sim/bfin/c_loopsetup_topbotcntr.s b/sim/testsuite/bfin/c_loopsetup_topbotcntr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_loopsetup_topbotcntr.s
rename to sim/testsuite/bfin/c_loopsetup_topbotcntr.s

diff --git a/sim/testsuite/sim/bfin/c_mmr_interr_ctl.s b/sim/testsuite/bfin/c_mmr_interr_ctl.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_mmr_interr_ctl.s
rename to sim/testsuite/bfin/c_mmr_interr_ctl.s

diff --git a/sim/testsuite/sim/bfin/c_mmr_loop.S b/sim/testsuite/bfin/c_mmr_loop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_mmr_loop.S
rename to sim/testsuite/bfin/c_mmr_loop.S

diff --git a/sim/testsuite/sim/bfin/c_mmr_loop_user_except.S b/sim/testsuite/bfin/c_mmr_loop_user_except.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_mmr_loop_user_except.S
rename to sim/testsuite/bfin/c_mmr_loop_user_except.S

diff --git a/sim/testsuite/sim/bfin/c_mmr_ppop_illegal_adr.S b/sim/testsuite/bfin/c_mmr_ppop_illegal_adr.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_mmr_ppop_illegal_adr.S
rename to sim/testsuite/bfin/c_mmr_ppop_illegal_adr.S

diff --git a/sim/testsuite/sim/bfin/c_mmr_ppopm_illegal_adr.S b/sim/testsuite/bfin/c_mmr_ppopm_illegal_adr.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_mmr_ppopm_illegal_adr.S
rename to sim/testsuite/bfin/c_mmr_ppopm_illegal_adr.S

diff --git a/sim/testsuite/sim/bfin/c_mmr_timer.S b/sim/testsuite/bfin/c_mmr_timer.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_mmr_timer.S
rename to sim/testsuite/bfin/c_mmr_timer.S

diff --git a/sim/testsuite/sim/bfin/c_mode_supervisor.S b/sim/testsuite/bfin/c_mode_supervisor.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_mode_supervisor.S
rename to sim/testsuite/bfin/c_mode_supervisor.S

diff --git a/sim/testsuite/sim/bfin/c_mode_user.S b/sim/testsuite/bfin/c_mode_user.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_mode_user.S
rename to sim/testsuite/bfin/c_mode_user.S

diff --git a/sim/testsuite/sim/bfin/c_mode_user_superivsor.S b/sim/testsuite/bfin/c_mode_user_superivsor.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_mode_user_superivsor.S
rename to sim/testsuite/bfin/c_mode_user_superivsor.S

diff --git a/sim/testsuite/sim/bfin/c_multi_issue_dsp_ld_ld.s b/sim/testsuite/bfin/c_multi_issue_dsp_ld_ld.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_multi_issue_dsp_ld_ld.s
rename to sim/testsuite/bfin/c_multi_issue_dsp_ld_ld.s

diff --git a/sim/testsuite/sim/bfin/c_multi_issue_dsp_ldst_1.s b/sim/testsuite/bfin/c_multi_issue_dsp_ldst_1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_multi_issue_dsp_ldst_1.s
rename to sim/testsuite/bfin/c_multi_issue_dsp_ldst_1.s

diff --git a/sim/testsuite/sim/bfin/c_multi_issue_dsp_ldst_2.s b/sim/testsuite/bfin/c_multi_issue_dsp_ldst_2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_multi_issue_dsp_ldst_2.s
rename to sim/testsuite/bfin/c_multi_issue_dsp_ldst_2.s

diff --git a/sim/testsuite/sim/bfin/c_progctrl_call_pcpr.s b/sim/testsuite/bfin/c_progctrl_call_pcpr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_call_pcpr.s
rename to sim/testsuite/bfin/c_progctrl_call_pcpr.s

diff --git a/sim/testsuite/sim/bfin/c_progctrl_call_pr.s b/sim/testsuite/bfin/c_progctrl_call_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_call_pr.s
rename to sim/testsuite/bfin/c_progctrl_call_pr.s

diff --git a/sim/testsuite/sim/bfin/c_progctrl_clisti_interr.S b/sim/testsuite/bfin/c_progctrl_clisti_interr.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_clisti_interr.S
rename to sim/testsuite/bfin/c_progctrl_clisti_interr.S

diff --git a/sim/testsuite/sim/bfin/c_progctrl_csync_mmr.S b/sim/testsuite/bfin/c_progctrl_csync_mmr.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_csync_mmr.S
rename to sim/testsuite/bfin/c_progctrl_csync_mmr.S

diff --git a/sim/testsuite/sim/bfin/c_progctrl_except_rtx.S b/sim/testsuite/bfin/c_progctrl_except_rtx.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_except_rtx.S
rename to sim/testsuite/bfin/c_progctrl_except_rtx.S

diff --git a/sim/testsuite/sim/bfin/c_progctrl_excpt.S b/sim/testsuite/bfin/c_progctrl_excpt.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_excpt.S
rename to sim/testsuite/bfin/c_progctrl_excpt.S

diff --git a/sim/testsuite/sim/bfin/c_progctrl_jump_pcpr.s b/sim/testsuite/bfin/c_progctrl_jump_pcpr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_jump_pcpr.s
rename to sim/testsuite/bfin/c_progctrl_jump_pcpr.s

diff --git a/sim/testsuite/sim/bfin/c_progctrl_jump_pr.s b/sim/testsuite/bfin/c_progctrl_jump_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_jump_pr.s
rename to sim/testsuite/bfin/c_progctrl_jump_pr.s

diff --git a/sim/testsuite/sim/bfin/c_progctrl_nop.s b/sim/testsuite/bfin/c_progctrl_nop.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_nop.s
rename to sim/testsuite/bfin/c_progctrl_nop.s

diff --git a/sim/testsuite/sim/bfin/c_progctrl_raise_rt_i_n.S b/sim/testsuite/bfin/c_progctrl_raise_rt_i_n.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_raise_rt_i_n.S
rename to sim/testsuite/bfin/c_progctrl_raise_rt_i_n.S

diff --git a/sim/testsuite/sim/bfin/c_progctrl_rts.s b/sim/testsuite/bfin/c_progctrl_rts.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_progctrl_rts.s
rename to sim/testsuite/bfin/c_progctrl_rts.s

diff --git a/sim/testsuite/sim/bfin/c_ptr2op_pr_neg_pr.s b/sim/testsuite/bfin/c_ptr2op_pr_neg_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ptr2op_pr_neg_pr.s
rename to sim/testsuite/bfin/c_ptr2op_pr_neg_pr.s

diff --git a/sim/testsuite/sim/bfin/c_ptr2op_pr_sft_2_1.s b/sim/testsuite/bfin/c_ptr2op_pr_sft_2_1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ptr2op_pr_sft_2_1.s
rename to sim/testsuite/bfin/c_ptr2op_pr_sft_2_1.s

diff --git a/sim/testsuite/sim/bfin/c_ptr2op_pr_shadd_1_2.s b/sim/testsuite/bfin/c_ptr2op_pr_shadd_1_2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ptr2op_pr_shadd_1_2.s
rename to sim/testsuite/bfin/c_ptr2op_pr_shadd_1_2.s

diff --git a/sim/testsuite/sim/bfin/c_pushpopmultiple_dp.s b/sim/testsuite/bfin/c_pushpopmultiple_dp.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_pushpopmultiple_dp.s
rename to sim/testsuite/bfin/c_pushpopmultiple_dp.s

diff --git a/sim/testsuite/sim/bfin/c_pushpopmultiple_dp_pair.s b/sim/testsuite/bfin/c_pushpopmultiple_dp_pair.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_pushpopmultiple_dp_pair.s
rename to sim/testsuite/bfin/c_pushpopmultiple_dp_pair.s

diff --git a/sim/testsuite/sim/bfin/c_pushpopmultiple_dreg.s b/sim/testsuite/bfin/c_pushpopmultiple_dreg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_pushpopmultiple_dreg.s
rename to sim/testsuite/bfin/c_pushpopmultiple_dreg.s

diff --git a/sim/testsuite/sim/bfin/c_pushpopmultiple_preg.s b/sim/testsuite/bfin/c_pushpopmultiple_preg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_pushpopmultiple_preg.s
rename to sim/testsuite/bfin/c_pushpopmultiple_preg.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_acc_acc.s b/sim/testsuite/bfin/c_regmv_acc_acc.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_acc_acc.s
rename to sim/testsuite/bfin/c_regmv_acc_acc.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_dag_lz_dep.s b/sim/testsuite/bfin/c_regmv_dag_lz_dep.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_dag_lz_dep.s
rename to sim/testsuite/bfin/c_regmv_dag_lz_dep.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_dr_acc_acc.s b/sim/testsuite/bfin/c_regmv_dr_acc_acc.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_dr_acc_acc.s
rename to sim/testsuite/bfin/c_regmv_dr_acc_acc.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_dr_dep_nostall.s b/sim/testsuite/bfin/c_regmv_dr_dep_nostall.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_dr_dep_nostall.s
rename to sim/testsuite/bfin/c_regmv_dr_dep_nostall.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_dr_dr.s b/sim/testsuite/bfin/c_regmv_dr_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_dr_dr.s
rename to sim/testsuite/bfin/c_regmv_dr_dr.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_dr_imlb.s b/sim/testsuite/bfin/c_regmv_dr_imlb.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_dr_imlb.s
rename to sim/testsuite/bfin/c_regmv_dr_imlb.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_dr_pr.s b/sim/testsuite/bfin/c_regmv_dr_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_dr_pr.s
rename to sim/testsuite/bfin/c_regmv_dr_pr.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_imlb_dep_nostall.s b/sim/testsuite/bfin/c_regmv_imlb_dep_nostall.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_imlb_dep_nostall.s
rename to sim/testsuite/bfin/c_regmv_imlb_dep_nostall.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_imlb_dep_stall.s b/sim/testsuite/bfin/c_regmv_imlb_dep_stall.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_imlb_dep_stall.s
rename to sim/testsuite/bfin/c_regmv_imlb_dep_stall.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_imlb_dr.s b/sim/testsuite/bfin/c_regmv_imlb_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_imlb_dr.s
rename to sim/testsuite/bfin/c_regmv_imlb_dr.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_imlb_imlb.s b/sim/testsuite/bfin/c_regmv_imlb_imlb.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_imlb_imlb.s
rename to sim/testsuite/bfin/c_regmv_imlb_imlb.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_imlb_pr.s b/sim/testsuite/bfin/c_regmv_imlb_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_imlb_pr.s
rename to sim/testsuite/bfin/c_regmv_imlb_pr.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_pr_dep_nostall.s b/sim/testsuite/bfin/c_regmv_pr_dep_nostall.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_pr_dep_nostall.s
rename to sim/testsuite/bfin/c_regmv_pr_dep_nostall.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_pr_dep_stall.s b/sim/testsuite/bfin/c_regmv_pr_dep_stall.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_pr_dep_stall.s
rename to sim/testsuite/bfin/c_regmv_pr_dep_stall.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_pr_dr.s b/sim/testsuite/bfin/c_regmv_pr_dr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_pr_dr.s
rename to sim/testsuite/bfin/c_regmv_pr_dr.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_pr_imlb.s b/sim/testsuite/bfin/c_regmv_pr_imlb.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_pr_imlb.s
rename to sim/testsuite/bfin/c_regmv_pr_imlb.s

diff --git a/sim/testsuite/sim/bfin/c_regmv_pr_pr.s b/sim/testsuite/bfin/c_regmv_pr_pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_regmv_pr_pr.s
rename to sim/testsuite/bfin/c_regmv_pr_pr.s

diff --git a/sim/testsuite/sim/bfin/c_seq_ac_raise_mv.S b/sim/testsuite/bfin/c_seq_ac_raise_mv.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ac_raise_mv.S
rename to sim/testsuite/bfin/c_seq_ac_raise_mv.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ac_raise_mv_ppop.S b/sim/testsuite/bfin/c_seq_ac_raise_mv_ppop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ac_raise_mv_ppop.S
rename to sim/testsuite/bfin/c_seq_ac_raise_mv_ppop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ac_regmv_pushpop.S b/sim/testsuite/bfin/c_seq_ac_regmv_pushpop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ac_regmv_pushpop.S
rename to sim/testsuite/bfin/c_seq_ac_regmv_pushpop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_dec_raise_pushpop.S b/sim/testsuite/bfin/c_seq_dec_raise_pushpop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_dec_raise_pushpop.S
rename to sim/testsuite/bfin/c_seq_dec_raise_pushpop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex1_brcc_mv_pop.S b/sim/testsuite/bfin/c_seq_ex1_brcc_mv_pop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex1_brcc_mv_pop.S
rename to sim/testsuite/bfin/c_seq_ex1_brcc_mv_pop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex1_call_mv_pop.S b/sim/testsuite/bfin/c_seq_ex1_call_mv_pop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex1_call_mv_pop.S
rename to sim/testsuite/bfin/c_seq_ex1_call_mv_pop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex1_j_mv_pop.S b/sim/testsuite/bfin/c_seq_ex1_j_mv_pop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex1_j_mv_pop.S
rename to sim/testsuite/bfin/c_seq_ex1_j_mv_pop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex1_raise_brcc_mv_pop.S b/sim/testsuite/bfin/c_seq_ex1_raise_brcc_mv_pop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex1_raise_brcc_mv_pop.S
rename to sim/testsuite/bfin/c_seq_ex1_raise_brcc_mv_pop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex1_raise_call_mv_pop.S b/sim/testsuite/bfin/c_seq_ex1_raise_call_mv_pop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex1_raise_call_mv_pop.S
rename to sim/testsuite/bfin/c_seq_ex1_raise_call_mv_pop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex1_raise_j_mv_pop.S b/sim/testsuite/bfin/c_seq_ex1_raise_j_mv_pop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex1_raise_j_mv_pop.S
rename to sim/testsuite/bfin/c_seq_ex1_raise_j_mv_pop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex2_brcc_mp_mv_pop.S b/sim/testsuite/bfin/c_seq_ex2_brcc_mp_mv_pop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex2_brcc_mp_mv_pop.S
rename to sim/testsuite/bfin/c_seq_ex2_brcc_mp_mv_pop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex2_mmr_mvpop.S b/sim/testsuite/bfin/c_seq_ex2_mmr_mvpop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex2_mmr_mvpop.S
rename to sim/testsuite/bfin/c_seq_ex2_mmr_mvpop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex2_mmrj_mvpop.S b/sim/testsuite/bfin/c_seq_ex2_mmrj_mvpop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex2_mmrj_mvpop.S
rename to sim/testsuite/bfin/c_seq_ex2_mmrj_mvpop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex2_raise_mmr_mvpop.S b/sim/testsuite/bfin/c_seq_ex2_raise_mmr_mvpop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex2_raise_mmr_mvpop.S
rename to sim/testsuite/bfin/c_seq_ex2_raise_mmr_mvpop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex2_raise_mmrj_mvpop.S b/sim/testsuite/bfin/c_seq_ex2_raise_mmrj_mvpop.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex2_raise_mmrj_mvpop.S
rename to sim/testsuite/bfin/c_seq_ex2_raise_mmrj_mvpop.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex3_ls_brcc_mvp.S b/sim/testsuite/bfin/c_seq_ex3_ls_brcc_mvp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex3_ls_brcc_mvp.S
rename to sim/testsuite/bfin/c_seq_ex3_ls_brcc_mvp.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex3_ls_mmr_mvp.S b/sim/testsuite/bfin/c_seq_ex3_ls_mmr_mvp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex3_ls_mmr_mvp.S
rename to sim/testsuite/bfin/c_seq_ex3_ls_mmr_mvp.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex3_ls_mmrj_mvp.S b/sim/testsuite/bfin/c_seq_ex3_ls_mmrj_mvp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex3_ls_mmrj_mvp.S
rename to sim/testsuite/bfin/c_seq_ex3_ls_mmrj_mvp.S

diff --git a/sim/testsuite/sim/bfin/c_seq_ex3_raise_ls_mmrj_mvp.S b/sim/testsuite/bfin/c_seq_ex3_raise_ls_mmrj_mvp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_ex3_raise_ls_mmrj_mvp.S
rename to sim/testsuite/bfin/c_seq_ex3_raise_ls_mmrj_mvp.S

diff --git a/sim/testsuite/sim/bfin/c_seq_wb_cs_lsmmrj_mvp.S b/sim/testsuite/bfin/c_seq_wb_cs_lsmmrj_mvp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_wb_cs_lsmmrj_mvp.S
rename to sim/testsuite/bfin/c_seq_wb_cs_lsmmrj_mvp.S

diff --git a/sim/testsuite/sim/bfin/c_seq_wb_raisecs_lsmmrj_mvp.S b/sim/testsuite/bfin/c_seq_wb_raisecs_lsmmrj_mvp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_wb_raisecs_lsmmrj_mvp.S
rename to sim/testsuite/bfin/c_seq_wb_raisecs_lsmmrj_mvp.S

diff --git a/sim/testsuite/sim/bfin/c_seq_wb_rti_lsmmrj_mvp.S b/sim/testsuite/bfin/c_seq_wb_rti_lsmmrj_mvp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_wb_rti_lsmmrj_mvp.S
rename to sim/testsuite/bfin/c_seq_wb_rti_lsmmrj_mvp.S

diff --git a/sim/testsuite/sim/bfin/c_seq_wb_rtn_lsmmrj_mvp.S b/sim/testsuite/bfin/c_seq_wb_rtn_lsmmrj_mvp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_wb_rtn_lsmmrj_mvp.S
rename to sim/testsuite/bfin/c_seq_wb_rtn_lsmmrj_mvp.S

diff --git a/sim/testsuite/sim/bfin/c_seq_wb_rtx_lsmmrj_mvp.S b/sim/testsuite/bfin/c_seq_wb_rtx_lsmmrj_mvp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/c_seq_wb_rtx_lsmmrj_mvp.S
rename to sim/testsuite/bfin/c_seq_wb_rtx_lsmmrj_mvp.S

diff --git a/sim/testsuite/sim/bfin/c_ujump.s b/sim/testsuite/bfin/c_ujump.s
similarity index 100%
rename from sim/testsuite/sim/bfin/c_ujump.s
rename to sim/testsuite/bfin/c_ujump.s

diff --git a/sim/testsuite/sim/bfin/cc-alu.S b/sim/testsuite/bfin/cc-alu.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cc-alu.S
rename to sim/testsuite/bfin/cc-alu.S

diff --git a/sim/testsuite/sim/bfin/cc-astat-bits.s b/sim/testsuite/bfin/cc-astat-bits.s
similarity index 100%
rename from sim/testsuite/sim/bfin/cc-astat-bits.s
rename to sim/testsuite/bfin/cc-astat-bits.s

diff --git a/sim/testsuite/sim/bfin/cc0.s b/sim/testsuite/bfin/cc0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/cc0.s
rename to sim/testsuite/bfin/cc0.s

diff --git a/sim/testsuite/sim/bfin/cc1.s b/sim/testsuite/bfin/cc1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/cc1.s
rename to sim/testsuite/bfin/cc1.s

diff --git a/sim/testsuite/sim/bfin/cc5.S b/sim/testsuite/bfin/cc5.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cc5.S
rename to sim/testsuite/bfin/cc5.S

diff --git a/sim/testsuite/sim/bfin/cec-exact-exception.S b/sim/testsuite/bfin/cec-exact-exception.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cec-exact-exception.S
rename to sim/testsuite/bfin/cec-exact-exception.S

diff --git a/sim/testsuite/sim/bfin/cec-ifetch.S b/sim/testsuite/bfin/cec-ifetch.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cec-ifetch.S
rename to sim/testsuite/bfin/cec-ifetch.S

diff --git a/sim/testsuite/sim/bfin/cec-multi-pending.S b/sim/testsuite/bfin/cec-multi-pending.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cec-multi-pending.S
rename to sim/testsuite/bfin/cec-multi-pending.S

diff --git a/sim/testsuite/sim/bfin/cec-no-snen-reti.S b/sim/testsuite/bfin/cec-no-snen-reti.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cec-no-snen-reti.S
rename to sim/testsuite/bfin/cec-no-snen-reti.S

diff --git a/sim/testsuite/sim/bfin/cec-non-operating-env.s b/sim/testsuite/bfin/cec-non-operating-env.s
similarity index 100%
rename from sim/testsuite/sim/bfin/cec-non-operating-env.s
rename to sim/testsuite/bfin/cec-non-operating-env.s

diff --git a/sim/testsuite/sim/bfin/cec-raise-reti.S b/sim/testsuite/bfin/cec-raise-reti.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cec-raise-reti.S
rename to sim/testsuite/bfin/cec-raise-reti.S

diff --git a/sim/testsuite/sim/bfin/cec-snen-reti.S b/sim/testsuite/bfin/cec-snen-reti.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cec-snen-reti.S
rename to sim/testsuite/bfin/cec-snen-reti.S

diff --git a/sim/testsuite/sim/bfin/cec-syscfg-ssstep.S b/sim/testsuite/bfin/cec-syscfg-ssstep.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cec-syscfg-ssstep.S
rename to sim/testsuite/bfin/cec-syscfg-ssstep.S

diff --git a/sim/testsuite/sim/bfin/cec-system-call.S b/sim/testsuite/bfin/cec-system-call.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cec-system-call.S
rename to sim/testsuite/bfin/cec-system-call.S

diff --git a/sim/testsuite/sim/bfin/cir.s b/sim/testsuite/bfin/cir.s
similarity index 100%
rename from sim/testsuite/sim/bfin/cir.s
rename to sim/testsuite/bfin/cir.s

diff --git a/sim/testsuite/sim/bfin/cir1.s b/sim/testsuite/bfin/cir1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/cir1.s
rename to sim/testsuite/bfin/cir1.s

diff --git a/sim/testsuite/sim/bfin/cli-sti.s b/sim/testsuite/bfin/cli-sti.s
similarity index 100%
rename from sim/testsuite/sim/bfin/cli-sti.s
rename to sim/testsuite/bfin/cli-sti.s

diff --git a/sim/testsuite/sim/bfin/cmpacc.s b/sim/testsuite/bfin/cmpacc.s
similarity index 100%
rename from sim/testsuite/sim/bfin/cmpacc.s
rename to sim/testsuite/bfin/cmpacc.s

diff --git a/sim/testsuite/sim/bfin/cmpdreg.S b/sim/testsuite/bfin/cmpdreg.S
similarity index 100%
rename from sim/testsuite/sim/bfin/cmpdreg.S
rename to sim/testsuite/bfin/cmpdreg.S

diff --git a/sim/testsuite/sim/bfin/compare.s b/sim/testsuite/bfin/compare.s
similarity index 100%
rename from sim/testsuite/sim/bfin/compare.s
rename to sim/testsuite/bfin/compare.s

diff --git a/sim/testsuite/sim/bfin/conv_enc_gen.s b/sim/testsuite/bfin/conv_enc_gen.s
similarity index 100%
rename from sim/testsuite/sim/bfin/conv_enc_gen.s
rename to sim/testsuite/bfin/conv_enc_gen.s

diff --git a/sim/testsuite/sim/bfin/cycles.s b/sim/testsuite/bfin/cycles.s
similarity index 100%
rename from sim/testsuite/sim/bfin/cycles.s
rename to sim/testsuite/bfin/cycles.s

diff --git a/sim/testsuite/sim/bfin/d0.s b/sim/testsuite/bfin/d0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/d0.s
rename to sim/testsuite/bfin/d0.s

diff --git a/sim/testsuite/sim/bfin/d1.s b/sim/testsuite/bfin/d1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/d1.s
rename to sim/testsuite/bfin/d1.s

diff --git a/sim/testsuite/sim/bfin/d2.s b/sim/testsuite/bfin/d2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/d2.s
rename to sim/testsuite/bfin/d2.s

diff --git a/sim/testsuite/sim/bfin/dbg_brprd_ntkn_src_kill.S b/sim/testsuite/bfin/dbg_brprd_ntkn_src_kill.S
similarity index 100%
rename from sim/testsuite/sim/bfin/dbg_brprd_ntkn_src_kill.S
rename to sim/testsuite/bfin/dbg_brprd_ntkn_src_kill.S

diff --git a/sim/testsuite/sim/bfin/dbg_brtkn_nprd_src_kill.S b/sim/testsuite/bfin/dbg_brtkn_nprd_src_kill.S
similarity index 100%
rename from sim/testsuite/sim/bfin/dbg_brtkn_nprd_src_kill.S
rename to sim/testsuite/bfin/dbg_brtkn_nprd_src_kill.S

diff --git a/sim/testsuite/sim/bfin/dbg_jmp_src_kill.S b/sim/testsuite/bfin/dbg_jmp_src_kill.S
similarity index 100%
rename from sim/testsuite/sim/bfin/dbg_jmp_src_kill.S
rename to sim/testsuite/bfin/dbg_jmp_src_kill.S

diff --git a/sim/testsuite/sim/bfin/dbg_tr_basic.S b/sim/testsuite/bfin/dbg_tr_basic.S
similarity index 100%
rename from sim/testsuite/sim/bfin/dbg_tr_basic.S
rename to sim/testsuite/bfin/dbg_tr_basic.S

diff --git a/sim/testsuite/sim/bfin/dbg_tr_simplejp.S b/sim/testsuite/bfin/dbg_tr_simplejp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/dbg_tr_simplejp.S
rename to sim/testsuite/bfin/dbg_tr_simplejp.S

diff --git a/sim/testsuite/sim/bfin/dbg_tr_tbuf0.S b/sim/testsuite/bfin/dbg_tr_tbuf0.S
similarity index 100%
rename from sim/testsuite/sim/bfin/dbg_tr_tbuf0.S
rename to sim/testsuite/bfin/dbg_tr_tbuf0.S

diff --git a/sim/testsuite/sim/bfin/dbg_tr_umode.S b/sim/testsuite/bfin/dbg_tr_umode.S
similarity index 100%
rename from sim/testsuite/sim/bfin/dbg_tr_umode.S
rename to sim/testsuite/bfin/dbg_tr_umode.S

diff --git a/sim/testsuite/sim/bfin/disalnexcpt_implicit.S b/sim/testsuite/bfin/disalnexcpt_implicit.S
similarity index 100%
rename from sim/testsuite/sim/bfin/disalnexcpt_implicit.S
rename to sim/testsuite/bfin/disalnexcpt_implicit.S

diff --git a/sim/testsuite/sim/bfin/div0.s b/sim/testsuite/bfin/div0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/div0.s
rename to sim/testsuite/bfin/div0.s

diff --git a/sim/testsuite/sim/bfin/divq.s b/sim/testsuite/bfin/divq.s
similarity index 100%
rename from sim/testsuite/sim/bfin/divq.s
rename to sim/testsuite/bfin/divq.s

diff --git a/sim/testsuite/sim/bfin/dotproduct.s b/sim/testsuite/bfin/dotproduct.s
similarity index 100%
rename from sim/testsuite/sim/bfin/dotproduct.s
rename to sim/testsuite/bfin/dotproduct.s

diff --git a/sim/testsuite/sim/bfin/dotproduct2.s b/sim/testsuite/bfin/dotproduct2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/dotproduct2.s
rename to sim/testsuite/bfin/dotproduct2.s

diff --git a/sim/testsuite/sim/bfin/double_prec_mult.s b/sim/testsuite/bfin/double_prec_mult.s
similarity index 100%
rename from sim/testsuite/sim/bfin/double_prec_mult.s
rename to sim/testsuite/bfin/double_prec_mult.s

diff --git a/sim/testsuite/sim/bfin/dsp_a4.s b/sim/testsuite/bfin/dsp_a4.s
similarity index 100%
rename from sim/testsuite/sim/bfin/dsp_a4.s
rename to sim/testsuite/bfin/dsp_a4.s

diff --git a/sim/testsuite/sim/bfin/dsp_a7.s b/sim/testsuite/bfin/dsp_a7.s
similarity index 100%
rename from sim/testsuite/sim/bfin/dsp_a7.s
rename to sim/testsuite/bfin/dsp_a7.s

diff --git a/sim/testsuite/sim/bfin/dsp_a8.s b/sim/testsuite/bfin/dsp_a8.s
similarity index 100%
rename from sim/testsuite/sim/bfin/dsp_a8.s
rename to sim/testsuite/bfin/dsp_a8.s

diff --git a/sim/testsuite/sim/bfin/dsp_d0.s b/sim/testsuite/bfin/dsp_d0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/dsp_d0.s
rename to sim/testsuite/bfin/dsp_d0.s

diff --git a/sim/testsuite/sim/bfin/dsp_d1.s b/sim/testsuite/bfin/dsp_d1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/dsp_d1.s
rename to sim/testsuite/bfin/dsp_d1.s

diff --git a/sim/testsuite/sim/bfin/dsp_neg.S b/sim/testsuite/bfin/dsp_neg.S
similarity index 100%
rename from sim/testsuite/sim/bfin/dsp_neg.S
rename to sim/testsuite/bfin/dsp_neg.S

diff --git a/sim/testsuite/sim/bfin/dsp_s1.s b/sim/testsuite/bfin/dsp_s1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/dsp_s1.s
rename to sim/testsuite/bfin/dsp_s1.s

diff --git a/sim/testsuite/sim/bfin/e0.s b/sim/testsuite/bfin/e0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/e0.s
rename to sim/testsuite/bfin/e0.s

diff --git a/sim/testsuite/sim/bfin/edn_snafu.s b/sim/testsuite/bfin/edn_snafu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/edn_snafu.s
rename to sim/testsuite/bfin/edn_snafu.s

diff --git a/sim/testsuite/sim/bfin/eu_dsp32mac_s.s b/sim/testsuite/bfin/eu_dsp32mac_s.s
similarity index 100%
rename from sim/testsuite/sim/bfin/eu_dsp32mac_s.s
rename to sim/testsuite/bfin/eu_dsp32mac_s.s

diff --git a/sim/testsuite/sim/bfin/events.s b/sim/testsuite/bfin/events.s
similarity index 100%
rename from sim/testsuite/sim/bfin/events.s
rename to sim/testsuite/bfin/events.s

diff --git a/sim/testsuite/sim/bfin/f221.s b/sim/testsuite/bfin/f221.s
similarity index 100%
rename from sim/testsuite/sim/bfin/f221.s
rename to sim/testsuite/bfin/f221.s

diff --git a/sim/testsuite/sim/bfin/fact.s b/sim/testsuite/bfin/fact.s
similarity index 100%
rename from sim/testsuite/sim/bfin/fact.s
rename to sim/testsuite/bfin/fact.s

diff --git a/sim/testsuite/sim/bfin/fir.s b/sim/testsuite/bfin/fir.s
similarity index 100%
rename from sim/testsuite/sim/bfin/fir.s
rename to sim/testsuite/bfin/fir.s

diff --git a/sim/testsuite/sim/bfin/fsm.s b/sim/testsuite/bfin/fsm.s
similarity index 100%
rename from sim/testsuite/sim/bfin/fsm.s
rename to sim/testsuite/bfin/fsm.s

diff --git a/sim/testsuite/sim/bfin/greg2.s b/sim/testsuite/bfin/greg2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/greg2.s
rename to sim/testsuite/bfin/greg2.s

diff --git a/sim/testsuite/sim/bfin/hwloop-bits.S b/sim/testsuite/bfin/hwloop-bits.S
similarity index 100%
rename from sim/testsuite/sim/bfin/hwloop-bits.S
rename to sim/testsuite/bfin/hwloop-bits.S

diff --git a/sim/testsuite/sim/bfin/hwloop-branch-in.s b/sim/testsuite/bfin/hwloop-branch-in.s
similarity index 100%
rename from sim/testsuite/sim/bfin/hwloop-branch-in.s
rename to sim/testsuite/bfin/hwloop-branch-in.s

diff --git a/sim/testsuite/sim/bfin/hwloop-branch-out.s b/sim/testsuite/bfin/hwloop-branch-out.s
similarity index 100%
rename from sim/testsuite/sim/bfin/hwloop-branch-out.s
rename to sim/testsuite/bfin/hwloop-branch-out.s

diff --git a/sim/testsuite/sim/bfin/hwloop-lt-bits.s b/sim/testsuite/bfin/hwloop-lt-bits.s
similarity index 100%
rename from sim/testsuite/sim/bfin/hwloop-lt-bits.s
rename to sim/testsuite/bfin/hwloop-lt-bits.s

diff --git a/sim/testsuite/sim/bfin/hwloop-nested.s b/sim/testsuite/bfin/hwloop-nested.s
similarity index 100%
rename from sim/testsuite/sim/bfin/hwloop-nested.s
rename to sim/testsuite/bfin/hwloop-nested.s

diff --git a/sim/testsuite/sim/bfin/i0.s b/sim/testsuite/bfin/i0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/i0.s
rename to sim/testsuite/bfin/i0.s

diff --git a/sim/testsuite/sim/bfin/iir.s b/sim/testsuite/bfin/iir.s
similarity index 100%
rename from sim/testsuite/sim/bfin/iir.s
rename to sim/testsuite/bfin/iir.s

diff --git a/sim/testsuite/sim/bfin/issue103.s b/sim/testsuite/bfin/issue103.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue103.s
rename to sim/testsuite/bfin/issue103.s

diff --git a/sim/testsuite/sim/bfin/issue109.s b/sim/testsuite/bfin/issue109.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue109.s
rename to sim/testsuite/bfin/issue109.s

diff --git a/sim/testsuite/sim/bfin/issue112.s b/sim/testsuite/bfin/issue112.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue112.s
rename to sim/testsuite/bfin/issue112.s

diff --git a/sim/testsuite/sim/bfin/issue113.s b/sim/testsuite/bfin/issue113.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue113.s
rename to sim/testsuite/bfin/issue113.s

diff --git a/sim/testsuite/sim/bfin/issue117.s b/sim/testsuite/bfin/issue117.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue117.s
rename to sim/testsuite/bfin/issue117.s

diff --git a/sim/testsuite/sim/bfin/issue118.s b/sim/testsuite/bfin/issue118.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue118.s
rename to sim/testsuite/bfin/issue118.s

diff --git a/sim/testsuite/sim/bfin/issue119.s b/sim/testsuite/bfin/issue119.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue119.s
rename to sim/testsuite/bfin/issue119.s

diff --git a/sim/testsuite/sim/bfin/issue121.s b/sim/testsuite/bfin/issue121.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue121.s
rename to sim/testsuite/bfin/issue121.s

diff --git a/sim/testsuite/sim/bfin/issue123.s b/sim/testsuite/bfin/issue123.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue123.s
rename to sim/testsuite/bfin/issue123.s

diff --git a/sim/testsuite/sim/bfin/issue124.s b/sim/testsuite/bfin/issue124.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue124.s
rename to sim/testsuite/bfin/issue124.s

diff --git a/sim/testsuite/sim/bfin/issue125.s b/sim/testsuite/bfin/issue125.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue125.s
rename to sim/testsuite/bfin/issue125.s

diff --git a/sim/testsuite/sim/bfin/issue126.s b/sim/testsuite/bfin/issue126.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue126.s
rename to sim/testsuite/bfin/issue126.s

diff --git a/sim/testsuite/sim/bfin/issue127.s b/sim/testsuite/bfin/issue127.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue127.s
rename to sim/testsuite/bfin/issue127.s

diff --git a/sim/testsuite/sim/bfin/issue129.s b/sim/testsuite/bfin/issue129.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue129.s
rename to sim/testsuite/bfin/issue129.s

diff --git a/sim/testsuite/sim/bfin/issue139.S b/sim/testsuite/bfin/issue139.S
similarity index 100%
rename from sim/testsuite/sim/bfin/issue139.S
rename to sim/testsuite/bfin/issue139.S

diff --git a/sim/testsuite/sim/bfin/issue140.S b/sim/testsuite/bfin/issue140.S
similarity index 100%
rename from sim/testsuite/sim/bfin/issue140.S
rename to sim/testsuite/bfin/issue140.S

diff --git a/sim/testsuite/sim/bfin/issue142.s b/sim/testsuite/bfin/issue142.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue142.s
rename to sim/testsuite/bfin/issue142.s

diff --git a/sim/testsuite/sim/bfin/issue144.s b/sim/testsuite/bfin/issue144.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue144.s
rename to sim/testsuite/bfin/issue144.s

diff --git a/sim/testsuite/sim/bfin/issue146.S b/sim/testsuite/bfin/issue146.S
similarity index 100%
rename from sim/testsuite/sim/bfin/issue146.S
rename to sim/testsuite/bfin/issue146.S

diff --git a/sim/testsuite/sim/bfin/issue175.s b/sim/testsuite/bfin/issue175.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue175.s
rename to sim/testsuite/bfin/issue175.s

diff --git a/sim/testsuite/sim/bfin/issue205.s b/sim/testsuite/bfin/issue205.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue205.s
rename to sim/testsuite/bfin/issue205.s

diff --git a/sim/testsuite/sim/bfin/issue257.s b/sim/testsuite/bfin/issue257.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue257.s
rename to sim/testsuite/bfin/issue257.s

diff --git a/sim/testsuite/sim/bfin/issue272.S b/sim/testsuite/bfin/issue272.S
similarity index 100%
rename from sim/testsuite/sim/bfin/issue272.S
rename to sim/testsuite/bfin/issue272.S

diff --git a/sim/testsuite/sim/bfin/issue83.s b/sim/testsuite/bfin/issue83.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue83.s
rename to sim/testsuite/bfin/issue83.s

diff --git a/sim/testsuite/sim/bfin/issue89.s b/sim/testsuite/bfin/issue89.s
similarity index 100%
rename from sim/testsuite/sim/bfin/issue89.s
rename to sim/testsuite/bfin/issue89.s

diff --git a/sim/testsuite/sim/bfin/l0.s b/sim/testsuite/bfin/l0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/l0.s
rename to sim/testsuite/bfin/l0.s

diff --git a/sim/testsuite/sim/bfin/l0shift.s b/sim/testsuite/bfin/l0shift.s
similarity index 100%
rename from sim/testsuite/sim/bfin/l0shift.s
rename to sim/testsuite/bfin/l0shift.s

diff --git a/sim/testsuite/sim/bfin/l2_loop.s b/sim/testsuite/bfin/l2_loop.s
similarity index 100%
rename from sim/testsuite/sim/bfin/l2_loop.s
rename to sim/testsuite/bfin/l2_loop.s

diff --git a/sim/testsuite/sim/bfin/link-2.s b/sim/testsuite/bfin/link-2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/link-2.s
rename to sim/testsuite/bfin/link-2.s

diff --git a/sim/testsuite/sim/bfin/link.s b/sim/testsuite/bfin/link.s
similarity index 100%
rename from sim/testsuite/sim/bfin/link.s
rename to sim/testsuite/bfin/link.s

diff --git a/sim/testsuite/sim/bfin/lmu_cplb_multiple0.S b/sim/testsuite/bfin/lmu_cplb_multiple0.S
similarity index 100%
rename from sim/testsuite/sim/bfin/lmu_cplb_multiple0.S
rename to sim/testsuite/bfin/lmu_cplb_multiple0.S

diff --git a/sim/testsuite/sim/bfin/lmu_cplb_multiple1.S b/sim/testsuite/bfin/lmu_cplb_multiple1.S
similarity index 100%
rename from sim/testsuite/sim/bfin/lmu_cplb_multiple1.S
rename to sim/testsuite/bfin/lmu_cplb_multiple1.S

diff --git a/sim/testsuite/sim/bfin/lmu_excpt_align.S b/sim/testsuite/bfin/lmu_excpt_align.S
similarity index 100%
rename from sim/testsuite/sim/bfin/lmu_excpt_align.S
rename to sim/testsuite/bfin/lmu_excpt_align.S

diff --git a/sim/testsuite/sim/bfin/lmu_excpt_default.S b/sim/testsuite/bfin/lmu_excpt_default.S
similarity index 100%
rename from sim/testsuite/sim/bfin/lmu_excpt_default.S
rename to sim/testsuite/bfin/lmu_excpt_default.S

diff --git a/sim/testsuite/sim/bfin/lmu_excpt_illaddr.S b/sim/testsuite/bfin/lmu_excpt_illaddr.S
similarity index 100%
rename from sim/testsuite/sim/bfin/lmu_excpt_illaddr.S
rename to sim/testsuite/bfin/lmu_excpt_illaddr.S

diff --git a/sim/testsuite/sim/bfin/lmu_excpt_prot0.S b/sim/testsuite/bfin/lmu_excpt_prot0.S
similarity index 100%
rename from sim/testsuite/sim/bfin/lmu_excpt_prot0.S
rename to sim/testsuite/bfin/lmu_excpt_prot0.S

diff --git a/sim/testsuite/sim/bfin/lmu_excpt_prot1.S b/sim/testsuite/bfin/lmu_excpt_prot1.S
similarity index 100%
rename from sim/testsuite/sim/bfin/lmu_excpt_prot1.S
rename to sim/testsuite/bfin/lmu_excpt_prot1.S

diff --git a/sim/testsuite/sim/bfin/load.s b/sim/testsuite/bfin/load.s
similarity index 100%
rename from sim/testsuite/sim/bfin/load.s
rename to sim/testsuite/bfin/load.s

diff --git a/sim/testsuite/sim/bfin/logic.s b/sim/testsuite/bfin/logic.s
similarity index 100%
rename from sim/testsuite/sim/bfin/logic.s
rename to sim/testsuite/bfin/logic.s

diff --git a/sim/testsuite/sim/bfin/loop_snafu.s b/sim/testsuite/bfin/loop_snafu.s
similarity index 100%
rename from sim/testsuite/sim/bfin/loop_snafu.s
rename to sim/testsuite/bfin/loop_snafu.s

diff --git a/sim/testsuite/sim/bfin/loop_strncpy.s b/sim/testsuite/bfin/loop_strncpy.s
similarity index 100%
rename from sim/testsuite/sim/bfin/loop_strncpy.s
rename to sim/testsuite/bfin/loop_strncpy.s

diff --git a/sim/testsuite/sim/bfin/lp0.s b/sim/testsuite/bfin/lp0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/lp0.s
rename to sim/testsuite/bfin/lp0.s

diff --git a/sim/testsuite/sim/bfin/lp1.s b/sim/testsuite/bfin/lp1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/lp1.s
rename to sim/testsuite/bfin/lp1.s

diff --git a/sim/testsuite/sim/bfin/lsetup.s b/sim/testsuite/bfin/lsetup.s
similarity index 100%
rename from sim/testsuite/sim/bfin/lsetup.s
rename to sim/testsuite/bfin/lsetup.s

diff --git a/sim/testsuite/sim/bfin/m0boundary.s b/sim/testsuite/bfin/m0boundary.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m0boundary.s
rename to sim/testsuite/bfin/m0boundary.s

diff --git a/sim/testsuite/sim/bfin/m1.S b/sim/testsuite/bfin/m1.S
similarity index 100%
rename from sim/testsuite/sim/bfin/m1.S
rename to sim/testsuite/bfin/m1.S

diff --git a/sim/testsuite/sim/bfin/m10.s b/sim/testsuite/bfin/m10.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m10.s
rename to sim/testsuite/bfin/m10.s

diff --git a/sim/testsuite/sim/bfin/m11.s b/sim/testsuite/bfin/m11.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m11.s
rename to sim/testsuite/bfin/m11.s

diff --git a/sim/testsuite/sim/bfin/m12.s b/sim/testsuite/bfin/m12.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m12.s
rename to sim/testsuite/bfin/m12.s

diff --git a/sim/testsuite/sim/bfin/m13.s b/sim/testsuite/bfin/m13.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m13.s
rename to sim/testsuite/bfin/m13.s

diff --git a/sim/testsuite/sim/bfin/m14.s b/sim/testsuite/bfin/m14.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m14.s
rename to sim/testsuite/bfin/m14.s

diff --git a/sim/testsuite/sim/bfin/m15.s b/sim/testsuite/bfin/m15.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m15.s
rename to sim/testsuite/bfin/m15.s

diff --git a/sim/testsuite/sim/bfin/m16.s b/sim/testsuite/bfin/m16.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m16.s
rename to sim/testsuite/bfin/m16.s

diff --git a/sim/testsuite/sim/bfin/m17.s b/sim/testsuite/bfin/m17.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m17.s
rename to sim/testsuite/bfin/m17.s

diff --git a/sim/testsuite/sim/bfin/m2.s b/sim/testsuite/bfin/m2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m2.s
rename to sim/testsuite/bfin/m2.s

diff --git a/sim/testsuite/sim/bfin/m3.s b/sim/testsuite/bfin/m3.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m3.s
rename to sim/testsuite/bfin/m3.s

diff --git a/sim/testsuite/sim/bfin/m4.s b/sim/testsuite/bfin/m4.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m4.s
rename to sim/testsuite/bfin/m4.s

diff --git a/sim/testsuite/sim/bfin/m5.s b/sim/testsuite/bfin/m5.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m5.s
rename to sim/testsuite/bfin/m5.s

diff --git a/sim/testsuite/sim/bfin/m6.s b/sim/testsuite/bfin/m6.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m6.s
rename to sim/testsuite/bfin/m6.s

diff --git a/sim/testsuite/sim/bfin/m7.s b/sim/testsuite/bfin/m7.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m7.s
rename to sim/testsuite/bfin/m7.s

diff --git a/sim/testsuite/sim/bfin/m8.s b/sim/testsuite/bfin/m8.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m8.s
rename to sim/testsuite/bfin/m8.s

diff --git a/sim/testsuite/sim/bfin/m9.s b/sim/testsuite/bfin/m9.s
similarity index 100%
rename from sim/testsuite/sim/bfin/m9.s
rename to sim/testsuite/bfin/m9.s

diff --git a/sim/testsuite/sim/bfin/mac2halfreg.S b/sim/testsuite/bfin/mac2halfreg.S
similarity index 100%
rename from sim/testsuite/sim/bfin/mac2halfreg.S
rename to sim/testsuite/bfin/mac2halfreg.S

diff --git a/sim/testsuite/sim/bfin/math.s b/sim/testsuite/bfin/math.s
similarity index 100%
rename from sim/testsuite/sim/bfin/math.s
rename to sim/testsuite/bfin/math.s

diff --git a/sim/testsuite/sim/bfin/max_min_flags.s b/sim/testsuite/bfin/max_min_flags.s
similarity index 100%
rename from sim/testsuite/sim/bfin/max_min_flags.s
rename to sim/testsuite/bfin/max_min_flags.s

diff --git a/sim/testsuite/sim/bfin/mc_s2.s b/sim/testsuite/bfin/mc_s2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/mc_s2.s
rename to sim/testsuite/bfin/mc_s2.s

diff --git a/sim/testsuite/sim/bfin/mdma-32bit-1d-neg-count.c b/sim/testsuite/bfin/mdma-32bit-1d-neg-count.c
similarity index 100%
rename from sim/testsuite/sim/bfin/mdma-32bit-1d-neg-count.c
rename to sim/testsuite/bfin/mdma-32bit-1d-neg-count.c

diff --git a/sim/testsuite/sim/bfin/mdma-32bit-1d.c b/sim/testsuite/bfin/mdma-32bit-1d.c
similarity index 100%
rename from sim/testsuite/sim/bfin/mdma-32bit-1d.c
rename to sim/testsuite/bfin/mdma-32bit-1d.c

diff --git a/sim/testsuite/sim/bfin/mdma-8bit-1d-neg-count.c b/sim/testsuite/bfin/mdma-8bit-1d-neg-count.c
similarity index 100%
rename from sim/testsuite/sim/bfin/mdma-8bit-1d-neg-count.c
rename to sim/testsuite/bfin/mdma-8bit-1d-neg-count.c

diff --git a/sim/testsuite/sim/bfin/mdma-8bit-1d.c b/sim/testsuite/bfin/mdma-8bit-1d.c
similarity index 100%
rename from sim/testsuite/sim/bfin/mdma-8bit-1d.c
rename to sim/testsuite/bfin/mdma-8bit-1d.c

diff --git a/sim/testsuite/sim/bfin/mdma-skel.h b/sim/testsuite/bfin/mdma-skel.h
similarity index 100%
rename from sim/testsuite/sim/bfin/mdma-skel.h
rename to sim/testsuite/bfin/mdma-skel.h

diff --git a/sim/testsuite/sim/bfin/mem3.s b/sim/testsuite/bfin/mem3.s
similarity index 100%
rename from sim/testsuite/sim/bfin/mem3.s
rename to sim/testsuite/bfin/mem3.s

diff --git a/sim/testsuite/sim/bfin/mmr-exception.s b/sim/testsuite/bfin/mmr-exception.s
similarity index 100%
rename from sim/testsuite/sim/bfin/mmr-exception.s
rename to sim/testsuite/bfin/mmr-exception.s

diff --git a/sim/testsuite/sim/bfin/move.s b/sim/testsuite/bfin/move.s
similarity index 100%
rename from sim/testsuite/sim/bfin/move.s
rename to sim/testsuite/bfin/move.s

diff --git a/sim/testsuite/sim/bfin/msa_acp_5.10.S b/sim/testsuite/bfin/msa_acp_5.10.S
similarity index 100%
rename from sim/testsuite/sim/bfin/msa_acp_5.10.S
rename to sim/testsuite/bfin/msa_acp_5.10.S

diff --git a/sim/testsuite/sim/bfin/msa_acp_5.12_1.S b/sim/testsuite/bfin/msa_acp_5.12_1.S
similarity index 100%
rename from sim/testsuite/sim/bfin/msa_acp_5.12_1.S
rename to sim/testsuite/bfin/msa_acp_5.12_1.S

diff --git a/sim/testsuite/sim/bfin/msa_acp_5.12_2.S b/sim/testsuite/bfin/msa_acp_5.12_2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/msa_acp_5.12_2.S
rename to sim/testsuite/bfin/msa_acp_5.12_2.S

diff --git a/sim/testsuite/sim/bfin/msa_acp_5_10.s b/sim/testsuite/bfin/msa_acp_5_10.s
similarity index 100%
rename from sim/testsuite/sim/bfin/msa_acp_5_10.s
rename to sim/testsuite/bfin/msa_acp_5_10.s

diff --git a/sim/testsuite/sim/bfin/mult.s b/sim/testsuite/bfin/mult.s
similarity index 100%
rename from sim/testsuite/sim/bfin/mult.s
rename to sim/testsuite/bfin/mult.s

diff --git a/sim/testsuite/sim/bfin/neg-2.S b/sim/testsuite/bfin/neg-2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/neg-2.S
rename to sim/testsuite/bfin/neg-2.S

diff --git a/sim/testsuite/sim/bfin/neg-3.S b/sim/testsuite/bfin/neg-3.S
similarity index 100%
rename from sim/testsuite/sim/bfin/neg-3.S
rename to sim/testsuite/bfin/neg-3.S

diff --git a/sim/testsuite/sim/bfin/neg.S b/sim/testsuite/bfin/neg.S
similarity index 100%
rename from sim/testsuite/sim/bfin/neg.S
rename to sim/testsuite/bfin/neg.S

diff --git a/sim/testsuite/sim/bfin/nshift.s b/sim/testsuite/bfin/nshift.s
similarity index 100%
rename from sim/testsuite/sim/bfin/nshift.s
rename to sim/testsuite/bfin/nshift.s

diff --git a/sim/testsuite/sim/bfin/pr.s b/sim/testsuite/bfin/pr.s
similarity index 100%
rename from sim/testsuite/sim/bfin/pr.s
rename to sim/testsuite/bfin/pr.s

diff --git a/sim/testsuite/sim/bfin/push-pop-multiple.s b/sim/testsuite/bfin/push-pop-multiple.s
similarity index 100%
rename from sim/testsuite/sim/bfin/push-pop-multiple.s
rename to sim/testsuite/bfin/push-pop-multiple.s

diff --git a/sim/testsuite/sim/bfin/push-pop.s b/sim/testsuite/bfin/push-pop.s
similarity index 100%
rename from sim/testsuite/sim/bfin/push-pop.s
rename to sim/testsuite/bfin/push-pop.s

diff --git a/sim/testsuite/sim/bfin/pushpopreg_1.s b/sim/testsuite/bfin/pushpopreg_1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/pushpopreg_1.s
rename to sim/testsuite/bfin/pushpopreg_1.s

diff --git a/sim/testsuite/sim/bfin/quadaddsub.s b/sim/testsuite/bfin/quadaddsub.s
similarity index 100%
rename from sim/testsuite/sim/bfin/quadaddsub.s
rename to sim/testsuite/bfin/quadaddsub.s

diff --git a/sim/testsuite/sim/bfin/random_0001.s b/sim/testsuite/bfin/random_0001.s
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0001.s
rename to sim/testsuite/bfin/random_0001.s

diff --git a/sim/testsuite/sim/bfin/random_0002.S b/sim/testsuite/bfin/random_0002.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0002.S
rename to sim/testsuite/bfin/random_0002.S

diff --git a/sim/testsuite/sim/bfin/random_0003.S b/sim/testsuite/bfin/random_0003.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0003.S
rename to sim/testsuite/bfin/random_0003.S

diff --git a/sim/testsuite/sim/bfin/random_0004.S b/sim/testsuite/bfin/random_0004.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0004.S
rename to sim/testsuite/bfin/random_0004.S

diff --git a/sim/testsuite/sim/bfin/random_0005.S b/sim/testsuite/bfin/random_0005.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0005.S
rename to sim/testsuite/bfin/random_0005.S

diff --git a/sim/testsuite/sim/bfin/random_0006.S b/sim/testsuite/bfin/random_0006.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0006.S
rename to sim/testsuite/bfin/random_0006.S

diff --git a/sim/testsuite/sim/bfin/random_0007.S b/sim/testsuite/bfin/random_0007.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0007.S
rename to sim/testsuite/bfin/random_0007.S

diff --git a/sim/testsuite/sim/bfin/random_0008.S b/sim/testsuite/bfin/random_0008.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0008.S
rename to sim/testsuite/bfin/random_0008.S

diff --git a/sim/testsuite/sim/bfin/random_0009.S b/sim/testsuite/bfin/random_0009.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0009.S
rename to sim/testsuite/bfin/random_0009.S

diff --git a/sim/testsuite/sim/bfin/random_0010.S b/sim/testsuite/bfin/random_0010.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0010.S
rename to sim/testsuite/bfin/random_0010.S

diff --git a/sim/testsuite/sim/bfin/random_0011.S b/sim/testsuite/bfin/random_0011.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0011.S
rename to sim/testsuite/bfin/random_0011.S

diff --git a/sim/testsuite/sim/bfin/random_0012.S b/sim/testsuite/bfin/random_0012.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0012.S
rename to sim/testsuite/bfin/random_0012.S

diff --git a/sim/testsuite/sim/bfin/random_0013.S b/sim/testsuite/bfin/random_0013.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0013.S
rename to sim/testsuite/bfin/random_0013.S

diff --git a/sim/testsuite/sim/bfin/random_0014.S b/sim/testsuite/bfin/random_0014.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0014.S
rename to sim/testsuite/bfin/random_0014.S

diff --git a/sim/testsuite/sim/bfin/random_0015.S b/sim/testsuite/bfin/random_0015.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0015.S
rename to sim/testsuite/bfin/random_0015.S

diff --git a/sim/testsuite/sim/bfin/random_0016.S b/sim/testsuite/bfin/random_0016.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0016.S
rename to sim/testsuite/bfin/random_0016.S

diff --git a/sim/testsuite/sim/bfin/random_0017.S b/sim/testsuite/bfin/random_0017.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0017.S
rename to sim/testsuite/bfin/random_0017.S

diff --git a/sim/testsuite/sim/bfin/random_0018.S b/sim/testsuite/bfin/random_0018.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0018.S
rename to sim/testsuite/bfin/random_0018.S

diff --git a/sim/testsuite/sim/bfin/random_0019.S b/sim/testsuite/bfin/random_0019.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0019.S
rename to sim/testsuite/bfin/random_0019.S

diff --git a/sim/testsuite/sim/bfin/random_0020.S b/sim/testsuite/bfin/random_0020.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0020.S
rename to sim/testsuite/bfin/random_0020.S

diff --git a/sim/testsuite/sim/bfin/random_0021.S b/sim/testsuite/bfin/random_0021.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0021.S
rename to sim/testsuite/bfin/random_0021.S

diff --git a/sim/testsuite/sim/bfin/random_0022.S b/sim/testsuite/bfin/random_0022.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0022.S
rename to sim/testsuite/bfin/random_0022.S

diff --git a/sim/testsuite/sim/bfin/random_0023.S b/sim/testsuite/bfin/random_0023.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0023.S
rename to sim/testsuite/bfin/random_0023.S

diff --git a/sim/testsuite/sim/bfin/random_0024.S b/sim/testsuite/bfin/random_0024.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0024.S
rename to sim/testsuite/bfin/random_0024.S

diff --git a/sim/testsuite/sim/bfin/random_0025.S b/sim/testsuite/bfin/random_0025.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0025.S
rename to sim/testsuite/bfin/random_0025.S

diff --git a/sim/testsuite/sim/bfin/random_0026.S b/sim/testsuite/bfin/random_0026.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0026.S
rename to sim/testsuite/bfin/random_0026.S

diff --git a/sim/testsuite/sim/bfin/random_0027.S b/sim/testsuite/bfin/random_0027.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0027.S
rename to sim/testsuite/bfin/random_0027.S

diff --git a/sim/testsuite/sim/bfin/random_0028.S b/sim/testsuite/bfin/random_0028.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0028.S
rename to sim/testsuite/bfin/random_0028.S

diff --git a/sim/testsuite/sim/bfin/random_0029.S b/sim/testsuite/bfin/random_0029.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0029.S
rename to sim/testsuite/bfin/random_0029.S

diff --git a/sim/testsuite/sim/bfin/random_0030.S b/sim/testsuite/bfin/random_0030.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0030.S
rename to sim/testsuite/bfin/random_0030.S

diff --git a/sim/testsuite/sim/bfin/random_0031.S b/sim/testsuite/bfin/random_0031.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0031.S
rename to sim/testsuite/bfin/random_0031.S

diff --git a/sim/testsuite/sim/bfin/random_0032.S b/sim/testsuite/bfin/random_0032.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0032.S
rename to sim/testsuite/bfin/random_0032.S

diff --git a/sim/testsuite/sim/bfin/random_0033.S b/sim/testsuite/bfin/random_0033.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0033.S
rename to sim/testsuite/bfin/random_0033.S

diff --git a/sim/testsuite/sim/bfin/random_0034.S b/sim/testsuite/bfin/random_0034.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0034.S
rename to sim/testsuite/bfin/random_0034.S

diff --git a/sim/testsuite/sim/bfin/random_0035.S b/sim/testsuite/bfin/random_0035.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0035.S
rename to sim/testsuite/bfin/random_0035.S

diff --git a/sim/testsuite/sim/bfin/random_0036.S b/sim/testsuite/bfin/random_0036.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0036.S
rename to sim/testsuite/bfin/random_0036.S

diff --git a/sim/testsuite/sim/bfin/random_0037.S b/sim/testsuite/bfin/random_0037.S
similarity index 100%
rename from sim/testsuite/sim/bfin/random_0037.S
rename to sim/testsuite/bfin/random_0037.S

diff --git a/sim/testsuite/sim/bfin/run-tests.sh b/sim/testsuite/bfin/run-tests.sh
similarity index 100%
rename from sim/testsuite/sim/bfin/run-tests.sh
rename to sim/testsuite/bfin/run-tests.sh

diff --git a/sim/testsuite/sim/bfin/s0.s b/sim/testsuite/bfin/s0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s0.s
rename to sim/testsuite/bfin/s0.s

diff --git a/sim/testsuite/sim/bfin/s1.s b/sim/testsuite/bfin/s1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s1.s
rename to sim/testsuite/bfin/s1.s

diff --git a/sim/testsuite/sim/bfin/s10.s b/sim/testsuite/bfin/s10.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s10.s
rename to sim/testsuite/bfin/s10.s

diff --git a/sim/testsuite/sim/bfin/s11.s b/sim/testsuite/bfin/s11.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s11.s
rename to sim/testsuite/bfin/s11.s

diff --git a/sim/testsuite/sim/bfin/s12.s b/sim/testsuite/bfin/s12.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s12.s
rename to sim/testsuite/bfin/s12.s

diff --git a/sim/testsuite/sim/bfin/s13.s b/sim/testsuite/bfin/s13.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s13.s
rename to sim/testsuite/bfin/s13.s

diff --git a/sim/testsuite/sim/bfin/s14.s b/sim/testsuite/bfin/s14.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s14.s
rename to sim/testsuite/bfin/s14.s

diff --git a/sim/testsuite/sim/bfin/s15.s b/sim/testsuite/bfin/s15.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s15.s
rename to sim/testsuite/bfin/s15.s

diff --git a/sim/testsuite/sim/bfin/s16.s b/sim/testsuite/bfin/s16.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s16.s
rename to sim/testsuite/bfin/s16.s

diff --git a/sim/testsuite/sim/bfin/s17.s b/sim/testsuite/bfin/s17.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s17.s
rename to sim/testsuite/bfin/s17.s

diff --git a/sim/testsuite/sim/bfin/s18.s b/sim/testsuite/bfin/s18.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s18.s
rename to sim/testsuite/bfin/s18.s

diff --git a/sim/testsuite/sim/bfin/s19.s b/sim/testsuite/bfin/s19.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s19.s
rename to sim/testsuite/bfin/s19.s

diff --git a/sim/testsuite/sim/bfin/s2.s b/sim/testsuite/bfin/s2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s2.s
rename to sim/testsuite/bfin/s2.s

diff --git a/sim/testsuite/sim/bfin/s20.s b/sim/testsuite/bfin/s20.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s20.s
rename to sim/testsuite/bfin/s20.s

diff --git a/sim/testsuite/sim/bfin/s21.s b/sim/testsuite/bfin/s21.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s21.s
rename to sim/testsuite/bfin/s21.s

diff --git a/sim/testsuite/sim/bfin/s3.s b/sim/testsuite/bfin/s3.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s3.s
rename to sim/testsuite/bfin/s3.s

diff --git a/sim/testsuite/sim/bfin/s30.s b/sim/testsuite/bfin/s30.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s30.s
rename to sim/testsuite/bfin/s30.s

diff --git a/sim/testsuite/sim/bfin/s4.s b/sim/testsuite/bfin/s4.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s4.s
rename to sim/testsuite/bfin/s4.s

diff --git a/sim/testsuite/sim/bfin/s5.s b/sim/testsuite/bfin/s5.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s5.s
rename to sim/testsuite/bfin/s5.s

diff --git a/sim/testsuite/sim/bfin/s6.s b/sim/testsuite/bfin/s6.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s6.s
rename to sim/testsuite/bfin/s6.s

diff --git a/sim/testsuite/sim/bfin/s7.s b/sim/testsuite/bfin/s7.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s7.s
rename to sim/testsuite/bfin/s7.s

diff --git a/sim/testsuite/sim/bfin/s8.s b/sim/testsuite/bfin/s8.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s8.s
rename to sim/testsuite/bfin/s8.s

diff --git a/sim/testsuite/sim/bfin/s9.s b/sim/testsuite/bfin/s9.s
similarity index 100%
rename from sim/testsuite/sim/bfin/s9.s
rename to sim/testsuite/bfin/s9.s

diff --git a/sim/testsuite/sim/bfin/saatest.s b/sim/testsuite/bfin/saatest.s
similarity index 100%
rename from sim/testsuite/sim/bfin/saatest.s
rename to sim/testsuite/bfin/saatest.s

diff --git a/sim/testsuite/sim/bfin/se_all16bitopcodes.S b/sim/testsuite/bfin/se_all16bitopcodes.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_all16bitopcodes.S
rename to sim/testsuite/bfin/se_all16bitopcodes.S

diff --git a/sim/testsuite/sim/bfin/se_all32bitopcodes.S b/sim/testsuite/bfin/se_all32bitopcodes.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_all32bitopcodes.S
rename to sim/testsuite/bfin/se_all32bitopcodes.S

diff --git a/sim/testsuite/sim/bfin/se_all32bitopcodes.lds b/sim/testsuite/bfin/se_all32bitopcodes.lds
similarity index 100%
rename from sim/testsuite/sim/bfin/se_all32bitopcodes.lds
rename to sim/testsuite/bfin/se_all32bitopcodes.lds

diff --git a/sim/testsuite/sim/bfin/se_all64bitg0opcodes.S b/sim/testsuite/bfin/se_all64bitg0opcodes.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_all64bitg0opcodes.S
rename to sim/testsuite/bfin/se_all64bitg0opcodes.S

diff --git a/sim/testsuite/sim/bfin/se_all64bitg1opcodes.S b/sim/testsuite/bfin/se_all64bitg1opcodes.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_all64bitg1opcodes.S
rename to sim/testsuite/bfin/se_all64bitg1opcodes.S

diff --git a/sim/testsuite/sim/bfin/se_all64bitg2opcodes.S b/sim/testsuite/bfin/se_all64bitg2opcodes.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_all64bitg2opcodes.S
rename to sim/testsuite/bfin/se_all64bitg2opcodes.S

diff --git a/sim/testsuite/sim/bfin/se_allopcodes.h b/sim/testsuite/bfin/se_allopcodes.h
similarity index 100%
rename from sim/testsuite/sim/bfin/se_allopcodes.h
rename to sim/testsuite/bfin/se_allopcodes.h

diff --git a/sim/testsuite/sim/bfin/se_brtarget_stall.S b/sim/testsuite/bfin/se_brtarget_stall.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_brtarget_stall.S
rename to sim/testsuite/bfin/se_brtarget_stall.S

diff --git a/sim/testsuite/sim/bfin/se_bug_ui.S b/sim/testsuite/bfin/se_bug_ui.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_bug_ui.S
rename to sim/testsuite/bfin/se_bug_ui.S

diff --git a/sim/testsuite/sim/bfin/se_bug_ui2.S b/sim/testsuite/bfin/se_bug_ui2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_bug_ui2.S
rename to sim/testsuite/bfin/se_bug_ui2.S

diff --git a/sim/testsuite/sim/bfin/se_bug_ui3.S b/sim/testsuite/bfin/se_bug_ui3.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_bug_ui3.S
rename to sim/testsuite/bfin/se_bug_ui3.S

diff --git a/sim/testsuite/sim/bfin/se_cc2stat_haz.S b/sim/testsuite/bfin/se_cc2stat_haz.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_cc2stat_haz.S
rename to sim/testsuite/bfin/se_cc2stat_haz.S

diff --git a/sim/testsuite/sim/bfin/se_cc_kill.S b/sim/testsuite/bfin/se_cc_kill.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_cc_kill.S
rename to sim/testsuite/bfin/se_cc_kill.S

diff --git a/sim/testsuite/sim/bfin/se_cof.S b/sim/testsuite/bfin/se_cof.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_cof.S
rename to sim/testsuite/bfin/se_cof.S

diff --git a/sim/testsuite/sim/bfin/se_event_quad.S b/sim/testsuite/bfin/se_event_quad.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_event_quad.S
rename to sim/testsuite/bfin/se_event_quad.S

diff --git a/sim/testsuite/sim/bfin/se_excpt_dagprotviol.S b/sim/testsuite/bfin/se_excpt_dagprotviol.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_excpt_dagprotviol.S
rename to sim/testsuite/bfin/se_excpt_dagprotviol.S

diff --git a/sim/testsuite/sim/bfin/se_excpt_ifprotviol.S b/sim/testsuite/bfin/se_excpt_ifprotviol.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_excpt_ifprotviol.S
rename to sim/testsuite/bfin/se_excpt_ifprotviol.S

diff --git a/sim/testsuite/sim/bfin/se_excpt_ssstep.S b/sim/testsuite/bfin/se_excpt_ssstep.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_excpt_ssstep.S
rename to sim/testsuite/bfin/se_excpt_ssstep.S

diff --git a/sim/testsuite/sim/bfin/se_illegalcombination.S b/sim/testsuite/bfin/se_illegalcombination.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_illegalcombination.S
rename to sim/testsuite/bfin/se_illegalcombination.S

diff --git a/sim/testsuite/sim/bfin/se_kill_wbbr.S b/sim/testsuite/bfin/se_kill_wbbr.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_kill_wbbr.S
rename to sim/testsuite/bfin/se_kill_wbbr.S

diff --git a/sim/testsuite/sim/bfin/se_kills2.S b/sim/testsuite/bfin/se_kills2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_kills2.S
rename to sim/testsuite/bfin/se_kills2.S

diff --git a/sim/testsuite/sim/bfin/se_loop_disable.S b/sim/testsuite/bfin/se_loop_disable.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_disable.S
rename to sim/testsuite/bfin/se_loop_disable.S

diff --git a/sim/testsuite/sim/bfin/se_loop_kill.S b/sim/testsuite/bfin/se_loop_kill.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_kill.S
rename to sim/testsuite/bfin/se_loop_kill.S

diff --git a/sim/testsuite/sim/bfin/se_loop_kill_01.S b/sim/testsuite/bfin/se_loop_kill_01.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_kill_01.S
rename to sim/testsuite/bfin/se_loop_kill_01.S

diff --git a/sim/testsuite/sim/bfin/se_loop_kill_dcr.S b/sim/testsuite/bfin/se_loop_kill_dcr.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_kill_dcr.S
rename to sim/testsuite/bfin/se_loop_kill_dcr.S

diff --git a/sim/testsuite/sim/bfin/se_loop_kill_dcr_01.S b/sim/testsuite/bfin/se_loop_kill_dcr_01.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_kill_dcr_01.S
rename to sim/testsuite/bfin/se_loop_kill_dcr_01.S

diff --git a/sim/testsuite/sim/bfin/se_loop_lr.S b/sim/testsuite/bfin/se_loop_lr.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_lr.S
rename to sim/testsuite/bfin/se_loop_lr.S

diff --git a/sim/testsuite/sim/bfin/se_loop_mv2lb_stall.S b/sim/testsuite/bfin/se_loop_mv2lb_stall.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_mv2lb_stall.S
rename to sim/testsuite/bfin/se_loop_mv2lb_stall.S

diff --git a/sim/testsuite/sim/bfin/se_loop_mv2lc.S b/sim/testsuite/bfin/se_loop_mv2lc.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_mv2lc.S
rename to sim/testsuite/bfin/se_loop_mv2lc.S

diff --git a/sim/testsuite/sim/bfin/se_loop_mv2lc_stall.S b/sim/testsuite/bfin/se_loop_mv2lc_stall.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_mv2lc_stall.S
rename to sim/testsuite/bfin/se_loop_mv2lc_stall.S

diff --git a/sim/testsuite/sim/bfin/se_loop_mv2lt_stall.S b/sim/testsuite/bfin/se_loop_mv2lt_stall.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_mv2lt_stall.S
rename to sim/testsuite/bfin/se_loop_mv2lt_stall.S

diff --git a/sim/testsuite/sim/bfin/se_loop_nest_ppm.S b/sim/testsuite/bfin/se_loop_nest_ppm.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_nest_ppm.S
rename to sim/testsuite/bfin/se_loop_nest_ppm.S

diff --git a/sim/testsuite/sim/bfin/se_loop_nest_ppm_1.S b/sim/testsuite/bfin/se_loop_nest_ppm_1.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_nest_ppm_1.S
rename to sim/testsuite/bfin/se_loop_nest_ppm_1.S

diff --git a/sim/testsuite/sim/bfin/se_loop_nest_ppm_2.S b/sim/testsuite/bfin/se_loop_nest_ppm_2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_nest_ppm_2.S
rename to sim/testsuite/bfin/se_loop_nest_ppm_2.S

diff --git a/sim/testsuite/sim/bfin/se_loop_ppm.S b/sim/testsuite/bfin/se_loop_ppm.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_ppm.S
rename to sim/testsuite/bfin/se_loop_ppm.S

diff --git a/sim/testsuite/sim/bfin/se_loop_ppm_1.S b/sim/testsuite/bfin/se_loop_ppm_1.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_ppm_1.S
rename to sim/testsuite/bfin/se_loop_ppm_1.S

diff --git a/sim/testsuite/sim/bfin/se_loop_ppm_int.S b/sim/testsuite/bfin/se_loop_ppm_int.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_loop_ppm_int.S
rename to sim/testsuite/bfin/se_loop_ppm_int.S

diff --git a/sim/testsuite/sim/bfin/se_lsetup_kill.S b/sim/testsuite/bfin/se_lsetup_kill.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_lsetup_kill.S
rename to sim/testsuite/bfin/se_lsetup_kill.S

diff --git a/sim/testsuite/sim/bfin/se_misaligned_fetch.S b/sim/testsuite/bfin/se_misaligned_fetch.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_misaligned_fetch.S
rename to sim/testsuite/bfin/se_misaligned_fetch.S

diff --git a/sim/testsuite/sim/bfin/se_more_ret_haz.S b/sim/testsuite/bfin/se_more_ret_haz.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_more_ret_haz.S
rename to sim/testsuite/bfin/se_more_ret_haz.S

diff --git a/sim/testsuite/sim/bfin/se_mv2lp.S b/sim/testsuite/bfin/se_mv2lp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_mv2lp.S
rename to sim/testsuite/bfin/se_mv2lp.S

diff --git a/sim/testsuite/sim/bfin/se_oneins_zoff.S b/sim/testsuite/bfin/se_oneins_zoff.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_oneins_zoff.S
rename to sim/testsuite/bfin/se_oneins_zoff.S

diff --git a/sim/testsuite/sim/bfin/se_popkill.S b/sim/testsuite/bfin/se_popkill.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_popkill.S
rename to sim/testsuite/bfin/se_popkill.S

diff --git a/sim/testsuite/sim/bfin/se_regmv_usp_sysreg.S b/sim/testsuite/bfin/se_regmv_usp_sysreg.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_regmv_usp_sysreg.S
rename to sim/testsuite/bfin/se_regmv_usp_sysreg.S

diff --git a/sim/testsuite/sim/bfin/se_rets_hazard.s b/sim/testsuite/bfin/se_rets_hazard.s
similarity index 100%
rename from sim/testsuite/sim/bfin/se_rets_hazard.s
rename to sim/testsuite/bfin/se_rets_hazard.s

diff --git a/sim/testsuite/sim/bfin/se_rts_rti.S b/sim/testsuite/bfin/se_rts_rti.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_rts_rti.S
rename to sim/testsuite/bfin/se_rts_rti.S

diff --git a/sim/testsuite/sim/bfin/se_ssstep_dagprotviol.S b/sim/testsuite/bfin/se_ssstep_dagprotviol.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_ssstep_dagprotviol.S
rename to sim/testsuite/bfin/se_ssstep_dagprotviol.S

diff --git a/sim/testsuite/sim/bfin/se_ssync.S b/sim/testsuite/bfin/se_ssync.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_ssync.S
rename to sim/testsuite/bfin/se_ssync.S

diff --git a/sim/testsuite/sim/bfin/se_stall_if2.S b/sim/testsuite/bfin/se_stall_if2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_stall_if2.S
rename to sim/testsuite/bfin/se_stall_if2.S

diff --git a/sim/testsuite/sim/bfin/se_undefinedinstruction1.S b/sim/testsuite/bfin/se_undefinedinstruction1.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_undefinedinstruction1.S
rename to sim/testsuite/bfin/se_undefinedinstruction1.S

diff --git a/sim/testsuite/sim/bfin/se_undefinedinstruction2.S b/sim/testsuite/bfin/se_undefinedinstruction2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_undefinedinstruction2.S
rename to sim/testsuite/bfin/se_undefinedinstruction2.S

diff --git a/sim/testsuite/sim/bfin/se_undefinedinstruction3.S b/sim/testsuite/bfin/se_undefinedinstruction3.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_undefinedinstruction3.S
rename to sim/testsuite/bfin/se_undefinedinstruction3.S

diff --git a/sim/testsuite/sim/bfin/se_undefinedinstruction4.S b/sim/testsuite/bfin/se_undefinedinstruction4.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_undefinedinstruction4.S
rename to sim/testsuite/bfin/se_undefinedinstruction4.S

diff --git a/sim/testsuite/sim/bfin/se_usermode_protviol.S b/sim/testsuite/bfin/se_usermode_protviol.S
similarity index 100%
rename from sim/testsuite/sim/bfin/se_usermode_protviol.S
rename to sim/testsuite/bfin/se_usermode_protviol.S

diff --git a/sim/testsuite/sim/bfin/seqstat.s b/sim/testsuite/bfin/seqstat.s
similarity index 100%
rename from sim/testsuite/sim/bfin/seqstat.s
rename to sim/testsuite/bfin/seqstat.s

diff --git a/sim/testsuite/sim/bfin/sign.s b/sim/testsuite/bfin/sign.s
similarity index 100%
rename from sim/testsuite/sim/bfin/sign.s
rename to sim/testsuite/bfin/sign.s

diff --git a/sim/testsuite/sim/bfin/simple0.s b/sim/testsuite/bfin/simple0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/simple0.s
rename to sim/testsuite/bfin/simple0.s

diff --git a/sim/testsuite/sim/bfin/sri.s b/sim/testsuite/bfin/sri.s
similarity index 100%
rename from sim/testsuite/sim/bfin/sri.s
rename to sim/testsuite/bfin/sri.s

diff --git a/sim/testsuite/sim/bfin/stk.s b/sim/testsuite/bfin/stk.s
similarity index 100%
rename from sim/testsuite/sim/bfin/stk.s
rename to sim/testsuite/bfin/stk.s

diff --git a/sim/testsuite/sim/bfin/stk2.s b/sim/testsuite/bfin/stk2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/stk2.s
rename to sim/testsuite/bfin/stk2.s

diff --git a/sim/testsuite/sim/bfin/stk3.s b/sim/testsuite/bfin/stk3.s
similarity index 100%
rename from sim/testsuite/sim/bfin/stk3.s
rename to sim/testsuite/bfin/stk3.s

diff --git a/sim/testsuite/sim/bfin/stk4.s b/sim/testsuite/bfin/stk4.s
similarity index 100%
rename from sim/testsuite/sim/bfin/stk4.s
rename to sim/testsuite/bfin/stk4.s

diff --git a/sim/testsuite/sim/bfin/stk5.s b/sim/testsuite/bfin/stk5.s
similarity index 100%
rename from sim/testsuite/sim/bfin/stk5.s
rename to sim/testsuite/bfin/stk5.s

diff --git a/sim/testsuite/sim/bfin/stk6.s b/sim/testsuite/bfin/stk6.s
similarity index 100%
rename from sim/testsuite/sim/bfin/stk6.s
rename to sim/testsuite/bfin/stk6.s

diff --git a/sim/testsuite/sim/bfin/syscfg.s b/sim/testsuite/bfin/syscfg.s
similarity index 100%
rename from sim/testsuite/sim/bfin/syscfg.s
rename to sim/testsuite/bfin/syscfg.s

diff --git a/sim/testsuite/sim/bfin/tar10622.s b/sim/testsuite/bfin/tar10622.s
similarity index 100%
rename from sim/testsuite/sim/bfin/tar10622.s
rename to sim/testsuite/bfin/tar10622.s

diff --git a/sim/testsuite/sim/bfin/test-dma.h b/sim/testsuite/bfin/test-dma.h
similarity index 100%
rename from sim/testsuite/sim/bfin/test-dma.h
rename to sim/testsuite/bfin/test-dma.h

diff --git a/sim/testsuite/sim/bfin/test.h b/sim/testsuite/bfin/test.h
similarity index 100%
rename from sim/testsuite/sim/bfin/test.h
rename to sim/testsuite/bfin/test.h

diff --git a/sim/testsuite/sim/bfin/testset.s b/sim/testsuite/bfin/testset.s
similarity index 100%
rename from sim/testsuite/sim/bfin/testset.s
rename to sim/testsuite/bfin/testset.s

diff --git a/sim/testsuite/sim/bfin/testset2.s b/sim/testsuite/bfin/testset2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/testset2.s
rename to sim/testsuite/bfin/testset2.s

diff --git a/sim/testsuite/sim/bfin/testutils.inc b/sim/testsuite/bfin/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/bfin/testutils.inc
rename to sim/testsuite/bfin/testutils.inc

diff --git a/sim/testsuite/sim/bfin/unlink.S b/sim/testsuite/bfin/unlink.S
similarity index 100%
rename from sim/testsuite/sim/bfin/unlink.S
rename to sim/testsuite/bfin/unlink.S

diff --git a/sim/testsuite/sim/bfin/up0.s b/sim/testsuite/bfin/up0.s
similarity index 100%
rename from sim/testsuite/sim/bfin/up0.s
rename to sim/testsuite/bfin/up0.s

diff --git a/sim/testsuite/sim/bfin/usp.S b/sim/testsuite/bfin/usp.S
similarity index 100%
rename from sim/testsuite/sim/bfin/usp.S
rename to sim/testsuite/bfin/usp.S

diff --git a/sim/testsuite/sim/bfin/vec-abs-2.S b/sim/testsuite/bfin/vec-abs-2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/vec-abs-2.S
rename to sim/testsuite/bfin/vec-abs-2.S

diff --git a/sim/testsuite/sim/bfin/vec-abs-3.S b/sim/testsuite/bfin/vec-abs-3.S
similarity index 100%
rename from sim/testsuite/sim/bfin/vec-abs-3.S
rename to sim/testsuite/bfin/vec-abs-3.S

diff --git a/sim/testsuite/sim/bfin/vec-abs.S b/sim/testsuite/bfin/vec-abs.S
similarity index 100%
rename from sim/testsuite/sim/bfin/vec-abs.S
rename to sim/testsuite/bfin/vec-abs.S

diff --git a/sim/testsuite/sim/bfin/vec-neg-2.S b/sim/testsuite/bfin/vec-neg-2.S
similarity index 100%
rename from sim/testsuite/sim/bfin/vec-neg-2.S
rename to sim/testsuite/bfin/vec-neg-2.S

diff --git a/sim/testsuite/sim/bfin/vec-neg-3.S b/sim/testsuite/bfin/vec-neg-3.S
similarity index 100%
rename from sim/testsuite/sim/bfin/vec-neg-3.S
rename to sim/testsuite/bfin/vec-neg-3.S

diff --git a/sim/testsuite/sim/bfin/vec-neg.S b/sim/testsuite/bfin/vec-neg.S
similarity index 100%
rename from sim/testsuite/sim/bfin/vec-neg.S
rename to sim/testsuite/bfin/vec-neg.S

diff --git a/sim/testsuite/sim/bfin/vecadd.s b/sim/testsuite/bfin/vecadd.s
similarity index 100%
rename from sim/testsuite/sim/bfin/vecadd.s
rename to sim/testsuite/bfin/vecadd.s

diff --git a/sim/testsuite/sim/bfin/vit_max.s b/sim/testsuite/bfin/vit_max.s
similarity index 100%
rename from sim/testsuite/sim/bfin/vit_max.s
rename to sim/testsuite/bfin/vit_max.s

diff --git a/sim/testsuite/sim/bfin/vit_max2.s b/sim/testsuite/bfin/vit_max2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/vit_max2.s
rename to sim/testsuite/bfin/vit_max2.s

diff --git a/sim/testsuite/sim/bfin/viterbi2.s b/sim/testsuite/bfin/viterbi2.s
similarity index 100%
rename from sim/testsuite/sim/bfin/viterbi2.s
rename to sim/testsuite/bfin/viterbi2.s

diff --git a/sim/testsuite/sim/bfin/wtf.s b/sim/testsuite/bfin/wtf.s
similarity index 100%
rename from sim/testsuite/sim/bfin/wtf.s
rename to sim/testsuite/bfin/wtf.s

diff --git a/sim/testsuite/sim/bfin/x1.s b/sim/testsuite/bfin/x1.s
similarity index 100%
rename from sim/testsuite/sim/bfin/x1.s
rename to sim/testsuite/bfin/x1.s

diff --git a/sim/testsuite/sim/bfin/zcall.s b/sim/testsuite/bfin/zcall.s
similarity index 100%
rename from sim/testsuite/sim/bfin/zcall.s
rename to sim/testsuite/bfin/zcall.s

diff --git a/sim/testsuite/sim/bfin/zeroflagrnd.s b/sim/testsuite/bfin/zeroflagrnd.s
similarity index 100%
rename from sim/testsuite/sim/bfin/zeroflagrnd.s
rename to sim/testsuite/bfin/zeroflagrnd.s

diff --git a/sim/testsuite/sim/bpf/ChangeLog b/sim/testsuite/bpf/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/bpf/ChangeLog
rename to sim/testsuite/bpf/ChangeLog

diff --git a/sim/testsuite/sim/bpf/allinsn.exp b/sim/testsuite/bpf/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/bpf/allinsn.exp
rename to sim/testsuite/bpf/allinsn.exp

diff --git a/sim/testsuite/sim/bpf/alu.s b/sim/testsuite/bpf/alu.s
similarity index 100%
rename from sim/testsuite/sim/bpf/alu.s
rename to sim/testsuite/bpf/alu.s

diff --git a/sim/testsuite/sim/bpf/alu32.s b/sim/testsuite/bpf/alu32.s
similarity index 100%
rename from sim/testsuite/sim/bpf/alu32.s
rename to sim/testsuite/bpf/alu32.s

diff --git a/sim/testsuite/sim/bpf/endbe.s b/sim/testsuite/bpf/endbe.s
similarity index 100%
rename from sim/testsuite/sim/bpf/endbe.s
rename to sim/testsuite/bpf/endbe.s

diff --git a/sim/testsuite/sim/bpf/endle.s b/sim/testsuite/bpf/endle.s
similarity index 100%
rename from sim/testsuite/sim/bpf/endle.s
rename to sim/testsuite/bpf/endle.s

diff --git a/sim/testsuite/sim/bpf/jmp.s b/sim/testsuite/bpf/jmp.s
similarity index 100%
rename from sim/testsuite/sim/bpf/jmp.s
rename to sim/testsuite/bpf/jmp.s

diff --git a/sim/testsuite/sim/bpf/jmp32.s b/sim/testsuite/bpf/jmp32.s
similarity index 100%
rename from sim/testsuite/sim/bpf/jmp32.s
rename to sim/testsuite/bpf/jmp32.s

diff --git a/sim/testsuite/sim/bpf/ldabs.s b/sim/testsuite/bpf/ldabs.s
similarity index 100%
rename from sim/testsuite/sim/bpf/ldabs.s
rename to sim/testsuite/bpf/ldabs.s

diff --git a/sim/testsuite/sim/bpf/mem.s b/sim/testsuite/bpf/mem.s
similarity index 100%
rename from sim/testsuite/sim/bpf/mem.s
rename to sim/testsuite/bpf/mem.s

diff --git a/sim/testsuite/sim/bpf/mov.s b/sim/testsuite/bpf/mov.s
similarity index 100%
rename from sim/testsuite/sim/bpf/mov.s
rename to sim/testsuite/bpf/mov.s

diff --git a/sim/testsuite/sim/bpf/testutils.inc b/sim/testsuite/bpf/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/bpf/testutils.inc
rename to sim/testsuite/bpf/testutils.inc

diff --git a/sim/testsuite/sim/bpf/xadd.s b/sim/testsuite/bpf/xadd.s
similarity index 100%
rename from sim/testsuite/sim/bpf/xadd.s
rename to sim/testsuite/bpf/xadd.s

diff --git a/sim/testsuite/sim/cr16/ChangeLog b/sim/testsuite/cr16/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/cr16/ChangeLog
rename to sim/testsuite/cr16/ChangeLog

diff --git a/sim/testsuite/sim/cr16/addb.cgs b/sim/testsuite/cr16/addb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/addb.cgs
rename to sim/testsuite/cr16/addb.cgs

diff --git a/sim/testsuite/sim/cr16/addd.cgs b/sim/testsuite/cr16/addd.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/addd.cgs
rename to sim/testsuite/cr16/addd.cgs

diff --git a/sim/testsuite/sim/cr16/addi.cgs b/sim/testsuite/cr16/addi.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/addi.cgs
rename to sim/testsuite/cr16/addi.cgs

diff --git a/sim/testsuite/sim/cr16/addw.cgs b/sim/testsuite/cr16/addw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/addw.cgs
rename to sim/testsuite/cr16/addw.cgs

diff --git a/sim/testsuite/sim/cr16/allinsn.exp b/sim/testsuite/cr16/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/cr16/allinsn.exp
rename to sim/testsuite/cr16/allinsn.exp

diff --git a/sim/testsuite/sim/cr16/andb.cgs b/sim/testsuite/cr16/andb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/andb.cgs
rename to sim/testsuite/cr16/andb.cgs

diff --git a/sim/testsuite/sim/cr16/andd.cgs b/sim/testsuite/cr16/andd.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/andd.cgs
rename to sim/testsuite/cr16/andd.cgs

diff --git a/sim/testsuite/sim/cr16/andw.cgs b/sim/testsuite/cr16/andw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/andw.cgs
rename to sim/testsuite/cr16/andw.cgs

diff --git a/sim/testsuite/sim/cr16/ashub.cgs b/sim/testsuite/cr16/ashub.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/ashub.cgs
rename to sim/testsuite/cr16/ashub.cgs

diff --git a/sim/testsuite/sim/cr16/ashub_i.cgs b/sim/testsuite/cr16/ashub_i.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/ashub_i.cgs
rename to sim/testsuite/cr16/ashub_i.cgs

diff --git a/sim/testsuite/sim/cr16/ashud.cgs b/sim/testsuite/cr16/ashud.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/ashud.cgs
rename to sim/testsuite/cr16/ashud.cgs

diff --git a/sim/testsuite/sim/cr16/ashud_i.cgs b/sim/testsuite/cr16/ashud_i.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/ashud_i.cgs
rename to sim/testsuite/cr16/ashud_i.cgs

diff --git a/sim/testsuite/sim/cr16/ashuw.cgs b/sim/testsuite/cr16/ashuw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/ashuw.cgs
rename to sim/testsuite/cr16/ashuw.cgs

diff --git a/sim/testsuite/sim/cr16/ashuw_i.cgs b/sim/testsuite/cr16/ashuw_i.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/ashuw_i.cgs
rename to sim/testsuite/cr16/ashuw_i.cgs

diff --git a/sim/testsuite/sim/cr16/bal1_24.cgs b/sim/testsuite/cr16/bal1_24.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bal1_24.cgs
rename to sim/testsuite/cr16/bal1_24.cgs

diff --git a/sim/testsuite/sim/cr16/bal2_24.cgs b/sim/testsuite/cr16/bal2_24.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bal2_24.cgs
rename to sim/testsuite/cr16/bal2_24.cgs

diff --git a/sim/testsuite/sim/cr16/bcc.cgs b/sim/testsuite/cr16/bcc.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bcc.cgs
rename to sim/testsuite/cr16/bcc.cgs

diff --git a/sim/testsuite/sim/cr16/bcs.cgs b/sim/testsuite/cr16/bcs.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bcs.cgs
rename to sim/testsuite/cr16/bcs.cgs

diff --git a/sim/testsuite/sim/cr16/beq.cgs b/sim/testsuite/cr16/beq.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/beq.cgs
rename to sim/testsuite/cr16/beq.cgs

diff --git a/sim/testsuite/sim/cr16/beq0b.cgs b/sim/testsuite/cr16/beq0b.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/beq0b.cgs
rename to sim/testsuite/cr16/beq0b.cgs

diff --git a/sim/testsuite/sim/cr16/beq0w.cgs b/sim/testsuite/cr16/beq0w.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/beq0w.cgs
rename to sim/testsuite/cr16/beq0w.cgs

diff --git a/sim/testsuite/sim/cr16/bge.cgs b/sim/testsuite/cr16/bge.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bge.cgs
rename to sim/testsuite/cr16/bge.cgs

diff --git a/sim/testsuite/sim/cr16/bgt.cgs b/sim/testsuite/cr16/bgt.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bgt.cgs
rename to sim/testsuite/cr16/bgt.cgs

diff --git a/sim/testsuite/sim/cr16/bhi.cgs b/sim/testsuite/cr16/bhi.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bhi.cgs
rename to sim/testsuite/cr16/bhi.cgs

diff --git a/sim/testsuite/sim/cr16/bhs.cgs b/sim/testsuite/cr16/bhs.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bhs.cgs
rename to sim/testsuite/cr16/bhs.cgs

diff --git a/sim/testsuite/sim/cr16/bht.cgs b/sim/testsuite/cr16/bht.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bht.cgs
rename to sim/testsuite/cr16/bht.cgs

diff --git a/sim/testsuite/sim/cr16/blo.cgs b/sim/testsuite/cr16/blo.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/blo.cgs
rename to sim/testsuite/cr16/blo.cgs

diff --git a/sim/testsuite/sim/cr16/bls.cgs b/sim/testsuite/cr16/bls.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bls.cgs
rename to sim/testsuite/cr16/bls.cgs

diff --git a/sim/testsuite/sim/cr16/blt.cgs b/sim/testsuite/cr16/blt.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/blt.cgs
rename to sim/testsuite/cr16/blt.cgs

diff --git a/sim/testsuite/sim/cr16/bne.cgs b/sim/testsuite/cr16/bne.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bne.cgs
rename to sim/testsuite/cr16/bne.cgs

diff --git a/sim/testsuite/sim/cr16/bne0b.cgs b/sim/testsuite/cr16/bne0b.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bne0b.cgs
rename to sim/testsuite/cr16/bne0b.cgs

diff --git a/sim/testsuite/sim/cr16/bne0w.cgs b/sim/testsuite/cr16/bne0w.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/bne0w.cgs
rename to sim/testsuite/cr16/bne0w.cgs

diff --git a/sim/testsuite/sim/cr16/br.cgs b/sim/testsuite/cr16/br.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/br.cgs
rename to sim/testsuite/cr16/br.cgs

diff --git a/sim/testsuite/sim/cr16/cbitb.cgs b/sim/testsuite/cr16/cbitb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/cbitb.cgs
rename to sim/testsuite/cr16/cbitb.cgs

diff --git a/sim/testsuite/sim/cr16/cbitw.cgs b/sim/testsuite/cr16/cbitw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/cbitw.cgs
rename to sim/testsuite/cr16/cbitw.cgs

diff --git a/sim/testsuite/sim/cr16/cmpb.cgs b/sim/testsuite/cr16/cmpb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/cmpb.cgs
rename to sim/testsuite/cr16/cmpb.cgs

diff --git a/sim/testsuite/sim/cr16/cmpb_i.cgs b/sim/testsuite/cr16/cmpb_i.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/cmpb_i.cgs
rename to sim/testsuite/cr16/cmpb_i.cgs

diff --git a/sim/testsuite/sim/cr16/cmpd.cgs b/sim/testsuite/cr16/cmpd.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/cmpd.cgs
rename to sim/testsuite/cr16/cmpd.cgs

diff --git a/sim/testsuite/sim/cr16/cmpd_i.cgs b/sim/testsuite/cr16/cmpd_i.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/cmpd_i.cgs
rename to sim/testsuite/cr16/cmpd_i.cgs

diff --git a/sim/testsuite/sim/cr16/cmpi.cgs b/sim/testsuite/cr16/cmpi.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/cmpi.cgs
rename to sim/testsuite/cr16/cmpi.cgs

diff --git a/sim/testsuite/sim/cr16/cmpw.cgs b/sim/testsuite/cr16/cmpw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/cmpw.cgs
rename to sim/testsuite/cr16/cmpw.cgs

diff --git a/sim/testsuite/sim/cr16/cmpw_i.cgs b/sim/testsuite/cr16/cmpw_i.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/cmpw_i.cgs
rename to sim/testsuite/cr16/cmpw_i.cgs

diff --git a/sim/testsuite/sim/cr16/excp.cgs b/sim/testsuite/cr16/excp.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/excp.cgs
rename to sim/testsuite/cr16/excp.cgs

diff --git a/sim/testsuite/sim/cr16/hello.ms b/sim/testsuite/cr16/hello.ms
similarity index 100%
rename from sim/testsuite/sim/cr16/hello.ms
rename to sim/testsuite/cr16/hello.ms

diff --git a/sim/testsuite/sim/cr16/hw-trap.ms b/sim/testsuite/cr16/hw-trap.ms
similarity index 100%
rename from sim/testsuite/sim/cr16/hw-trap.ms
rename to sim/testsuite/cr16/hw-trap.ms

diff --git a/sim/testsuite/sim/cr16/jal.cgs b/sim/testsuite/cr16/jal.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jal.cgs
rename to sim/testsuite/cr16/jal.cgs

diff --git a/sim/testsuite/sim/cr16/jcc.cgs b/sim/testsuite/cr16/jcc.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jcc.cgs
rename to sim/testsuite/cr16/jcc.cgs

diff --git a/sim/testsuite/sim/cr16/jcs.cgs b/sim/testsuite/cr16/jcs.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jcs.cgs
rename to sim/testsuite/cr16/jcs.cgs

diff --git a/sim/testsuite/sim/cr16/jeq.cgs b/sim/testsuite/cr16/jeq.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jeq.cgs
rename to sim/testsuite/cr16/jeq.cgs

diff --git a/sim/testsuite/sim/cr16/jfc.cgs b/sim/testsuite/cr16/jfc.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jfc.cgs
rename to sim/testsuite/cr16/jfc.cgs

diff --git a/sim/testsuite/sim/cr16/jfs.cgs b/sim/testsuite/cr16/jfs.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jfs.cgs
rename to sim/testsuite/cr16/jfs.cgs

diff --git a/sim/testsuite/sim/cr16/jge.cgs b/sim/testsuite/cr16/jge.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jge.cgs
rename to sim/testsuite/cr16/jge.cgs

diff --git a/sim/testsuite/sim/cr16/jgt.cgs b/sim/testsuite/cr16/jgt.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jgt.cgs
rename to sim/testsuite/cr16/jgt.cgs

diff --git a/sim/testsuite/sim/cr16/jhi.cgs b/sim/testsuite/cr16/jhi.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jhi.cgs
rename to sim/testsuite/cr16/jhi.cgs

diff --git a/sim/testsuite/sim/cr16/jhs.cgs b/sim/testsuite/cr16/jhs.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jhs.cgs
rename to sim/testsuite/cr16/jhs.cgs

diff --git a/sim/testsuite/sim/cr16/jlo.cgs b/sim/testsuite/cr16/jlo.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jlo.cgs
rename to sim/testsuite/cr16/jlo.cgs

diff --git a/sim/testsuite/sim/cr16/jls.cgs b/sim/testsuite/cr16/jls.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jls.cgs
rename to sim/testsuite/cr16/jls.cgs

diff --git a/sim/testsuite/sim/cr16/jlt.cgs b/sim/testsuite/cr16/jlt.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jlt.cgs
rename to sim/testsuite/cr16/jlt.cgs

diff --git a/sim/testsuite/sim/cr16/jne.cgs b/sim/testsuite/cr16/jne.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jne.cgs
rename to sim/testsuite/cr16/jne.cgs

diff --git a/sim/testsuite/sim/cr16/jump.cgs b/sim/testsuite/cr16/jump.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/jump.cgs
rename to sim/testsuite/cr16/jump.cgs

diff --git a/sim/testsuite/sim/cr16/loadb.cgs b/sim/testsuite/cr16/loadb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/loadb.cgs
rename to sim/testsuite/cr16/loadb.cgs

diff --git a/sim/testsuite/sim/cr16/loadd.cgs b/sim/testsuite/cr16/loadd.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/loadd.cgs
rename to sim/testsuite/cr16/loadd.cgs

diff --git a/sim/testsuite/sim/cr16/loadm.cgs b/sim/testsuite/cr16/loadm.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/loadm.cgs
rename to sim/testsuite/cr16/loadm.cgs

diff --git a/sim/testsuite/sim/cr16/loadmp.cgs b/sim/testsuite/cr16/loadmp.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/loadmp.cgs
rename to sim/testsuite/cr16/loadmp.cgs

diff --git a/sim/testsuite/sim/cr16/loadw.cgs b/sim/testsuite/cr16/loadw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/loadw.cgs
rename to sim/testsuite/cr16/loadw.cgs

diff --git a/sim/testsuite/sim/cr16/lpr-spr.cgs b/sim/testsuite/cr16/lpr-spr.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/lpr-spr.cgs
rename to sim/testsuite/cr16/lpr-spr.cgs

diff --git a/sim/testsuite/sim/cr16/lprd-sprd.cgs b/sim/testsuite/cr16/lprd-sprd.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/lprd-sprd.cgs
rename to sim/testsuite/cr16/lprd-sprd.cgs

diff --git a/sim/testsuite/sim/cr16/lshb.cgs b/sim/testsuite/cr16/lshb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/lshb.cgs
rename to sim/testsuite/cr16/lshb.cgs

diff --git a/sim/testsuite/sim/cr16/lshb_i.cgs b/sim/testsuite/cr16/lshb_i.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/lshb_i.cgs
rename to sim/testsuite/cr16/lshb_i.cgs

diff --git a/sim/testsuite/sim/cr16/lshd.cgs b/sim/testsuite/cr16/lshd.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/lshd.cgs
rename to sim/testsuite/cr16/lshd.cgs

diff --git a/sim/testsuite/sim/cr16/lshd_i.cgs b/sim/testsuite/cr16/lshd_i.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/lshd_i.cgs
rename to sim/testsuite/cr16/lshd_i.cgs

diff --git a/sim/testsuite/sim/cr16/lshw.cgs b/sim/testsuite/cr16/lshw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/lshw.cgs
rename to sim/testsuite/cr16/lshw.cgs

diff --git a/sim/testsuite/sim/cr16/lshw_i.cgs b/sim/testsuite/cr16/lshw_i.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/lshw_i.cgs
rename to sim/testsuite/cr16/lshw_i.cgs

diff --git a/sim/testsuite/sim/cr16/macqw.cgs b/sim/testsuite/cr16/macqw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/macqw.cgs
rename to sim/testsuite/cr16/macqw.cgs

diff --git a/sim/testsuite/sim/cr16/macsw.cgs b/sim/testsuite/cr16/macsw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/macsw.cgs
rename to sim/testsuite/cr16/macsw.cgs

diff --git a/sim/testsuite/sim/cr16/macuw.cgs b/sim/testsuite/cr16/macuw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/macuw.cgs
rename to sim/testsuite/cr16/macuw.cgs

diff --git a/sim/testsuite/sim/cr16/misc.exp b/sim/testsuite/cr16/misc.exp
similarity index 100%
rename from sim/testsuite/sim/cr16/misc.exp
rename to sim/testsuite/cr16/misc.exp

diff --git a/sim/testsuite/sim/cr16/movb.cgs b/sim/testsuite/cr16/movb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/movb.cgs
rename to sim/testsuite/cr16/movb.cgs

diff --git a/sim/testsuite/sim/cr16/movd.cgs b/sim/testsuite/cr16/movd.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/movd.cgs
rename to sim/testsuite/cr16/movd.cgs

diff --git a/sim/testsuite/sim/cr16/movw.cgs b/sim/testsuite/cr16/movw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/movw.cgs
rename to sim/testsuite/cr16/movw.cgs

diff --git a/sim/testsuite/sim/cr16/movxb.cgs b/sim/testsuite/cr16/movxb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/movxb.cgs
rename to sim/testsuite/cr16/movxb.cgs

diff --git a/sim/testsuite/sim/cr16/movxw.cgs b/sim/testsuite/cr16/movxw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/movxw.cgs
rename to sim/testsuite/cr16/movxw.cgs

diff --git a/sim/testsuite/sim/cr16/movzb.cgs b/sim/testsuite/cr16/movzb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/movzb.cgs
rename to sim/testsuite/cr16/movzb.cgs

diff --git a/sim/testsuite/sim/cr16/movzw.cgs b/sim/testsuite/cr16/movzw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/movzw.cgs
rename to sim/testsuite/cr16/movzw.cgs

diff --git a/sim/testsuite/sim/cr16/mulb.cgs b/sim/testsuite/cr16/mulb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/mulb.cgs
rename to sim/testsuite/cr16/mulb.cgs

diff --git a/sim/testsuite/sim/cr16/mulsb.cgs b/sim/testsuite/cr16/mulsb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/mulsb.cgs
rename to sim/testsuite/cr16/mulsb.cgs

diff --git a/sim/testsuite/sim/cr16/mulsw.cgs b/sim/testsuite/cr16/mulsw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/mulsw.cgs
rename to sim/testsuite/cr16/mulsw.cgs

diff --git a/sim/testsuite/sim/cr16/muluw.cgs b/sim/testsuite/cr16/muluw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/muluw.cgs
rename to sim/testsuite/cr16/muluw.cgs

diff --git a/sim/testsuite/sim/cr16/mulw.cgs b/sim/testsuite/cr16/mulw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/mulw.cgs
rename to sim/testsuite/cr16/mulw.cgs

diff --git a/sim/testsuite/sim/cr16/nop.cgs b/sim/testsuite/cr16/nop.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/nop.cgs
rename to sim/testsuite/cr16/nop.cgs

diff --git a/sim/testsuite/sim/cr16/orb.cgs b/sim/testsuite/cr16/orb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/orb.cgs
rename to sim/testsuite/cr16/orb.cgs

diff --git a/sim/testsuite/sim/cr16/ord.cgs b/sim/testsuite/cr16/ord.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/ord.cgs
rename to sim/testsuite/cr16/ord.cgs

diff --git a/sim/testsuite/sim/cr16/orw.cgs b/sim/testsuite/cr16/orw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/orw.cgs
rename to sim/testsuite/cr16/orw.cgs

diff --git a/sim/testsuite/sim/cr16/pop1.cgs b/sim/testsuite/cr16/pop1.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/pop1.cgs
rename to sim/testsuite/cr16/pop1.cgs

diff --git a/sim/testsuite/sim/cr16/pop2.cgs b/sim/testsuite/cr16/pop2.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/pop2.cgs
rename to sim/testsuite/cr16/pop2.cgs

diff --git a/sim/testsuite/sim/cr16/pop3.cgs b/sim/testsuite/cr16/pop3.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/pop3.cgs
rename to sim/testsuite/cr16/pop3.cgs

diff --git a/sim/testsuite/sim/cr16/popret1.cgs b/sim/testsuite/cr16/popret1.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/popret1.cgs
rename to sim/testsuite/cr16/popret1.cgs

diff --git a/sim/testsuite/sim/cr16/popret2.cgs b/sim/testsuite/cr16/popret2.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/popret2.cgs
rename to sim/testsuite/cr16/popret2.cgs

diff --git a/sim/testsuite/sim/cr16/popret3.cgs b/sim/testsuite/cr16/popret3.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/popret3.cgs
rename to sim/testsuite/cr16/popret3.cgs

diff --git a/sim/testsuite/sim/cr16/push1.cgs b/sim/testsuite/cr16/push1.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/push1.cgs
rename to sim/testsuite/cr16/push1.cgs

diff --git a/sim/testsuite/sim/cr16/push2.cgs b/sim/testsuite/cr16/push2.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/push2.cgs
rename to sim/testsuite/cr16/push2.cgs

diff --git a/sim/testsuite/sim/cr16/push3.cgs b/sim/testsuite/cr16/push3.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/push3.cgs
rename to sim/testsuite/cr16/push3.cgs

diff --git a/sim/testsuite/sim/cr16/sbitb.cgs b/sim/testsuite/cr16/sbitb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/sbitb.cgs
rename to sim/testsuite/cr16/sbitb.cgs

diff --git a/sim/testsuite/sim/cr16/sbitw.cgs b/sim/testsuite/cr16/sbitw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/sbitw.cgs
rename to sim/testsuite/cr16/sbitw.cgs

diff --git a/sim/testsuite/sim/cr16/scc.cgs b/sim/testsuite/cr16/scc.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/scc.cgs
rename to sim/testsuite/cr16/scc.cgs

diff --git a/sim/testsuite/sim/cr16/scs.cgs b/sim/testsuite/cr16/scs.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/scs.cgs
rename to sim/testsuite/cr16/scs.cgs

diff --git a/sim/testsuite/sim/cr16/seq.cgs b/sim/testsuite/cr16/seq.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/seq.cgs
rename to sim/testsuite/cr16/seq.cgs

diff --git a/sim/testsuite/sim/cr16/sfc.cgs b/sim/testsuite/cr16/sfc.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/sfc.cgs
rename to sim/testsuite/cr16/sfc.cgs

diff --git a/sim/testsuite/sim/cr16/sfs.cgs b/sim/testsuite/cr16/sfs.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/sfs.cgs
rename to sim/testsuite/cr16/sfs.cgs

diff --git a/sim/testsuite/sim/cr16/sge.cgs b/sim/testsuite/cr16/sge.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/sge.cgs
rename to sim/testsuite/cr16/sge.cgs

diff --git a/sim/testsuite/sim/cr16/sgt.cgs b/sim/testsuite/cr16/sgt.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/sgt.cgs
rename to sim/testsuite/cr16/sgt.cgs

diff --git a/sim/testsuite/sim/cr16/shi.cgs b/sim/testsuite/cr16/shi.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/shi.cgs
rename to sim/testsuite/cr16/shi.cgs

diff --git a/sim/testsuite/sim/cr16/shs.cgs b/sim/testsuite/cr16/shs.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/shs.cgs
rename to sim/testsuite/cr16/shs.cgs

diff --git a/sim/testsuite/sim/cr16/slo.cgs b/sim/testsuite/cr16/slo.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/slo.cgs
rename to sim/testsuite/cr16/slo.cgs

diff --git a/sim/testsuite/sim/cr16/sls.cgs b/sim/testsuite/cr16/sls.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/sls.cgs
rename to sim/testsuite/cr16/sls.cgs

diff --git a/sim/testsuite/sim/cr16/slt.cgs b/sim/testsuite/cr16/slt.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/slt.cgs
rename to sim/testsuite/cr16/slt.cgs

diff --git a/sim/testsuite/sim/cr16/sne.cgs b/sim/testsuite/cr16/sne.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/sne.cgs
rename to sim/testsuite/cr16/sne.cgs

diff --git a/sim/testsuite/sim/cr16/storb.cgs b/sim/testsuite/cr16/storb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/storb.cgs
rename to sim/testsuite/cr16/storb.cgs

diff --git a/sim/testsuite/sim/cr16/stord.cgs b/sim/testsuite/cr16/stord.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/stord.cgs
rename to sim/testsuite/cr16/stord.cgs

diff --git a/sim/testsuite/sim/cr16/storw.cgs b/sim/testsuite/cr16/storw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/storw.cgs
rename to sim/testsuite/cr16/storw.cgs

diff --git a/sim/testsuite/sim/cr16/subb.cgs b/sim/testsuite/cr16/subb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/subb.cgs
rename to sim/testsuite/cr16/subb.cgs

diff --git a/sim/testsuite/sim/cr16/subd.cgs b/sim/testsuite/cr16/subd.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/subd.cgs
rename to sim/testsuite/cr16/subd.cgs

diff --git a/sim/testsuite/sim/cr16/subi.cgs b/sim/testsuite/cr16/subi.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/subi.cgs
rename to sim/testsuite/cr16/subi.cgs

diff --git a/sim/testsuite/sim/cr16/subw.cgs b/sim/testsuite/cr16/subw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/subw.cgs
rename to sim/testsuite/cr16/subw.cgs

diff --git a/sim/testsuite/sim/cr16/tbit.cgs b/sim/testsuite/cr16/tbit.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/tbit.cgs
rename to sim/testsuite/cr16/tbit.cgs

diff --git a/sim/testsuite/sim/cr16/tbitb.cgs b/sim/testsuite/cr16/tbitb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/tbitb.cgs
rename to sim/testsuite/cr16/tbitb.cgs

diff --git a/sim/testsuite/sim/cr16/tbitw.cgs b/sim/testsuite/cr16/tbitw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/tbitw.cgs
rename to sim/testsuite/cr16/tbitw.cgs

diff --git a/sim/testsuite/sim/cr16/testutils.inc b/sim/testsuite/cr16/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/cr16/testutils.inc
rename to sim/testsuite/cr16/testutils.inc

diff --git a/sim/testsuite/sim/cr16/uread16.ms b/sim/testsuite/cr16/uread16.ms
similarity index 100%
rename from sim/testsuite/sim/cr16/uread16.ms
rename to sim/testsuite/cr16/uread16.ms

diff --git a/sim/testsuite/sim/cr16/uread32.ms b/sim/testsuite/cr16/uread32.ms
similarity index 100%
rename from sim/testsuite/sim/cr16/uread32.ms
rename to sim/testsuite/cr16/uread32.ms

diff --git a/sim/testsuite/sim/cr16/xorb.cgs b/sim/testsuite/cr16/xorb.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/xorb.cgs
rename to sim/testsuite/cr16/xorb.cgs

diff --git a/sim/testsuite/sim/cr16/xord.cgs b/sim/testsuite/cr16/xord.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/xord.cgs
rename to sim/testsuite/cr16/xord.cgs

diff --git a/sim/testsuite/sim/cr16/xorw.cgs b/sim/testsuite/cr16/xorw.cgs
similarity index 100%
rename from sim/testsuite/sim/cr16/xorw.cgs
rename to sim/testsuite/cr16/xorw.cgs

diff --git a/sim/testsuite/sim/cris/ChangeLog b/sim/testsuite/cris/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/cris/ChangeLog
rename to sim/testsuite/cris/ChangeLog

diff --git a/sim/testsuite/sim/cris/asm/abs.ms b/sim/testsuite/cris/asm/abs.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/abs.ms
rename to sim/testsuite/cris/asm/abs.ms

diff --git a/sim/testsuite/sim/cris/asm/addc.ms b/sim/testsuite/cris/asm/addc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addc.ms
rename to sim/testsuite/cris/asm/addc.ms

diff --git a/sim/testsuite/sim/cris/asm/addcpc.ms b/sim/testsuite/cris/asm/addcpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addcpc.ms
rename to sim/testsuite/cris/asm/addcpc.ms

diff --git a/sim/testsuite/sim/cris/asm/addcv32c.ms b/sim/testsuite/cris/asm/addcv32c.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addcv32c.ms
rename to sim/testsuite/cris/asm/addcv32c.ms

diff --git a/sim/testsuite/sim/cris/asm/addcv32m.ms b/sim/testsuite/cris/asm/addcv32m.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addcv32m.ms
rename to sim/testsuite/cris/asm/addcv32m.ms

diff --git a/sim/testsuite/sim/cris/asm/addcv32r.ms b/sim/testsuite/cris/asm/addcv32r.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addcv32r.ms
rename to sim/testsuite/cris/asm/addcv32r.ms

diff --git a/sim/testsuite/sim/cris/asm/addi.ms b/sim/testsuite/cris/asm/addi.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addi.ms
rename to sim/testsuite/cris/asm/addi.ms

diff --git a/sim/testsuite/sim/cris/asm/addiv32.ms b/sim/testsuite/cris/asm/addiv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addiv32.ms
rename to sim/testsuite/cris/asm/addiv32.ms

diff --git a/sim/testsuite/sim/cris/asm/addm.ms b/sim/testsuite/cris/asm/addm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addm.ms
rename to sim/testsuite/cris/asm/addm.ms

diff --git a/sim/testsuite/sim/cris/asm/addoc.ms b/sim/testsuite/cris/asm/addoc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addoc.ms
rename to sim/testsuite/cris/asm/addoc.ms

diff --git a/sim/testsuite/sim/cris/asm/addom.ms b/sim/testsuite/cris/asm/addom.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addom.ms
rename to sim/testsuite/cris/asm/addom.ms

diff --git a/sim/testsuite/sim/cris/asm/addoq.ms b/sim/testsuite/cris/asm/addoq.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addoq.ms
rename to sim/testsuite/cris/asm/addoq.ms

diff --git a/sim/testsuite/sim/cris/asm/addq.ms b/sim/testsuite/cris/asm/addq.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addq.ms
rename to sim/testsuite/cris/asm/addq.ms

diff --git a/sim/testsuite/sim/cris/asm/addqpc.ms b/sim/testsuite/cris/asm/addqpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addqpc.ms
rename to sim/testsuite/cris/asm/addqpc.ms

diff --git a/sim/testsuite/sim/cris/asm/addr.ms b/sim/testsuite/cris/asm/addr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addr.ms
rename to sim/testsuite/cris/asm/addr.ms

diff --git a/sim/testsuite/sim/cris/asm/addswpc.ms b/sim/testsuite/cris/asm/addswpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addswpc.ms
rename to sim/testsuite/cris/asm/addswpc.ms

diff --git a/sim/testsuite/sim/cris/asm/addxc.ms b/sim/testsuite/cris/asm/addxc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addxc.ms
rename to sim/testsuite/cris/asm/addxc.ms

diff --git a/sim/testsuite/sim/cris/asm/addxm.ms b/sim/testsuite/cris/asm/addxm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addxm.ms
rename to sim/testsuite/cris/asm/addxm.ms

diff --git a/sim/testsuite/sim/cris/asm/addxr.ms b/sim/testsuite/cris/asm/addxr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/addxr.ms
rename to sim/testsuite/cris/asm/addxr.ms

diff --git a/sim/testsuite/sim/cris/asm/andc.ms b/sim/testsuite/cris/asm/andc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/andc.ms
rename to sim/testsuite/cris/asm/andc.ms

diff --git a/sim/testsuite/sim/cris/asm/andm.ms b/sim/testsuite/cris/asm/andm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/andm.ms
rename to sim/testsuite/cris/asm/andm.ms

diff --git a/sim/testsuite/sim/cris/asm/andq.ms b/sim/testsuite/cris/asm/andq.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/andq.ms
rename to sim/testsuite/cris/asm/andq.ms

diff --git a/sim/testsuite/sim/cris/asm/andr.ms b/sim/testsuite/cris/asm/andr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/andr.ms
rename to sim/testsuite/cris/asm/andr.ms

diff --git a/sim/testsuite/sim/cris/asm/asm.exp b/sim/testsuite/cris/asm/asm.exp
similarity index 100%
rename from sim/testsuite/sim/cris/asm/asm.exp
rename to sim/testsuite/cris/asm/asm.exp

diff --git a/sim/testsuite/sim/cris/asm/asr.ms b/sim/testsuite/cris/asm/asr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/asr.ms
rename to sim/testsuite/cris/asm/asr.ms

diff --git a/sim/testsuite/sim/cris/asm/ba.ms b/sim/testsuite/cris/asm/ba.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/ba.ms
rename to sim/testsuite/cris/asm/ba.ms

diff --git a/sim/testsuite/sim/cris/asm/badarch1.ms b/sim/testsuite/cris/asm/badarch1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/badarch1.ms
rename to sim/testsuite/cris/asm/badarch1.ms

diff --git a/sim/testsuite/sim/cris/asm/bare1.ms b/sim/testsuite/cris/asm/bare1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/bare1.ms
rename to sim/testsuite/cris/asm/bare1.ms

diff --git a/sim/testsuite/sim/cris/asm/bare2.ms b/sim/testsuite/cris/asm/bare2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/bare2.ms
rename to sim/testsuite/cris/asm/bare2.ms

diff --git a/sim/testsuite/sim/cris/asm/bare3.ms b/sim/testsuite/cris/asm/bare3.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/bare3.ms
rename to sim/testsuite/cris/asm/bare3.ms

diff --git a/sim/testsuite/sim/cris/asm/bas.ms b/sim/testsuite/cris/asm/bas.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/bas.ms
rename to sim/testsuite/cris/asm/bas.ms

diff --git a/sim/testsuite/sim/cris/asm/bccb.ms b/sim/testsuite/cris/asm/bccb.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/bccb.ms
rename to sim/testsuite/cris/asm/bccb.ms

diff --git a/sim/testsuite/sim/cris/asm/bdapc.ms b/sim/testsuite/cris/asm/bdapc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/bdapc.ms
rename to sim/testsuite/cris/asm/bdapc.ms

diff --git a/sim/testsuite/sim/cris/asm/bdapm.ms b/sim/testsuite/cris/asm/bdapm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/bdapm.ms
rename to sim/testsuite/cris/asm/bdapm.ms

diff --git a/sim/testsuite/sim/cris/asm/bdapq.ms b/sim/testsuite/cris/asm/bdapq.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/bdapq.ms
rename to sim/testsuite/cris/asm/bdapq.ms

diff --git a/sim/testsuite/sim/cris/asm/bdapqpc.ms b/sim/testsuite/cris/asm/bdapqpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/bdapqpc.ms
rename to sim/testsuite/cris/asm/bdapqpc.ms

diff --git a/sim/testsuite/sim/cris/asm/biap.ms b/sim/testsuite/cris/asm/biap.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/biap.ms
rename to sim/testsuite/cris/asm/biap.ms

diff --git a/sim/testsuite/sim/cris/asm/boundc.ms b/sim/testsuite/cris/asm/boundc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/boundc.ms
rename to sim/testsuite/cris/asm/boundc.ms

diff --git a/sim/testsuite/sim/cris/asm/boundm.ms b/sim/testsuite/cris/asm/boundm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/boundm.ms
rename to sim/testsuite/cris/asm/boundm.ms

diff --git a/sim/testsuite/sim/cris/asm/boundmv32.ms b/sim/testsuite/cris/asm/boundmv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/boundmv32.ms
rename to sim/testsuite/cris/asm/boundmv32.ms

diff --git a/sim/testsuite/sim/cris/asm/boundr.ms b/sim/testsuite/cris/asm/boundr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/boundr.ms
rename to sim/testsuite/cris/asm/boundr.ms

diff --git a/sim/testsuite/sim/cris/asm/break.ms b/sim/testsuite/cris/asm/break.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/break.ms
rename to sim/testsuite/cris/asm/break.ms

diff --git a/sim/testsuite/sim/cris/asm/btst.ms b/sim/testsuite/cris/asm/btst.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/btst.ms
rename to sim/testsuite/cris/asm/btst.ms

diff --git a/sim/testsuite/sim/cris/asm/ccr-v10.ms b/sim/testsuite/cris/asm/ccr-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/ccr-v10.ms
rename to sim/testsuite/cris/asm/ccr-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/ccs-v32.ms b/sim/testsuite/cris/asm/ccs-v32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/ccs-v32.ms
rename to sim/testsuite/cris/asm/ccs-v32.ms

diff --git a/sim/testsuite/sim/cris/asm/clearfv10.ms b/sim/testsuite/cris/asm/clearfv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/clearfv10.ms
rename to sim/testsuite/cris/asm/clearfv10.ms

diff --git a/sim/testsuite/sim/cris/asm/clearfv32.ms b/sim/testsuite/cris/asm/clearfv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/clearfv32.ms
rename to sim/testsuite/cris/asm/clearfv32.ms

diff --git a/sim/testsuite/sim/cris/asm/clrjmp1.ms b/sim/testsuite/cris/asm/clrjmp1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/clrjmp1.ms
rename to sim/testsuite/cris/asm/clrjmp1.ms

diff --git a/sim/testsuite/sim/cris/asm/cmpc.ms b/sim/testsuite/cris/asm/cmpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/cmpc.ms
rename to sim/testsuite/cris/asm/cmpc.ms

diff --git a/sim/testsuite/sim/cris/asm/cmpm.ms b/sim/testsuite/cris/asm/cmpm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/cmpm.ms
rename to sim/testsuite/cris/asm/cmpm.ms

diff --git a/sim/testsuite/sim/cris/asm/cmpq.ms b/sim/testsuite/cris/asm/cmpq.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/cmpq.ms
rename to sim/testsuite/cris/asm/cmpq.ms

diff --git a/sim/testsuite/sim/cris/asm/cmpr.ms b/sim/testsuite/cris/asm/cmpr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/cmpr.ms
rename to sim/testsuite/cris/asm/cmpr.ms

diff --git a/sim/testsuite/sim/cris/asm/cmpxc.ms b/sim/testsuite/cris/asm/cmpxc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/cmpxc.ms
rename to sim/testsuite/cris/asm/cmpxc.ms

diff --git a/sim/testsuite/sim/cris/asm/cmpxm.ms b/sim/testsuite/cris/asm/cmpxm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/cmpxm.ms
rename to sim/testsuite/cris/asm/cmpxm.ms

diff --git a/sim/testsuite/sim/cris/asm/dflags.ms b/sim/testsuite/cris/asm/dflags.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/dflags.ms
rename to sim/testsuite/cris/asm/dflags.ms

diff --git a/sim/testsuite/sim/cris/asm/dip.ms b/sim/testsuite/cris/asm/dip.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/dip.ms
rename to sim/testsuite/cris/asm/dip.ms

diff --git a/sim/testsuite/sim/cris/asm/dstep.ms b/sim/testsuite/cris/asm/dstep.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/dstep.ms
rename to sim/testsuite/cris/asm/dstep.ms

diff --git a/sim/testsuite/sim/cris/asm/fidxd.ms b/sim/testsuite/cris/asm/fidxd.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/fidxd.ms
rename to sim/testsuite/cris/asm/fidxd.ms

diff --git a/sim/testsuite/sim/cris/asm/fidxi.ms b/sim/testsuite/cris/asm/fidxi.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/fidxi.ms
rename to sim/testsuite/cris/asm/fidxi.ms

diff --git a/sim/testsuite/sim/cris/asm/ftagd.ms b/sim/testsuite/cris/asm/ftagd.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/ftagd.ms
rename to sim/testsuite/cris/asm/ftagd.ms

diff --git a/sim/testsuite/sim/cris/asm/ftagi.ms b/sim/testsuite/cris/asm/ftagi.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/ftagi.ms
rename to sim/testsuite/cris/asm/ftagi.ms

diff --git a/sim/testsuite/sim/cris/asm/halt.ms b/sim/testsuite/cris/asm/halt.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/halt.ms
rename to sim/testsuite/cris/asm/halt.ms

diff --git a/sim/testsuite/sim/cris/asm/io1.ms b/sim/testsuite/cris/asm/io1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/io1.ms
rename to sim/testsuite/cris/asm/io1.ms

diff --git a/sim/testsuite/sim/cris/asm/io2.ms b/sim/testsuite/cris/asm/io2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/io2.ms
rename to sim/testsuite/cris/asm/io2.ms

diff --git a/sim/testsuite/sim/cris/asm/io3.ms b/sim/testsuite/cris/asm/io3.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/io3.ms
rename to sim/testsuite/cris/asm/io3.ms

diff --git a/sim/testsuite/sim/cris/asm/io4.ms b/sim/testsuite/cris/asm/io4.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/io4.ms
rename to sim/testsuite/cris/asm/io4.ms

diff --git a/sim/testsuite/sim/cris/asm/io5.ms b/sim/testsuite/cris/asm/io5.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/io5.ms
rename to sim/testsuite/cris/asm/io5.ms

diff --git a/sim/testsuite/sim/cris/asm/io6.ms b/sim/testsuite/cris/asm/io6.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/io6.ms
rename to sim/testsuite/cris/asm/io6.ms

diff --git a/sim/testsuite/sim/cris/asm/io7.ms b/sim/testsuite/cris/asm/io7.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/io7.ms
rename to sim/testsuite/cris/asm/io7.ms

diff --git a/sim/testsuite/sim/cris/asm/io8.ms b/sim/testsuite/cris/asm/io8.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/io8.ms
rename to sim/testsuite/cris/asm/io8.ms

diff --git a/sim/testsuite/sim/cris/asm/io9.ms b/sim/testsuite/cris/asm/io9.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/io9.ms
rename to sim/testsuite/cris/asm/io9.ms

diff --git a/sim/testsuite/sim/cris/asm/jsr.ms b/sim/testsuite/cris/asm/jsr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/jsr.ms
rename to sim/testsuite/cris/asm/jsr.ms

diff --git a/sim/testsuite/sim/cris/asm/jsrmv10.ms b/sim/testsuite/cris/asm/jsrmv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/jsrmv10.ms
rename to sim/testsuite/cris/asm/jsrmv10.ms

diff --git a/sim/testsuite/sim/cris/asm/jumpmp.ms b/sim/testsuite/cris/asm/jumpmp.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/jumpmp.ms
rename to sim/testsuite/cris/asm/jumpmp.ms

diff --git a/sim/testsuite/sim/cris/asm/jumppv32.ms b/sim/testsuite/cris/asm/jumppv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/jumppv32.ms
rename to sim/testsuite/cris/asm/jumppv32.ms

diff --git a/sim/testsuite/sim/cris/asm/lapc.ms b/sim/testsuite/cris/asm/lapc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/lapc.ms
rename to sim/testsuite/cris/asm/lapc.ms

diff --git a/sim/testsuite/sim/cris/asm/lsl.ms b/sim/testsuite/cris/asm/lsl.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/lsl.ms
rename to sim/testsuite/cris/asm/lsl.ms

diff --git a/sim/testsuite/sim/cris/asm/lsr.ms b/sim/testsuite/cris/asm/lsr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/lsr.ms
rename to sim/testsuite/cris/asm/lsr.ms

diff --git a/sim/testsuite/sim/cris/asm/lz.ms b/sim/testsuite/cris/asm/lz.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/lz.ms
rename to sim/testsuite/cris/asm/lz.ms

diff --git a/sim/testsuite/sim/cris/asm/mcp.ms b/sim/testsuite/cris/asm/mcp.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/mcp.ms
rename to sim/testsuite/cris/asm/mcp.ms

diff --git a/sim/testsuite/sim/cris/asm/movdelsr1.ms b/sim/testsuite/cris/asm/movdelsr1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movdelsr1.ms
rename to sim/testsuite/cris/asm/movdelsr1.ms

diff --git a/sim/testsuite/sim/cris/asm/movecpc.ms b/sim/testsuite/cris/asm/movecpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movecpc.ms
rename to sim/testsuite/cris/asm/movecpc.ms

diff --git a/sim/testsuite/sim/cris/asm/movecr.ms b/sim/testsuite/cris/asm/movecr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movecr.ms
rename to sim/testsuite/cris/asm/movecr.ms

diff --git a/sim/testsuite/sim/cris/asm/movecrt10.ms b/sim/testsuite/cris/asm/movecrt10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movecrt10.ms
rename to sim/testsuite/cris/asm/movecrt10.ms

diff --git a/sim/testsuite/sim/cris/asm/movecrt32.ms b/sim/testsuite/cris/asm/movecrt32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movecrt32.ms
rename to sim/testsuite/cris/asm/movecrt32.ms

diff --git a/sim/testsuite/sim/cris/asm/movect10.ms b/sim/testsuite/cris/asm/movect10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movect10.ms
rename to sim/testsuite/cris/asm/movect10.ms

diff --git a/sim/testsuite/sim/cris/asm/movei.ms b/sim/testsuite/cris/asm/movei.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movei.ms
rename to sim/testsuite/cris/asm/movei.ms

diff --git a/sim/testsuite/sim/cris/asm/movempc.ms b/sim/testsuite/cris/asm/movempc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movempc.ms
rename to sim/testsuite/cris/asm/movempc.ms

diff --git a/sim/testsuite/sim/cris/asm/movemr.ms b/sim/testsuite/cris/asm/movemr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movemr.ms
rename to sim/testsuite/cris/asm/movemr.ms

diff --git a/sim/testsuite/sim/cris/asm/movemrv10.ms b/sim/testsuite/cris/asm/movemrv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movemrv10.ms
rename to sim/testsuite/cris/asm/movemrv10.ms

diff --git a/sim/testsuite/sim/cris/asm/movemrv32.ms b/sim/testsuite/cris/asm/movemrv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movemrv32.ms
rename to sim/testsuite/cris/asm/movemrv32.ms

diff --git a/sim/testsuite/sim/cris/asm/movepcb.ms b/sim/testsuite/cris/asm/movepcb.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movepcb.ms
rename to sim/testsuite/cris/asm/movepcb.ms

diff --git a/sim/testsuite/sim/cris/asm/movepcd.ms b/sim/testsuite/cris/asm/movepcd.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movepcd.ms
rename to sim/testsuite/cris/asm/movepcd.ms

diff --git a/sim/testsuite/sim/cris/asm/movepcw.ms b/sim/testsuite/cris/asm/movepcw.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movepcw.ms
rename to sim/testsuite/cris/asm/movepcw.ms

diff --git a/sim/testsuite/sim/cris/asm/moveq.ms b/sim/testsuite/cris/asm/moveq.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/moveq.ms
rename to sim/testsuite/cris/asm/moveq.ms

diff --git a/sim/testsuite/sim/cris/asm/moveqpc.ms b/sim/testsuite/cris/asm/moveqpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/moveqpc.ms
rename to sim/testsuite/cris/asm/moveqpc.ms

diff --git a/sim/testsuite/sim/cris/asm/mover.ms b/sim/testsuite/cris/asm/mover.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/mover.ms
rename to sim/testsuite/cris/asm/mover.ms

diff --git a/sim/testsuite/sim/cris/asm/moverbpc.ms b/sim/testsuite/cris/asm/moverbpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/moverbpc.ms
rename to sim/testsuite/cris/asm/moverbpc.ms

diff --git a/sim/testsuite/sim/cris/asm/moverdpc.ms b/sim/testsuite/cris/asm/moverdpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/moverdpc.ms
rename to sim/testsuite/cris/asm/moverdpc.ms

diff --git a/sim/testsuite/sim/cris/asm/moverm.ms b/sim/testsuite/cris/asm/moverm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/moverm.ms
rename to sim/testsuite/cris/asm/moverm.ms

diff --git a/sim/testsuite/sim/cris/asm/moverpcb.ms b/sim/testsuite/cris/asm/moverpcb.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/moverpcb.ms
rename to sim/testsuite/cris/asm/moverpcb.ms

diff --git a/sim/testsuite/sim/cris/asm/moverpcd.ms b/sim/testsuite/cris/asm/moverpcd.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/moverpcd.ms
rename to sim/testsuite/cris/asm/moverpcd.ms

diff --git a/sim/testsuite/sim/cris/asm/moverpcw.ms b/sim/testsuite/cris/asm/moverpcw.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/moverpcw.ms
rename to sim/testsuite/cris/asm/moverpcw.ms

diff --git a/sim/testsuite/sim/cris/asm/moverwpc.ms b/sim/testsuite/cris/asm/moverwpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/moverwpc.ms
rename to sim/testsuite/cris/asm/moverwpc.ms

diff --git a/sim/testsuite/sim/cris/asm/movesmp.ms b/sim/testsuite/cris/asm/movesmp.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movesmp.ms
rename to sim/testsuite/cris/asm/movesmp.ms

diff --git a/sim/testsuite/sim/cris/asm/movmp.ms b/sim/testsuite/cris/asm/movmp.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movmp.ms
rename to sim/testsuite/cris/asm/movmp.ms

diff --git a/sim/testsuite/sim/cris/asm/movmp8.ms b/sim/testsuite/cris/asm/movmp8.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movmp8.ms
rename to sim/testsuite/cris/asm/movmp8.ms

diff --git a/sim/testsuite/sim/cris/asm/movpmv10.ms b/sim/testsuite/cris/asm/movpmv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movpmv10.ms
rename to sim/testsuite/cris/asm/movpmv10.ms

diff --git a/sim/testsuite/sim/cris/asm/movpmv32.ms b/sim/testsuite/cris/asm/movpmv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movpmv32.ms
rename to sim/testsuite/cris/asm/movpmv32.ms

diff --git a/sim/testsuite/sim/cris/asm/movppc.ms b/sim/testsuite/cris/asm/movppc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movppc.ms
rename to sim/testsuite/cris/asm/movppc.ms

diff --git a/sim/testsuite/sim/cris/asm/movpr.ms b/sim/testsuite/cris/asm/movpr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movpr.ms
rename to sim/testsuite/cris/asm/movpr.ms

diff --git a/sim/testsuite/sim/cris/asm/movprv10.ms b/sim/testsuite/cris/asm/movprv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movprv10.ms
rename to sim/testsuite/cris/asm/movprv10.ms

diff --git a/sim/testsuite/sim/cris/asm/movprv32.ms b/sim/testsuite/cris/asm/movprv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movprv32.ms
rename to sim/testsuite/cris/asm/movprv32.ms

diff --git a/sim/testsuite/sim/cris/asm/movrss.ms b/sim/testsuite/cris/asm/movrss.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movrss.ms
rename to sim/testsuite/cris/asm/movrss.ms

diff --git a/sim/testsuite/sim/cris/asm/movscpc.ms b/sim/testsuite/cris/asm/movscpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movscpc.ms
rename to sim/testsuite/cris/asm/movscpc.ms

diff --git a/sim/testsuite/sim/cris/asm/movscr.ms b/sim/testsuite/cris/asm/movscr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movscr.ms
rename to sim/testsuite/cris/asm/movscr.ms

diff --git a/sim/testsuite/sim/cris/asm/movsm.ms b/sim/testsuite/cris/asm/movsm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movsm.ms
rename to sim/testsuite/cris/asm/movsm.ms

diff --git a/sim/testsuite/sim/cris/asm/movsmpc.ms b/sim/testsuite/cris/asm/movsmpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movsmpc.ms
rename to sim/testsuite/cris/asm/movsmpc.ms

diff --git a/sim/testsuite/sim/cris/asm/movsr.ms b/sim/testsuite/cris/asm/movsr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movsr.ms
rename to sim/testsuite/cris/asm/movsr.ms

diff --git a/sim/testsuite/sim/cris/asm/movsrpc.ms b/sim/testsuite/cris/asm/movsrpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movsrpc.ms
rename to sim/testsuite/cris/asm/movsrpc.ms

diff --git a/sim/testsuite/sim/cris/asm/movssr.ms b/sim/testsuite/cris/asm/movssr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movssr.ms
rename to sim/testsuite/cris/asm/movssr.ms

diff --git a/sim/testsuite/sim/cris/asm/movucpc.ms b/sim/testsuite/cris/asm/movucpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movucpc.ms
rename to sim/testsuite/cris/asm/movucpc.ms

diff --git a/sim/testsuite/sim/cris/asm/movucr.ms b/sim/testsuite/cris/asm/movucr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movucr.ms
rename to sim/testsuite/cris/asm/movucr.ms

diff --git a/sim/testsuite/sim/cris/asm/movum.ms b/sim/testsuite/cris/asm/movum.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movum.ms
rename to sim/testsuite/cris/asm/movum.ms

diff --git a/sim/testsuite/sim/cris/asm/movumpc.ms b/sim/testsuite/cris/asm/movumpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movumpc.ms
rename to sim/testsuite/cris/asm/movumpc.ms

diff --git a/sim/testsuite/sim/cris/asm/movur.ms b/sim/testsuite/cris/asm/movur.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movur.ms
rename to sim/testsuite/cris/asm/movur.ms

diff --git a/sim/testsuite/sim/cris/asm/movurpc.ms b/sim/testsuite/cris/asm/movurpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/movurpc.ms
rename to sim/testsuite/cris/asm/movurpc.ms

diff --git a/sim/testsuite/sim/cris/asm/mstep.ms b/sim/testsuite/cris/asm/mstep.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/mstep.ms
rename to sim/testsuite/cris/asm/mstep.ms

diff --git a/sim/testsuite/sim/cris/asm/msteppc1.ms b/sim/testsuite/cris/asm/msteppc1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/msteppc1.ms
rename to sim/testsuite/cris/asm/msteppc1.ms

diff --git a/sim/testsuite/sim/cris/asm/msteppc2.ms b/sim/testsuite/cris/asm/msteppc2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/msteppc2.ms
rename to sim/testsuite/cris/asm/msteppc2.ms

diff --git a/sim/testsuite/sim/cris/asm/msteppc3.ms b/sim/testsuite/cris/asm/msteppc3.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/msteppc3.ms
rename to sim/testsuite/cris/asm/msteppc3.ms

diff --git a/sim/testsuite/sim/cris/asm/mulv10.ms b/sim/testsuite/cris/asm/mulv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/mulv10.ms
rename to sim/testsuite/cris/asm/mulv10.ms

diff --git a/sim/testsuite/sim/cris/asm/mulv32.ms b/sim/testsuite/cris/asm/mulv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/mulv32.ms
rename to sim/testsuite/cris/asm/mulv32.ms

diff --git a/sim/testsuite/sim/cris/asm/mulx.ms b/sim/testsuite/cris/asm/mulx.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/mulx.ms
rename to sim/testsuite/cris/asm/mulx.ms

diff --git a/sim/testsuite/sim/cris/asm/neg.ms b/sim/testsuite/cris/asm/neg.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/neg.ms
rename to sim/testsuite/cris/asm/neg.ms

diff --git a/sim/testsuite/sim/cris/asm/nonvcv32.ms b/sim/testsuite/cris/asm/nonvcv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/nonvcv32.ms
rename to sim/testsuite/cris/asm/nonvcv32.ms

diff --git a/sim/testsuite/sim/cris/asm/nopv10t.ms b/sim/testsuite/cris/asm/nopv10t.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/nopv10t.ms
rename to sim/testsuite/cris/asm/nopv10t.ms

diff --git a/sim/testsuite/sim/cris/asm/nopv32t.ms b/sim/testsuite/cris/asm/nopv32t.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/nopv32t.ms
rename to sim/testsuite/cris/asm/nopv32t.ms

diff --git a/sim/testsuite/sim/cris/asm/nopv32t2.ms b/sim/testsuite/cris/asm/nopv32t2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/nopv32t2.ms
rename to sim/testsuite/cris/asm/nopv32t2.ms

diff --git a/sim/testsuite/sim/cris/asm/nopv32t3.ms b/sim/testsuite/cris/asm/nopv32t3.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/nopv32t3.ms
rename to sim/testsuite/cris/asm/nopv32t3.ms

diff --git a/sim/testsuite/sim/cris/asm/nopv32t4.ms b/sim/testsuite/cris/asm/nopv32t4.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/nopv32t4.ms
rename to sim/testsuite/cris/asm/nopv32t4.ms

diff --git a/sim/testsuite/sim/cris/asm/not.ms b/sim/testsuite/cris/asm/not.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/not.ms
rename to sim/testsuite/cris/asm/not.ms

diff --git a/sim/testsuite/sim/cris/asm/op3.ms b/sim/testsuite/cris/asm/op3.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/op3.ms
rename to sim/testsuite/cris/asm/op3.ms

diff --git a/sim/testsuite/sim/cris/asm/opterr1.ms b/sim/testsuite/cris/asm/opterr1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/opterr1.ms
rename to sim/testsuite/cris/asm/opterr1.ms

diff --git a/sim/testsuite/sim/cris/asm/opterr2.ms b/sim/testsuite/cris/asm/opterr2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/opterr2.ms
rename to sim/testsuite/cris/asm/opterr2.ms

diff --git a/sim/testsuite/sim/cris/asm/opterr3.ms b/sim/testsuite/cris/asm/opterr3.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/opterr3.ms
rename to sim/testsuite/cris/asm/opterr3.ms

diff --git a/sim/testsuite/sim/cris/asm/opterr4.ms b/sim/testsuite/cris/asm/opterr4.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/opterr4.ms
rename to sim/testsuite/cris/asm/opterr4.ms

diff --git a/sim/testsuite/sim/cris/asm/opterr5.ms b/sim/testsuite/cris/asm/opterr5.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/opterr5.ms
rename to sim/testsuite/cris/asm/opterr5.ms

diff --git a/sim/testsuite/sim/cris/asm/option1.ms b/sim/testsuite/cris/asm/option1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/option1.ms
rename to sim/testsuite/cris/asm/option1.ms

diff --git a/sim/testsuite/sim/cris/asm/option2.ms b/sim/testsuite/cris/asm/option2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/option2.ms
rename to sim/testsuite/cris/asm/option2.ms

diff --git a/sim/testsuite/sim/cris/asm/option3.ms b/sim/testsuite/cris/asm/option3.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/option3.ms
rename to sim/testsuite/cris/asm/option3.ms

diff --git a/sim/testsuite/sim/cris/asm/option4.ms b/sim/testsuite/cris/asm/option4.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/option4.ms
rename to sim/testsuite/cris/asm/option4.ms

diff --git a/sim/testsuite/sim/cris/asm/orc.ms b/sim/testsuite/cris/asm/orc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/orc.ms
rename to sim/testsuite/cris/asm/orc.ms

diff --git a/sim/testsuite/sim/cris/asm/orm.ms b/sim/testsuite/cris/asm/orm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/orm.ms
rename to sim/testsuite/cris/asm/orm.ms

diff --git a/sim/testsuite/sim/cris/asm/orq.ms b/sim/testsuite/cris/asm/orq.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/orq.ms
rename to sim/testsuite/cris/asm/orq.ms

diff --git a/sim/testsuite/sim/cris/asm/orr.ms b/sim/testsuite/cris/asm/orr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/orr.ms
rename to sim/testsuite/cris/asm/orr.ms

diff --git a/sim/testsuite/sim/cris/asm/pcplus.ms b/sim/testsuite/cris/asm/pcplus.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/pcplus.ms
rename to sim/testsuite/cris/asm/pcplus.ms

diff --git a/sim/testsuite/sim/cris/asm/pid1.ms b/sim/testsuite/cris/asm/pid1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/pid1.ms
rename to sim/testsuite/cris/asm/pid1.ms

diff --git a/sim/testsuite/sim/cris/asm/raw1.ms b/sim/testsuite/cris/asm/raw1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw1.ms
rename to sim/testsuite/cris/asm/raw1.ms

diff --git a/sim/testsuite/sim/cris/asm/raw10.ms b/sim/testsuite/cris/asm/raw10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw10.ms
rename to sim/testsuite/cris/asm/raw10.ms

diff --git a/sim/testsuite/sim/cris/asm/raw11.ms b/sim/testsuite/cris/asm/raw11.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw11.ms
rename to sim/testsuite/cris/asm/raw11.ms

diff --git a/sim/testsuite/sim/cris/asm/raw12.ms b/sim/testsuite/cris/asm/raw12.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw12.ms
rename to sim/testsuite/cris/asm/raw12.ms

diff --git a/sim/testsuite/sim/cris/asm/raw13.ms b/sim/testsuite/cris/asm/raw13.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw13.ms
rename to sim/testsuite/cris/asm/raw13.ms

diff --git a/sim/testsuite/sim/cris/asm/raw14.ms b/sim/testsuite/cris/asm/raw14.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw14.ms
rename to sim/testsuite/cris/asm/raw14.ms

diff --git a/sim/testsuite/sim/cris/asm/raw15.ms b/sim/testsuite/cris/asm/raw15.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw15.ms
rename to sim/testsuite/cris/asm/raw15.ms

diff --git a/sim/testsuite/sim/cris/asm/raw16.ms b/sim/testsuite/cris/asm/raw16.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw16.ms
rename to sim/testsuite/cris/asm/raw16.ms

diff --git a/sim/testsuite/sim/cris/asm/raw17.ms b/sim/testsuite/cris/asm/raw17.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw17.ms
rename to sim/testsuite/cris/asm/raw17.ms

diff --git a/sim/testsuite/sim/cris/asm/raw2.ms b/sim/testsuite/cris/asm/raw2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw2.ms
rename to sim/testsuite/cris/asm/raw2.ms

diff --git a/sim/testsuite/sim/cris/asm/raw3.ms b/sim/testsuite/cris/asm/raw3.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw3.ms
rename to sim/testsuite/cris/asm/raw3.ms

diff --git a/sim/testsuite/sim/cris/asm/raw4.ms b/sim/testsuite/cris/asm/raw4.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw4.ms
rename to sim/testsuite/cris/asm/raw4.ms

diff --git a/sim/testsuite/sim/cris/asm/raw5.ms b/sim/testsuite/cris/asm/raw5.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw5.ms
rename to sim/testsuite/cris/asm/raw5.ms

diff --git a/sim/testsuite/sim/cris/asm/raw6.ms b/sim/testsuite/cris/asm/raw6.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw6.ms
rename to sim/testsuite/cris/asm/raw6.ms

diff --git a/sim/testsuite/sim/cris/asm/raw7.ms b/sim/testsuite/cris/asm/raw7.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw7.ms
rename to sim/testsuite/cris/asm/raw7.ms

diff --git a/sim/testsuite/sim/cris/asm/raw8.ms b/sim/testsuite/cris/asm/raw8.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw8.ms
rename to sim/testsuite/cris/asm/raw8.ms

diff --git a/sim/testsuite/sim/cris/asm/raw9.ms b/sim/testsuite/cris/asm/raw9.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/raw9.ms
rename to sim/testsuite/cris/asm/raw9.ms

diff --git a/sim/testsuite/sim/cris/asm/ret.ms b/sim/testsuite/cris/asm/ret.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/ret.ms
rename to sim/testsuite/cris/asm/ret.ms

diff --git a/sim/testsuite/sim/cris/asm/rfe.ms b/sim/testsuite/cris/asm/rfe.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/rfe.ms
rename to sim/testsuite/cris/asm/rfe.ms

diff --git a/sim/testsuite/sim/cris/asm/rfg.ms b/sim/testsuite/cris/asm/rfg.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/rfg.ms
rename to sim/testsuite/cris/asm/rfg.ms

diff --git a/sim/testsuite/sim/cris/asm/rfn.ms b/sim/testsuite/cris/asm/rfn.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/rfn.ms
rename to sim/testsuite/cris/asm/rfn.ms

diff --git a/sim/testsuite/sim/cris/asm/sbfs.ms b/sim/testsuite/cris/asm/sbfs.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/sbfs.ms
rename to sim/testsuite/cris/asm/sbfs.ms

diff --git a/sim/testsuite/sim/cris/asm/scc.ms b/sim/testsuite/cris/asm/scc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/scc.ms
rename to sim/testsuite/cris/asm/scc.ms

diff --git a/sim/testsuite/sim/cris/asm/sfe.ms b/sim/testsuite/cris/asm/sfe.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/sfe.ms
rename to sim/testsuite/cris/asm/sfe.ms

diff --git a/sim/testsuite/sim/cris/asm/subc.ms b/sim/testsuite/cris/asm/subc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/subc.ms
rename to sim/testsuite/cris/asm/subc.ms

diff --git a/sim/testsuite/sim/cris/asm/subm.ms b/sim/testsuite/cris/asm/subm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/subm.ms
rename to sim/testsuite/cris/asm/subm.ms

diff --git a/sim/testsuite/sim/cris/asm/subq.ms b/sim/testsuite/cris/asm/subq.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/subq.ms
rename to sim/testsuite/cris/asm/subq.ms

diff --git a/sim/testsuite/sim/cris/asm/subqpc.ms b/sim/testsuite/cris/asm/subqpc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/subqpc.ms
rename to sim/testsuite/cris/asm/subqpc.ms

diff --git a/sim/testsuite/sim/cris/asm/subr.ms b/sim/testsuite/cris/asm/subr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/subr.ms
rename to sim/testsuite/cris/asm/subr.ms

diff --git a/sim/testsuite/sim/cris/asm/subxc.ms b/sim/testsuite/cris/asm/subxc.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/subxc.ms
rename to sim/testsuite/cris/asm/subxc.ms

diff --git a/sim/testsuite/sim/cris/asm/subxm.ms b/sim/testsuite/cris/asm/subxm.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/subxm.ms
rename to sim/testsuite/cris/asm/subxm.ms

diff --git a/sim/testsuite/sim/cris/asm/subxr.ms b/sim/testsuite/cris/asm/subxr.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/subxr.ms
rename to sim/testsuite/cris/asm/subxr.ms

diff --git a/sim/testsuite/sim/cris/asm/swap.ms b/sim/testsuite/cris/asm/swap.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/swap.ms
rename to sim/testsuite/cris/asm/swap.ms

diff --git a/sim/testsuite/sim/cris/asm/tb.ms b/sim/testsuite/cris/asm/tb.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tb.ms
rename to sim/testsuite/cris/asm/tb.ms

diff --git a/sim/testsuite/sim/cris/asm/test.ms b/sim/testsuite/cris/asm/test.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/test.ms
rename to sim/testsuite/cris/asm/test.ms

diff --git a/sim/testsuite/sim/cris/asm/testutils.inc b/sim/testsuite/cris/asm/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/cris/asm/testutils.inc
rename to sim/testsuite/cris/asm/testutils.inc

diff --git a/sim/testsuite/sim/cris/asm/tjmpsrv32-2.ms b/sim/testsuite/cris/asm/tjmpsrv32-2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tjmpsrv32-2.ms
rename to sim/testsuite/cris/asm/tjmpsrv32-2.ms

diff --git a/sim/testsuite/sim/cris/asm/tjmpsrv32.ms b/sim/testsuite/cris/asm/tjmpsrv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tjmpsrv32.ms
rename to sim/testsuite/cris/asm/tjmpsrv32.ms

diff --git a/sim/testsuite/sim/cris/asm/tjsrcv10.ms b/sim/testsuite/cris/asm/tjsrcv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tjsrcv10.ms
rename to sim/testsuite/cris/asm/tjsrcv10.ms

diff --git a/sim/testsuite/sim/cris/asm/tjsrcv32.ms b/sim/testsuite/cris/asm/tjsrcv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tjsrcv32.ms
rename to sim/testsuite/cris/asm/tjsrcv32.ms

diff --git a/sim/testsuite/sim/cris/asm/tmemv10.ms b/sim/testsuite/cris/asm/tmemv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tmemv10.ms
rename to sim/testsuite/cris/asm/tmemv10.ms

diff --git a/sim/testsuite/sim/cris/asm/tmemv32.ms b/sim/testsuite/cris/asm/tmemv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tmemv32.ms
rename to sim/testsuite/cris/asm/tmemv32.ms

diff --git a/sim/testsuite/sim/cris/asm/tmulv10.ms b/sim/testsuite/cris/asm/tmulv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tmulv10.ms
rename to sim/testsuite/cris/asm/tmulv10.ms

diff --git a/sim/testsuite/sim/cris/asm/tmulv32.ms b/sim/testsuite/cris/asm/tmulv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tmulv32.ms
rename to sim/testsuite/cris/asm/tmulv32.ms

diff --git a/sim/testsuite/sim/cris/asm/tmvm1.ms b/sim/testsuite/cris/asm/tmvm1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tmvm1.ms
rename to sim/testsuite/cris/asm/tmvm1.ms

diff --git a/sim/testsuite/sim/cris/asm/tmvm2.ms b/sim/testsuite/cris/asm/tmvm2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tmvm2.ms
rename to sim/testsuite/cris/asm/tmvm2.ms

diff --git a/sim/testsuite/sim/cris/asm/tmvmrv10.ms b/sim/testsuite/cris/asm/tmvmrv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tmvmrv10.ms
rename to sim/testsuite/cris/asm/tmvmrv10.ms

diff --git a/sim/testsuite/sim/cris/asm/tmvmrv32.ms b/sim/testsuite/cris/asm/tmvmrv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tmvmrv32.ms
rename to sim/testsuite/cris/asm/tmvmrv32.ms

diff --git a/sim/testsuite/sim/cris/asm/tmvrmv10.ms b/sim/testsuite/cris/asm/tmvrmv10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tmvrmv10.ms
rename to sim/testsuite/cris/asm/tmvrmv10.ms

diff --git a/sim/testsuite/sim/cris/asm/tmvrmv32.ms b/sim/testsuite/cris/asm/tmvrmv32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/tmvrmv32.ms
rename to sim/testsuite/cris/asm/tmvrmv32.ms

diff --git a/sim/testsuite/sim/cris/asm/user.ms b/sim/testsuite/cris/asm/user.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/user.ms
rename to sim/testsuite/cris/asm/user.ms

diff --git a/sim/testsuite/sim/cris/asm/x0-v10.ms b/sim/testsuite/cris/asm/x0-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x0-v10.ms
rename to sim/testsuite/cris/asm/x0-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/x0-v32.ms b/sim/testsuite/cris/asm/x0-v32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x0-v32.ms
rename to sim/testsuite/cris/asm/x0-v32.ms

diff --git a/sim/testsuite/sim/cris/asm/x1-v10.ms b/sim/testsuite/cris/asm/x1-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x1-v10.ms
rename to sim/testsuite/cris/asm/x1-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/x1-v32.ms b/sim/testsuite/cris/asm/x1-v32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x1-v32.ms
rename to sim/testsuite/cris/asm/x1-v32.ms

diff --git a/sim/testsuite/sim/cris/asm/x10-v10.ms b/sim/testsuite/cris/asm/x10-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x10-v10.ms
rename to sim/testsuite/cris/asm/x10-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/x2-v10.ms b/sim/testsuite/cris/asm/x2-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x2-v10.ms
rename to sim/testsuite/cris/asm/x2-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/x2-v32.ms b/sim/testsuite/cris/asm/x2-v32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x2-v32.ms
rename to sim/testsuite/cris/asm/x2-v32.ms

diff --git a/sim/testsuite/sim/cris/asm/x3-v10.ms b/sim/testsuite/cris/asm/x3-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x3-v10.ms
rename to sim/testsuite/cris/asm/x3-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/x3-v32.ms b/sim/testsuite/cris/asm/x3-v32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x3-v32.ms
rename to sim/testsuite/cris/asm/x3-v32.ms

diff --git a/sim/testsuite/sim/cris/asm/x4-v32.ms b/sim/testsuite/cris/asm/x4-v32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x4-v32.ms
rename to sim/testsuite/cris/asm/x4-v32.ms

diff --git a/sim/testsuite/sim/cris/asm/x5-v10.ms b/sim/testsuite/cris/asm/x5-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x5-v10.ms
rename to sim/testsuite/cris/asm/x5-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/x5-v32.ms b/sim/testsuite/cris/asm/x5-v32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x5-v32.ms
rename to sim/testsuite/cris/asm/x5-v32.ms

diff --git a/sim/testsuite/sim/cris/asm/x6-v10.ms b/sim/testsuite/cris/asm/x6-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x6-v10.ms
rename to sim/testsuite/cris/asm/x6-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/x6-v32.ms b/sim/testsuite/cris/asm/x6-v32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x6-v32.ms
rename to sim/testsuite/cris/asm/x6-v32.ms

diff --git a/sim/testsuite/sim/cris/asm/x7-v10.ms b/sim/testsuite/cris/asm/x7-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x7-v10.ms
rename to sim/testsuite/cris/asm/x7-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/x7-v32.ms b/sim/testsuite/cris/asm/x7-v32.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x7-v32.ms
rename to sim/testsuite/cris/asm/x7-v32.ms

diff --git a/sim/testsuite/sim/cris/asm/x8-v10.ms b/sim/testsuite/cris/asm/x8-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x8-v10.ms
rename to sim/testsuite/cris/asm/x8-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/x9-v10.ms b/sim/testsuite/cris/asm/x9-v10.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/x9-v10.ms
rename to sim/testsuite/cris/asm/x9-v10.ms

diff --git a/sim/testsuite/sim/cris/asm/xor.ms b/sim/testsuite/cris/asm/xor.ms
similarity index 100%
rename from sim/testsuite/sim/cris/asm/xor.ms
rename to sim/testsuite/cris/asm/xor.ms

diff --git a/sim/testsuite/sim/cris/c/access1.c b/sim/testsuite/cris/c/access1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/access1.c
rename to sim/testsuite/cris/c/access1.c

diff --git a/sim/testsuite/sim/cris/c/append1.c b/sim/testsuite/cris/c/append1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/append1.c
rename to sim/testsuite/cris/c/append1.c

diff --git a/sim/testsuite/sim/cris/c/badldso1.c b/sim/testsuite/cris/c/badldso1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/badldso1.c
rename to sim/testsuite/cris/c/badldso1.c

diff --git a/sim/testsuite/sim/cris/c/badldso2.c b/sim/testsuite/cris/c/badldso2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/badldso2.c
rename to sim/testsuite/cris/c/badldso2.c

diff --git a/sim/testsuite/sim/cris/c/badldso3.c b/sim/testsuite/cris/c/badldso3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/badldso3.c
rename to sim/testsuite/cris/c/badldso3.c

diff --git a/sim/testsuite/sim/cris/c/c.exp b/sim/testsuite/cris/c/c.exp
similarity index 100%
rename from sim/testsuite/sim/cris/c/c.exp
rename to sim/testsuite/cris/c/c.exp

diff --git a/sim/testsuite/sim/cris/c/clone1.c b/sim/testsuite/cris/c/clone1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/clone1.c
rename to sim/testsuite/cris/c/clone1.c

diff --git a/sim/testsuite/sim/cris/c/clone2.c b/sim/testsuite/cris/c/clone2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/clone2.c
rename to sim/testsuite/cris/c/clone2.c

diff --git a/sim/testsuite/sim/cris/c/clone3.c b/sim/testsuite/cris/c/clone3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/clone3.c
rename to sim/testsuite/cris/c/clone3.c

diff --git a/sim/testsuite/sim/cris/c/clone4.c b/sim/testsuite/cris/c/clone4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/clone4.c
rename to sim/testsuite/cris/c/clone4.c

diff --git a/sim/testsuite/sim/cris/c/clone5.c b/sim/testsuite/cris/c/clone5.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/clone5.c
rename to sim/testsuite/cris/c/clone5.c

diff --git a/sim/testsuite/sim/cris/c/clone6.c b/sim/testsuite/cris/c/clone6.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/clone6.c
rename to sim/testsuite/cris/c/clone6.c

diff --git a/sim/testsuite/sim/cris/c/ex1.c b/sim/testsuite/cris/c/ex1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/ex1.c
rename to sim/testsuite/cris/c/ex1.c

diff --git a/sim/testsuite/sim/cris/c/exitg1.c b/sim/testsuite/cris/c/exitg1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/exitg1.c
rename to sim/testsuite/cris/c/exitg1.c

diff --git a/sim/testsuite/sim/cris/c/exitg2.c b/sim/testsuite/cris/c/exitg2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/exitg2.c
rename to sim/testsuite/cris/c/exitg2.c

diff --git a/sim/testsuite/sim/cris/c/fcntl1.c b/sim/testsuite/cris/c/fcntl1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/fcntl1.c
rename to sim/testsuite/cris/c/fcntl1.c

diff --git a/sim/testsuite/sim/cris/c/fcntl2.c b/sim/testsuite/cris/c/fcntl2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/fcntl2.c
rename to sim/testsuite/cris/c/fcntl2.c

diff --git a/sim/testsuite/sim/cris/c/fdopen1.c b/sim/testsuite/cris/c/fdopen1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/fdopen1.c
rename to sim/testsuite/cris/c/fdopen1.c

diff --git a/sim/testsuite/sim/cris/c/fdopen2.c b/sim/testsuite/cris/c/fdopen2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/fdopen2.c
rename to sim/testsuite/cris/c/fdopen2.c

diff --git a/sim/testsuite/sim/cris/c/freopen1.c b/sim/testsuite/cris/c/freopen1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/freopen1.c
rename to sim/testsuite/cris/c/freopen1.c

diff --git a/sim/testsuite/sim/cris/c/freopen2.c b/sim/testsuite/cris/c/freopen2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/freopen2.c
rename to sim/testsuite/cris/c/freopen2.c

diff --git a/sim/testsuite/sim/cris/c/ftruncate1.c b/sim/testsuite/cris/c/ftruncate1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/ftruncate1.c
rename to sim/testsuite/cris/c/ftruncate1.c

diff --git a/sim/testsuite/sim/cris/c/ftruncate2.c b/sim/testsuite/cris/c/ftruncate2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/ftruncate2.c
rename to sim/testsuite/cris/c/ftruncate2.c

diff --git a/sim/testsuite/sim/cris/c/getcwd1.c b/sim/testsuite/cris/c/getcwd1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/getcwd1.c
rename to sim/testsuite/cris/c/getcwd1.c

diff --git a/sim/testsuite/sim/cris/c/gettod.c b/sim/testsuite/cris/c/gettod.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/gettod.c
rename to sim/testsuite/cris/c/gettod.c

diff --git a/sim/testsuite/sim/cris/c/hello.c b/sim/testsuite/cris/c/hello.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/hello.c
rename to sim/testsuite/cris/c/hello.c

diff --git a/sim/testsuite/sim/cris/c/helloaout.c b/sim/testsuite/cris/c/helloaout.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/helloaout.c
rename to sim/testsuite/cris/c/helloaout.c

diff --git a/sim/testsuite/sim/cris/c/hellodyn.c b/sim/testsuite/cris/c/hellodyn.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/hellodyn.c
rename to sim/testsuite/cris/c/hellodyn.c

diff --git a/sim/testsuite/sim/cris/c/hellodyn2.c b/sim/testsuite/cris/c/hellodyn2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/hellodyn2.c
rename to sim/testsuite/cris/c/hellodyn2.c

diff --git a/sim/testsuite/sim/cris/c/hellodyn3.c b/sim/testsuite/cris/c/hellodyn3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/hellodyn3.c
rename to sim/testsuite/cris/c/hellodyn3.c

diff --git a/sim/testsuite/sim/cris/c/kill1.c b/sim/testsuite/cris/c/kill1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/kill1.c
rename to sim/testsuite/cris/c/kill1.c

diff --git a/sim/testsuite/sim/cris/c/kill2.c b/sim/testsuite/cris/c/kill2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/kill2.c
rename to sim/testsuite/cris/c/kill2.c

diff --git a/sim/testsuite/sim/cris/c/kill3.c b/sim/testsuite/cris/c/kill3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/kill3.c
rename to sim/testsuite/cris/c/kill3.c

diff --git a/sim/testsuite/sim/cris/c/mapbrk.c b/sim/testsuite/cris/c/mapbrk.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mapbrk.c
rename to sim/testsuite/cris/c/mapbrk.c

diff --git a/sim/testsuite/sim/cris/c/mmap1.c b/sim/testsuite/cris/c/mmap1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mmap1.c
rename to sim/testsuite/cris/c/mmap1.c

diff --git a/sim/testsuite/sim/cris/c/mmap2.c b/sim/testsuite/cris/c/mmap2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mmap2.c
rename to sim/testsuite/cris/c/mmap2.c

diff --git a/sim/testsuite/sim/cris/c/mmap3.c b/sim/testsuite/cris/c/mmap3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mmap3.c
rename to sim/testsuite/cris/c/mmap3.c

diff --git a/sim/testsuite/sim/cris/c/mmap4.c b/sim/testsuite/cris/c/mmap4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mmap4.c
rename to sim/testsuite/cris/c/mmap4.c

diff --git a/sim/testsuite/sim/cris/c/mmap5.c b/sim/testsuite/cris/c/mmap5.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mmap5.c
rename to sim/testsuite/cris/c/mmap5.c

diff --git a/sim/testsuite/sim/cris/c/mmap6.c b/sim/testsuite/cris/c/mmap6.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mmap6.c
rename to sim/testsuite/cris/c/mmap6.c

diff --git a/sim/testsuite/sim/cris/c/mmap7.c b/sim/testsuite/cris/c/mmap7.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mmap7.c
rename to sim/testsuite/cris/c/mmap7.c

diff --git a/sim/testsuite/sim/cris/c/mmap8.c b/sim/testsuite/cris/c/mmap8.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mmap8.c
rename to sim/testsuite/cris/c/mmap8.c

diff --git a/sim/testsuite/sim/cris/c/mprotect1.c b/sim/testsuite/cris/c/mprotect1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mprotect1.c
rename to sim/testsuite/cris/c/mprotect1.c

diff --git a/sim/testsuite/sim/cris/c/mprotect2.c b/sim/testsuite/cris/c/mprotect2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mprotect2.c
rename to sim/testsuite/cris/c/mprotect2.c

diff --git a/sim/testsuite/sim/cris/c/mremap.c b/sim/testsuite/cris/c/mremap.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/mremap.c
rename to sim/testsuite/cris/c/mremap.c

diff --git a/sim/testsuite/sim/cris/c/openpf1.c b/sim/testsuite/cris/c/openpf1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/openpf1.c
rename to sim/testsuite/cris/c/openpf1.c

diff --git a/sim/testsuite/sim/cris/c/openpf2.c b/sim/testsuite/cris/c/openpf2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/openpf2.c
rename to sim/testsuite/cris/c/openpf2.c

diff --git a/sim/testsuite/sim/cris/c/openpf3.c b/sim/testsuite/cris/c/openpf3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/openpf3.c
rename to sim/testsuite/cris/c/openpf3.c

diff --git a/sim/testsuite/sim/cris/c/openpf4.c b/sim/testsuite/cris/c/openpf4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/openpf4.c
rename to sim/testsuite/cris/c/openpf4.c

diff --git a/sim/testsuite/sim/cris/c/openpf5.c b/sim/testsuite/cris/c/openpf5.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/openpf5.c
rename to sim/testsuite/cris/c/openpf5.c

diff --git a/sim/testsuite/sim/cris/c/pipe1.c b/sim/testsuite/cris/c/pipe1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/pipe1.c
rename to sim/testsuite/cris/c/pipe1.c

diff --git a/sim/testsuite/sim/cris/c/pipe2.c b/sim/testsuite/cris/c/pipe2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/pipe2.c
rename to sim/testsuite/cris/c/pipe2.c

diff --git a/sim/testsuite/sim/cris/c/pipe3.c b/sim/testsuite/cris/c/pipe3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/pipe3.c
rename to sim/testsuite/cris/c/pipe3.c

diff --git a/sim/testsuite/sim/cris/c/pipe4.c b/sim/testsuite/cris/c/pipe4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/pipe4.c
rename to sim/testsuite/cris/c/pipe4.c

diff --git a/sim/testsuite/sim/cris/c/pipe5.c b/sim/testsuite/cris/c/pipe5.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/pipe5.c
rename to sim/testsuite/cris/c/pipe5.c

diff --git a/sim/testsuite/sim/cris/c/pipe6.c b/sim/testsuite/cris/c/pipe6.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/pipe6.c
rename to sim/testsuite/cris/c/pipe6.c

diff --git a/sim/testsuite/sim/cris/c/pipe7.c b/sim/testsuite/cris/c/pipe7.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/pipe7.c
rename to sim/testsuite/cris/c/pipe7.c

diff --git a/sim/testsuite/sim/cris/c/readlink1.c b/sim/testsuite/cris/c/readlink1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink1.c
rename to sim/testsuite/cris/c/readlink1.c

diff --git a/sim/testsuite/sim/cris/c/readlink10.c b/sim/testsuite/cris/c/readlink10.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink10.c
rename to sim/testsuite/cris/c/readlink10.c

diff --git a/sim/testsuite/sim/cris/c/readlink11.c b/sim/testsuite/cris/c/readlink11.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink11.c
rename to sim/testsuite/cris/c/readlink11.c

diff --git a/sim/testsuite/sim/cris/c/readlink2.c b/sim/testsuite/cris/c/readlink2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink2.c
rename to sim/testsuite/cris/c/readlink2.c

diff --git a/sim/testsuite/sim/cris/c/readlink3.c b/sim/testsuite/cris/c/readlink3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink3.c
rename to sim/testsuite/cris/c/readlink3.c

diff --git a/sim/testsuite/sim/cris/c/readlink4.c b/sim/testsuite/cris/c/readlink4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink4.c
rename to sim/testsuite/cris/c/readlink4.c

diff --git a/sim/testsuite/sim/cris/c/readlink5.c b/sim/testsuite/cris/c/readlink5.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink5.c
rename to sim/testsuite/cris/c/readlink5.c

diff --git a/sim/testsuite/sim/cris/c/readlink6.c b/sim/testsuite/cris/c/readlink6.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink6.c
rename to sim/testsuite/cris/c/readlink6.c

diff --git a/sim/testsuite/sim/cris/c/readlink7.c b/sim/testsuite/cris/c/readlink7.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink7.c
rename to sim/testsuite/cris/c/readlink7.c

diff --git a/sim/testsuite/sim/cris/c/readlink8.c b/sim/testsuite/cris/c/readlink8.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink8.c
rename to sim/testsuite/cris/c/readlink8.c

diff --git a/sim/testsuite/sim/cris/c/readlink9.c b/sim/testsuite/cris/c/readlink9.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/readlink9.c
rename to sim/testsuite/cris/c/readlink9.c

diff --git a/sim/testsuite/sim/cris/c/rename2.c b/sim/testsuite/cris/c/rename2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/rename2.c
rename to sim/testsuite/cris/c/rename2.c

diff --git a/sim/testsuite/sim/cris/c/rtsigprocmask1.c b/sim/testsuite/cris/c/rtsigprocmask1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/rtsigprocmask1.c
rename to sim/testsuite/cris/c/rtsigprocmask1.c

diff --git a/sim/testsuite/sim/cris/c/rtsigprocmask2.c b/sim/testsuite/cris/c/rtsigprocmask2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/rtsigprocmask2.c
rename to sim/testsuite/cris/c/rtsigprocmask2.c

diff --git a/sim/testsuite/sim/cris/c/rtsigsuspend1.c b/sim/testsuite/cris/c/rtsigsuspend1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/rtsigsuspend1.c
rename to sim/testsuite/cris/c/rtsigsuspend1.c

diff --git a/sim/testsuite/sim/cris/c/rtsigsuspend2.c b/sim/testsuite/cris/c/rtsigsuspend2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/rtsigsuspend2.c
rename to sim/testsuite/cris/c/rtsigsuspend2.c

diff --git a/sim/testsuite/sim/cris/c/sched1.c b/sim/testsuite/cris/c/sched1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sched1.c
rename to sim/testsuite/cris/c/sched1.c

diff --git a/sim/testsuite/sim/cris/c/sched2.c b/sim/testsuite/cris/c/sched2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sched2.c
rename to sim/testsuite/cris/c/sched2.c

diff --git a/sim/testsuite/sim/cris/c/sched3.c b/sim/testsuite/cris/c/sched3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sched3.c
rename to sim/testsuite/cris/c/sched3.c

diff --git a/sim/testsuite/sim/cris/c/sched4.c b/sim/testsuite/cris/c/sched4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sched4.c
rename to sim/testsuite/cris/c/sched4.c

diff --git a/sim/testsuite/sim/cris/c/sched5.c b/sim/testsuite/cris/c/sched5.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sched5.c
rename to sim/testsuite/cris/c/sched5.c

diff --git a/sim/testsuite/sim/cris/c/sched6.c b/sim/testsuite/cris/c/sched6.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sched6.c
rename to sim/testsuite/cris/c/sched6.c

diff --git a/sim/testsuite/sim/cris/c/sched7.c b/sim/testsuite/cris/c/sched7.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sched7.c
rename to sim/testsuite/cris/c/sched7.c

diff --git a/sim/testsuite/sim/cris/c/sched8.c b/sim/testsuite/cris/c/sched8.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sched8.c
rename to sim/testsuite/cris/c/sched8.c

diff --git a/sim/testsuite/sim/cris/c/sched9.c b/sim/testsuite/cris/c/sched9.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sched9.c
rename to sim/testsuite/cris/c/sched9.c

diff --git a/sim/testsuite/sim/cris/c/seek1.c b/sim/testsuite/cris/c/seek1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/seek1.c
rename to sim/testsuite/cris/c/seek1.c

diff --git a/sim/testsuite/sim/cris/c/seek2.c b/sim/testsuite/cris/c/seek2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/seek2.c
rename to sim/testsuite/cris/c/seek2.c

diff --git a/sim/testsuite/sim/cris/c/seek3.c b/sim/testsuite/cris/c/seek3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/seek3.c
rename to sim/testsuite/cris/c/seek3.c

diff --git a/sim/testsuite/sim/cris/c/seek4.c b/sim/testsuite/cris/c/seek4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/seek4.c
rename to sim/testsuite/cris/c/seek4.c

diff --git a/sim/testsuite/sim/cris/c/setrlimit1.c b/sim/testsuite/cris/c/setrlimit1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/setrlimit1.c
rename to sim/testsuite/cris/c/setrlimit1.c

diff --git a/sim/testsuite/sim/cris/c/settls1.c b/sim/testsuite/cris/c/settls1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/settls1.c
rename to sim/testsuite/cris/c/settls1.c

diff --git a/sim/testsuite/sim/cris/c/sig1.c b/sim/testsuite/cris/c/sig1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig1.c
rename to sim/testsuite/cris/c/sig1.c

diff --git a/sim/testsuite/sim/cris/c/sig10.c b/sim/testsuite/cris/c/sig10.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig10.c
rename to sim/testsuite/cris/c/sig10.c

diff --git a/sim/testsuite/sim/cris/c/sig11.c b/sim/testsuite/cris/c/sig11.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig11.c
rename to sim/testsuite/cris/c/sig11.c

diff --git a/sim/testsuite/sim/cris/c/sig12.c b/sim/testsuite/cris/c/sig12.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig12.c
rename to sim/testsuite/cris/c/sig12.c

diff --git a/sim/testsuite/sim/cris/c/sig13.c b/sim/testsuite/cris/c/sig13.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig13.c
rename to sim/testsuite/cris/c/sig13.c

diff --git a/sim/testsuite/sim/cris/c/sig2.c b/sim/testsuite/cris/c/sig2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig2.c
rename to sim/testsuite/cris/c/sig2.c

diff --git a/sim/testsuite/sim/cris/c/sig3.c b/sim/testsuite/cris/c/sig3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig3.c
rename to sim/testsuite/cris/c/sig3.c

diff --git a/sim/testsuite/sim/cris/c/sig4.c b/sim/testsuite/cris/c/sig4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig4.c
rename to sim/testsuite/cris/c/sig4.c

diff --git a/sim/testsuite/sim/cris/c/sig5.c b/sim/testsuite/cris/c/sig5.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig5.c
rename to sim/testsuite/cris/c/sig5.c

diff --git a/sim/testsuite/sim/cris/c/sig6.c b/sim/testsuite/cris/c/sig6.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig6.c
rename to sim/testsuite/cris/c/sig6.c

diff --git a/sim/testsuite/sim/cris/c/sig7.c b/sim/testsuite/cris/c/sig7.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig7.c
rename to sim/testsuite/cris/c/sig7.c

diff --git a/sim/testsuite/sim/cris/c/sig8.c b/sim/testsuite/cris/c/sig8.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig8.c
rename to sim/testsuite/cris/c/sig8.c

diff --git a/sim/testsuite/sim/cris/c/sig9.c b/sim/testsuite/cris/c/sig9.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sig9.c
rename to sim/testsuite/cris/c/sig9.c

diff --git a/sim/testsuite/sim/cris/c/sigreturn1.c b/sim/testsuite/cris/c/sigreturn1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sigreturn1.c
rename to sim/testsuite/cris/c/sigreturn1.c

diff --git a/sim/testsuite/sim/cris/c/sigreturn2.c b/sim/testsuite/cris/c/sigreturn2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sigreturn2.c
rename to sim/testsuite/cris/c/sigreturn2.c

diff --git a/sim/testsuite/sim/cris/c/sigreturn3.c b/sim/testsuite/cris/c/sigreturn3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sigreturn3.c
rename to sim/testsuite/cris/c/sigreturn3.c

diff --git a/sim/testsuite/sim/cris/c/sigreturn4.c b/sim/testsuite/cris/c/sigreturn4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sigreturn4.c
rename to sim/testsuite/cris/c/sigreturn4.c

diff --git a/sim/testsuite/sim/cris/c/sjlj.c b/sim/testsuite/cris/c/sjlj.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sjlj.c
rename to sim/testsuite/cris/c/sjlj.c

diff --git a/sim/testsuite/sim/cris/c/sock1.c b/sim/testsuite/cris/c/sock1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sock1.c
rename to sim/testsuite/cris/c/sock1.c

diff --git a/sim/testsuite/sim/cris/c/stat1.c b/sim/testsuite/cris/c/stat1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/stat1.c
rename to sim/testsuite/cris/c/stat1.c

diff --git a/sim/testsuite/sim/cris/c/stat2.c b/sim/testsuite/cris/c/stat2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/stat2.c
rename to sim/testsuite/cris/c/stat2.c

diff --git a/sim/testsuite/sim/cris/c/stat3.c b/sim/testsuite/cris/c/stat3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/stat3.c
rename to sim/testsuite/cris/c/stat3.c

diff --git a/sim/testsuite/sim/cris/c/stat4.c b/sim/testsuite/cris/c/stat4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/stat4.c
rename to sim/testsuite/cris/c/stat4.c

diff --git a/sim/testsuite/sim/cris/c/stat5.c b/sim/testsuite/cris/c/stat5.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/stat5.c
rename to sim/testsuite/cris/c/stat5.c

diff --git a/sim/testsuite/sim/cris/c/stat7.c b/sim/testsuite/cris/c/stat7.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/stat7.c
rename to sim/testsuite/cris/c/stat7.c

diff --git a/sim/testsuite/sim/cris/c/stat8.c b/sim/testsuite/cris/c/stat8.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/stat8.c
rename to sim/testsuite/cris/c/stat8.c

diff --git a/sim/testsuite/sim/cris/c/syscall1.c b/sim/testsuite/cris/c/syscall1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/syscall1.c
rename to sim/testsuite/cris/c/syscall1.c

diff --git a/sim/testsuite/sim/cris/c/syscall2.c b/sim/testsuite/cris/c/syscall2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/syscall2.c
rename to sim/testsuite/cris/c/syscall2.c

diff --git a/sim/testsuite/sim/cris/c/syscall3.c b/sim/testsuite/cris/c/syscall3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/syscall3.c
rename to sim/testsuite/cris/c/syscall3.c

diff --git a/sim/testsuite/sim/cris/c/syscall4.c b/sim/testsuite/cris/c/syscall4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/syscall4.c
rename to sim/testsuite/cris/c/syscall4.c

diff --git a/sim/testsuite/sim/cris/c/syscall5.c b/sim/testsuite/cris/c/syscall5.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/syscall5.c
rename to sim/testsuite/cris/c/syscall5.c

diff --git a/sim/testsuite/sim/cris/c/syscall6.c b/sim/testsuite/cris/c/syscall6.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/syscall6.c
rename to sim/testsuite/cris/c/syscall6.c

diff --git a/sim/testsuite/sim/cris/c/syscall7.c b/sim/testsuite/cris/c/syscall7.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/syscall7.c
rename to sim/testsuite/cris/c/syscall7.c

diff --git a/sim/testsuite/sim/cris/c/syscall8.c b/sim/testsuite/cris/c/syscall8.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/syscall8.c
rename to sim/testsuite/cris/c/syscall8.c

diff --git a/sim/testsuite/sim/cris/c/sysctl1.c b/sim/testsuite/cris/c/sysctl1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sysctl1.c
rename to sim/testsuite/cris/c/sysctl1.c

diff --git a/sim/testsuite/sim/cris/c/sysctl2.c b/sim/testsuite/cris/c/sysctl2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sysctl2.c
rename to sim/testsuite/cris/c/sysctl2.c

diff --git a/sim/testsuite/sim/cris/c/sysctl3.c b/sim/testsuite/cris/c/sysctl3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/sysctl3.c
rename to sim/testsuite/cris/c/sysctl3.c

diff --git a/sim/testsuite/sim/cris/c/thread2.c b/sim/testsuite/cris/c/thread2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/thread2.c
rename to sim/testsuite/cris/c/thread2.c

diff --git a/sim/testsuite/sim/cris/c/thread3.c b/sim/testsuite/cris/c/thread3.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/thread3.c
rename to sim/testsuite/cris/c/thread3.c

diff --git a/sim/testsuite/sim/cris/c/thread4.c b/sim/testsuite/cris/c/thread4.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/thread4.c
rename to sim/testsuite/cris/c/thread4.c

diff --git a/sim/testsuite/sim/cris/c/thread5.c b/sim/testsuite/cris/c/thread5.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/thread5.c
rename to sim/testsuite/cris/c/thread5.c

diff --git a/sim/testsuite/sim/cris/c/time1.c b/sim/testsuite/cris/c/time1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/time1.c
rename to sim/testsuite/cris/c/time1.c

diff --git a/sim/testsuite/sim/cris/c/time2.c b/sim/testsuite/cris/c/time2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/time2.c
rename to sim/testsuite/cris/c/time2.c

diff --git a/sim/testsuite/sim/cris/c/truncate1.c b/sim/testsuite/cris/c/truncate1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/truncate1.c
rename to sim/testsuite/cris/c/truncate1.c

diff --git a/sim/testsuite/sim/cris/c/truncate2.c b/sim/testsuite/cris/c/truncate2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/truncate2.c
rename to sim/testsuite/cris/c/truncate2.c

diff --git a/sim/testsuite/sim/cris/c/ugetrlimit1.c b/sim/testsuite/cris/c/ugetrlimit1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/ugetrlimit1.c
rename to sim/testsuite/cris/c/ugetrlimit1.c

diff --git a/sim/testsuite/sim/cris/c/uname1.c b/sim/testsuite/cris/c/uname1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/uname1.c
rename to sim/testsuite/cris/c/uname1.c

diff --git a/sim/testsuite/sim/cris/c/writev1.c b/sim/testsuite/cris/c/writev1.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/writev1.c
rename to sim/testsuite/cris/c/writev1.c

diff --git a/sim/testsuite/sim/cris/c/writev2.c b/sim/testsuite/cris/c/writev2.c
similarity index 100%
rename from sim/testsuite/sim/cris/c/writev2.c
rename to sim/testsuite/cris/c/writev2.c

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/host1.ms b/sim/testsuite/cris/hw/rv-n-cris/host1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/host1.ms
rename to sim/testsuite/cris/hw/rv-n-cris/host1.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/irq1.ms b/sim/testsuite/cris/hw/rv-n-cris/irq1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/irq1.ms
rename to sim/testsuite/cris/hw/rv-n-cris/irq1.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/irq2.ms b/sim/testsuite/cris/hw/rv-n-cris/irq2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/irq2.ms
rename to sim/testsuite/cris/hw/rv-n-cris/irq2.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/irq3.ms b/sim/testsuite/cris/hw/rv-n-cris/irq3.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/irq3.ms
rename to sim/testsuite/cris/hw/rv-n-cris/irq3.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/irq4.ms b/sim/testsuite/cris/hw/rv-n-cris/irq4.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/irq4.ms
rename to sim/testsuite/cris/hw/rv-n-cris/irq4.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/irq5.ms b/sim/testsuite/cris/hw/rv-n-cris/irq5.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/irq5.ms
rename to sim/testsuite/cris/hw/rv-n-cris/irq5.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/irq6.ms b/sim/testsuite/cris/hw/rv-n-cris/irq6.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/irq6.ms
rename to sim/testsuite/cris/hw/rv-n-cris/irq6.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/mbox1.ms b/sim/testsuite/cris/hw/rv-n-cris/mbox1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/mbox1.ms
rename to sim/testsuite/cris/hw/rv-n-cris/mbox1.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/mem1.ms b/sim/testsuite/cris/hw/rv-n-cris/mem1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/mem1.ms
rename to sim/testsuite/cris/hw/rv-n-cris/mem1.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/mem2.ms b/sim/testsuite/cris/hw/rv-n-cris/mem2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/mem2.ms
rename to sim/testsuite/cris/hw/rv-n-cris/mem2.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/poll1.ms b/sim/testsuite/cris/hw/rv-n-cris/poll1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/poll1.ms
rename to sim/testsuite/cris/hw/rv-n-cris/poll1.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/quit.s b/sim/testsuite/cris/hw/rv-n-cris/quit.s
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/quit.s
rename to sim/testsuite/cris/hw/rv-n-cris/quit.s

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/rvc.exp b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/rvc.exp
rename to sim/testsuite/cris/hw/rv-n-cris/rvc.exp

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/std.dev b/sim/testsuite/cris/hw/rv-n-cris/std.dev
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/std.dev
rename to sim/testsuite/cris/hw/rv-n-cris/std.dev

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/testutils.inc b/sim/testsuite/cris/hw/rv-n-cris/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/testutils.inc
rename to sim/testsuite/cris/hw/rv-n-cris/testutils.inc

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/trivial1.ms b/sim/testsuite/cris/hw/rv-n-cris/trivial1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/trivial1.ms
rename to sim/testsuite/cris/hw/rv-n-cris/trivial1.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/trivial2.ms b/sim/testsuite/cris/hw/rv-n-cris/trivial2.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/trivial2.ms
rename to sim/testsuite/cris/hw/rv-n-cris/trivial2.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/trivial3.ms b/sim/testsuite/cris/hw/rv-n-cris/trivial3.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/trivial3.ms
rename to sim/testsuite/cris/hw/rv-n-cris/trivial3.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/trivial4.ms b/sim/testsuite/cris/hw/rv-n-cris/trivial4.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/trivial4.ms
rename to sim/testsuite/cris/hw/rv-n-cris/trivial4.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/trivial4.r b/sim/testsuite/cris/hw/rv-n-cris/trivial4.r
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/trivial4.r
rename to sim/testsuite/cris/hw/rv-n-cris/trivial4.r

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/trivial5.ms b/sim/testsuite/cris/hw/rv-n-cris/trivial5.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/trivial5.ms
rename to sim/testsuite/cris/hw/rv-n-cris/trivial5.ms

diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/wd1.ms b/sim/testsuite/cris/hw/rv-n-cris/wd1.ms
similarity index 100%
rename from sim/testsuite/sim/cris/hw/rv-n-cris/wd1.ms
rename to sim/testsuite/cris/hw/rv-n-cris/wd1.ms

diff --git a/sim/testsuite/sim/d10v/ChangeLog b/sim/testsuite/d10v/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/d10v/ChangeLog
rename to sim/testsuite/d10v/ChangeLog

diff --git a/sim/testsuite/sim/d10v/allinsn.exp b/sim/testsuite/d10v/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/d10v/allinsn.exp
rename to sim/testsuite/d10v/allinsn.exp

diff --git a/sim/testsuite/sim/d10v/exit47.s b/sim/testsuite/d10v/exit47.s
similarity index 100%
rename from sim/testsuite/sim/d10v/exit47.s
rename to sim/testsuite/d10v/exit47.s

diff --git a/sim/testsuite/sim/d10v/hello.s b/sim/testsuite/d10v/hello.s
similarity index 100%
rename from sim/testsuite/sim/d10v/hello.s
rename to sim/testsuite/d10v/hello.s

diff --git a/sim/testsuite/sim/d10v/t-ae-ld-d.s b/sim/testsuite/d10v/t-ae-ld-d.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-ld-d.s
rename to sim/testsuite/d10v/t-ae-ld-d.s

diff --git a/sim/testsuite/sim/d10v/t-ae-ld-i.s b/sim/testsuite/d10v/t-ae-ld-i.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-ld-i.s
rename to sim/testsuite/d10v/t-ae-ld-i.s

diff --git a/sim/testsuite/sim/d10v/t-ae-ld-id.s b/sim/testsuite/d10v/t-ae-ld-id.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-ld-id.s
rename to sim/testsuite/d10v/t-ae-ld-id.s

diff --git a/sim/testsuite/sim/d10v/t-ae-ld-im.s b/sim/testsuite/d10v/t-ae-ld-im.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-ld-im.s
rename to sim/testsuite/d10v/t-ae-ld-im.s

diff --git a/sim/testsuite/sim/d10v/t-ae-ld-ip.s b/sim/testsuite/d10v/t-ae-ld-ip.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-ld-ip.s
rename to sim/testsuite/d10v/t-ae-ld-ip.s

diff --git a/sim/testsuite/sim/d10v/t-ae-ld2w-d.s b/sim/testsuite/d10v/t-ae-ld2w-d.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-ld2w-d.s
rename to sim/testsuite/d10v/t-ae-ld2w-d.s

diff --git a/sim/testsuite/sim/d10v/t-ae-ld2w-i.s b/sim/testsuite/d10v/t-ae-ld2w-i.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-ld2w-i.s
rename to sim/testsuite/d10v/t-ae-ld2w-i.s

diff --git a/sim/testsuite/sim/d10v/t-ae-ld2w-id.s b/sim/testsuite/d10v/t-ae-ld2w-id.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-ld2w-id.s
rename to sim/testsuite/d10v/t-ae-ld2w-id.s

diff --git a/sim/testsuite/sim/d10v/t-ae-ld2w-im.s b/sim/testsuite/d10v/t-ae-ld2w-im.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-ld2w-im.s
rename to sim/testsuite/d10v/t-ae-ld2w-im.s

diff --git a/sim/testsuite/sim/d10v/t-ae-ld2w-ip.s b/sim/testsuite/d10v/t-ae-ld2w-ip.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-ld2w-ip.s
rename to sim/testsuite/d10v/t-ae-ld2w-ip.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st-d.s b/sim/testsuite/d10v/t-ae-st-d.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st-d.s
rename to sim/testsuite/d10v/t-ae-st-d.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st-i.s b/sim/testsuite/d10v/t-ae-st-i.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st-i.s
rename to sim/testsuite/d10v/t-ae-st-i.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st-id.s b/sim/testsuite/d10v/t-ae-st-id.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st-id.s
rename to sim/testsuite/d10v/t-ae-st-id.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st-im.s b/sim/testsuite/d10v/t-ae-st-im.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st-im.s
rename to sim/testsuite/d10v/t-ae-st-im.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st-ip.s b/sim/testsuite/d10v/t-ae-st-ip.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st-ip.s
rename to sim/testsuite/d10v/t-ae-st-ip.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st-is.s b/sim/testsuite/d10v/t-ae-st-is.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st-is.s
rename to sim/testsuite/d10v/t-ae-st-is.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st2w-d.s b/sim/testsuite/d10v/t-ae-st2w-d.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st2w-d.s
rename to sim/testsuite/d10v/t-ae-st2w-d.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st2w-i.s b/sim/testsuite/d10v/t-ae-st2w-i.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st2w-i.s
rename to sim/testsuite/d10v/t-ae-st2w-i.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st2w-id.s b/sim/testsuite/d10v/t-ae-st2w-id.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st2w-id.s
rename to sim/testsuite/d10v/t-ae-st2w-id.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st2w-im.s b/sim/testsuite/d10v/t-ae-st2w-im.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st2w-im.s
rename to sim/testsuite/d10v/t-ae-st2w-im.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st2w-ip.s b/sim/testsuite/d10v/t-ae-st2w-ip.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st2w-ip.s
rename to sim/testsuite/d10v/t-ae-st2w-ip.s

diff --git a/sim/testsuite/sim/d10v/t-ae-st2w-is.s b/sim/testsuite/d10v/t-ae-st2w-is.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ae-st2w-is.s
rename to sim/testsuite/d10v/t-ae-st2w-is.s

diff --git a/sim/testsuite/sim/d10v/t-dbt.s b/sim/testsuite/d10v/t-dbt.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-dbt.s
rename to sim/testsuite/d10v/t-dbt.s

diff --git a/sim/testsuite/sim/d10v/t-ld-st.s b/sim/testsuite/d10v/t-ld-st.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-ld-st.s
rename to sim/testsuite/d10v/t-ld-st.s

diff --git a/sim/testsuite/sim/d10v/t-mac.s b/sim/testsuite/d10v/t-mac.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-mac.s
rename to sim/testsuite/d10v/t-mac.s

diff --git a/sim/testsuite/sim/d10v/t-macros.i b/sim/testsuite/d10v/t-macros.i
similarity index 100%
rename from sim/testsuite/sim/d10v/t-macros.i
rename to sim/testsuite/d10v/t-macros.i

diff --git a/sim/testsuite/sim/d10v/t-mod-ld-pre.s b/sim/testsuite/d10v/t-mod-ld-pre.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-mod-ld-pre.s
rename to sim/testsuite/d10v/t-mod-ld-pre.s

diff --git a/sim/testsuite/sim/d10v/t-msbu.s b/sim/testsuite/d10v/t-msbu.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-msbu.s
rename to sim/testsuite/d10v/t-msbu.s

diff --git a/sim/testsuite/sim/d10v/t-mulxu.s b/sim/testsuite/d10v/t-mulxu.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-mulxu.s
rename to sim/testsuite/d10v/t-mulxu.s

diff --git a/sim/testsuite/sim/d10v/t-mvtac.s b/sim/testsuite/d10v/t-mvtac.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-mvtac.s
rename to sim/testsuite/d10v/t-mvtac.s

diff --git a/sim/testsuite/sim/d10v/t-mvtc.s b/sim/testsuite/d10v/t-mvtc.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-mvtc.s
rename to sim/testsuite/d10v/t-mvtc.s

diff --git a/sim/testsuite/sim/d10v/t-rac.s b/sim/testsuite/d10v/t-rac.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-rac.s
rename to sim/testsuite/d10v/t-rac.s

diff --git a/sim/testsuite/sim/d10v/t-rachi.s b/sim/testsuite/d10v/t-rachi.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-rachi.s
rename to sim/testsuite/d10v/t-rachi.s

diff --git a/sim/testsuite/sim/d10v/t-rdt.s b/sim/testsuite/d10v/t-rdt.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-rdt.s
rename to sim/testsuite/d10v/t-rdt.s

diff --git a/sim/testsuite/sim/d10v/t-rep.s b/sim/testsuite/d10v/t-rep.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-rep.s
rename to sim/testsuite/d10v/t-rep.s

diff --git a/sim/testsuite/sim/d10v/t-rie-xx.s b/sim/testsuite/d10v/t-rie-xx.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-rie-xx.s
rename to sim/testsuite/d10v/t-rie-xx.s

diff --git a/sim/testsuite/sim/d10v/t-rte.s b/sim/testsuite/d10v/t-rte.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-rte.s
rename to sim/testsuite/d10v/t-rte.s

diff --git a/sim/testsuite/sim/d10v/t-sac.s b/sim/testsuite/d10v/t-sac.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-sac.s
rename to sim/testsuite/d10v/t-sac.s

diff --git a/sim/testsuite/sim/d10v/t-sachi.s b/sim/testsuite/d10v/t-sachi.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-sachi.s
rename to sim/testsuite/d10v/t-sachi.s

diff --git a/sim/testsuite/sim/d10v/t-sadd.s b/sim/testsuite/d10v/t-sadd.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-sadd.s
rename to sim/testsuite/d10v/t-sadd.s

diff --git a/sim/testsuite/sim/d10v/t-slae.s b/sim/testsuite/d10v/t-slae.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-slae.s
rename to sim/testsuite/d10v/t-slae.s

diff --git a/sim/testsuite/sim/d10v/t-sp.s b/sim/testsuite/d10v/t-sp.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-sp.s
rename to sim/testsuite/d10v/t-sp.s

diff --git a/sim/testsuite/sim/d10v/t-sub.s b/sim/testsuite/d10v/t-sub.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-sub.s
rename to sim/testsuite/d10v/t-sub.s

diff --git a/sim/testsuite/sim/d10v/t-sub2w.s b/sim/testsuite/d10v/t-sub2w.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-sub2w.s
rename to sim/testsuite/d10v/t-sub2w.s

diff --git a/sim/testsuite/sim/d10v/t-subi.s b/sim/testsuite/d10v/t-subi.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-subi.s
rename to sim/testsuite/d10v/t-subi.s

diff --git a/sim/testsuite/sim/d10v/t-trap.s b/sim/testsuite/d10v/t-trap.s
similarity index 100%
rename from sim/testsuite/sim/d10v/t-trap.s
rename to sim/testsuite/d10v/t-trap.s

diff --git a/sim/testsuite/sim/frv/ChangeLog b/sim/testsuite/frv/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/frv/ChangeLog
rename to sim/testsuite/frv/ChangeLog

diff --git a/sim/testsuite/sim/frv/add.cgs b/sim/testsuite/frv/add.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/add.cgs
rename to sim/testsuite/frv/add.cgs

diff --git a/sim/testsuite/sim/frv/add.pcgs b/sim/testsuite/frv/add.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/add.pcgs
rename to sim/testsuite/frv/add.pcgs

diff --git a/sim/testsuite/sim/frv/addcc.cgs b/sim/testsuite/frv/addcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/addcc.cgs
rename to sim/testsuite/frv/addcc.cgs

diff --git a/sim/testsuite/sim/frv/addi.cgs b/sim/testsuite/frv/addi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/addi.cgs
rename to sim/testsuite/frv/addi.cgs

diff --git a/sim/testsuite/sim/frv/addicc.cgs b/sim/testsuite/frv/addicc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/addicc.cgs
rename to sim/testsuite/frv/addicc.cgs

diff --git a/sim/testsuite/sim/frv/addx.cgs b/sim/testsuite/frv/addx.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/addx.cgs
rename to sim/testsuite/frv/addx.cgs

diff --git a/sim/testsuite/sim/frv/addxcc.cgs b/sim/testsuite/frv/addxcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/addxcc.cgs
rename to sim/testsuite/frv/addxcc.cgs

diff --git a/sim/testsuite/sim/frv/addxi.cgs b/sim/testsuite/frv/addxi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/addxi.cgs
rename to sim/testsuite/frv/addxi.cgs

diff --git a/sim/testsuite/sim/frv/addxicc.cgs b/sim/testsuite/frv/addxicc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/addxicc.cgs
rename to sim/testsuite/frv/addxicc.cgs

diff --git a/sim/testsuite/sim/frv/allinsn.exp b/sim/testsuite/frv/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/frv/allinsn.exp
rename to sim/testsuite/frv/allinsn.exp

diff --git a/sim/testsuite/sim/frv/and.cgs b/sim/testsuite/frv/and.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/and.cgs
rename to sim/testsuite/frv/and.cgs

diff --git a/sim/testsuite/sim/frv/andcc.cgs b/sim/testsuite/frv/andcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/andcc.cgs
rename to sim/testsuite/frv/andcc.cgs

diff --git a/sim/testsuite/sim/frv/andcr.cgs b/sim/testsuite/frv/andcr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/andcr.cgs
rename to sim/testsuite/frv/andcr.cgs

diff --git a/sim/testsuite/sim/frv/andi.cgs b/sim/testsuite/frv/andi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/andi.cgs
rename to sim/testsuite/frv/andi.cgs

diff --git a/sim/testsuite/sim/frv/andicc.cgs b/sim/testsuite/frv/andicc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/andicc.cgs
rename to sim/testsuite/frv/andicc.cgs

diff --git a/sim/testsuite/sim/frv/andncr.cgs b/sim/testsuite/frv/andncr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/andncr.cgs
rename to sim/testsuite/frv/andncr.cgs

diff --git a/sim/testsuite/sim/frv/bar.cgs b/sim/testsuite/frv/bar.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bar.cgs
rename to sim/testsuite/frv/bar.cgs

diff --git a/sim/testsuite/sim/frv/bc.cgs b/sim/testsuite/frv/bc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bc.cgs
rename to sim/testsuite/frv/bc.cgs

diff --git a/sim/testsuite/sim/frv/bcclr.cgs b/sim/testsuite/frv/bcclr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcclr.cgs
rename to sim/testsuite/frv/bcclr.cgs

diff --git a/sim/testsuite/sim/frv/bceqlr.cgs b/sim/testsuite/frv/bceqlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bceqlr.cgs
rename to sim/testsuite/frv/bceqlr.cgs

diff --git a/sim/testsuite/sim/frv/bcgelr.cgs b/sim/testsuite/frv/bcgelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcgelr.cgs
rename to sim/testsuite/frv/bcgelr.cgs

diff --git a/sim/testsuite/sim/frv/bcgtlr.cgs b/sim/testsuite/frv/bcgtlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcgtlr.cgs
rename to sim/testsuite/frv/bcgtlr.cgs

diff --git a/sim/testsuite/sim/frv/bchilr.cgs b/sim/testsuite/frv/bchilr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bchilr.cgs
rename to sim/testsuite/frv/bchilr.cgs

diff --git a/sim/testsuite/sim/frv/bclelr.cgs b/sim/testsuite/frv/bclelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bclelr.cgs
rename to sim/testsuite/frv/bclelr.cgs

diff --git a/sim/testsuite/sim/frv/bclr.cgs b/sim/testsuite/frv/bclr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bclr.cgs
rename to sim/testsuite/frv/bclr.cgs

diff --git a/sim/testsuite/sim/frv/bclslr.cgs b/sim/testsuite/frv/bclslr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bclslr.cgs
rename to sim/testsuite/frv/bclslr.cgs

diff --git a/sim/testsuite/sim/frv/bcltlr.cgs b/sim/testsuite/frv/bcltlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcltlr.cgs
rename to sim/testsuite/frv/bcltlr.cgs

diff --git a/sim/testsuite/sim/frv/bcnclr.cgs b/sim/testsuite/frv/bcnclr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcnclr.cgs
rename to sim/testsuite/frv/bcnclr.cgs

diff --git a/sim/testsuite/sim/frv/bcnelr.cgs b/sim/testsuite/frv/bcnelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcnelr.cgs
rename to sim/testsuite/frv/bcnelr.cgs

diff --git a/sim/testsuite/sim/frv/bcnlr.cgs b/sim/testsuite/frv/bcnlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcnlr.cgs
rename to sim/testsuite/frv/bcnlr.cgs

diff --git a/sim/testsuite/sim/frv/bcnolr.cgs b/sim/testsuite/frv/bcnolr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcnolr.cgs
rename to sim/testsuite/frv/bcnolr.cgs

diff --git a/sim/testsuite/sim/frv/bcnvlr.cgs b/sim/testsuite/frv/bcnvlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcnvlr.cgs
rename to sim/testsuite/frv/bcnvlr.cgs

diff --git a/sim/testsuite/sim/frv/bcplr.cgs b/sim/testsuite/frv/bcplr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcplr.cgs
rename to sim/testsuite/frv/bcplr.cgs

diff --git a/sim/testsuite/sim/frv/bcralr.cgs b/sim/testsuite/frv/bcralr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcralr.cgs
rename to sim/testsuite/frv/bcralr.cgs

diff --git a/sim/testsuite/sim/frv/bctrlr.cgs b/sim/testsuite/frv/bctrlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bctrlr.cgs
rename to sim/testsuite/frv/bctrlr.cgs

diff --git a/sim/testsuite/sim/frv/bcvlr.cgs b/sim/testsuite/frv/bcvlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bcvlr.cgs
rename to sim/testsuite/frv/bcvlr.cgs

diff --git a/sim/testsuite/sim/frv/beq.cgs b/sim/testsuite/frv/beq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/beq.cgs
rename to sim/testsuite/frv/beq.cgs

diff --git a/sim/testsuite/sim/frv/beqlr.cgs b/sim/testsuite/frv/beqlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/beqlr.cgs
rename to sim/testsuite/frv/beqlr.cgs

diff --git a/sim/testsuite/sim/frv/bge.cgs b/sim/testsuite/frv/bge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bge.cgs
rename to sim/testsuite/frv/bge.cgs

diff --git a/sim/testsuite/sim/frv/bgelr.cgs b/sim/testsuite/frv/bgelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bgelr.cgs
rename to sim/testsuite/frv/bgelr.cgs

diff --git a/sim/testsuite/sim/frv/bgt.cgs b/sim/testsuite/frv/bgt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bgt.cgs
rename to sim/testsuite/frv/bgt.cgs

diff --git a/sim/testsuite/sim/frv/bgtlr.cgs b/sim/testsuite/frv/bgtlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bgtlr.cgs
rename to sim/testsuite/frv/bgtlr.cgs

diff --git a/sim/testsuite/sim/frv/bhi.cgs b/sim/testsuite/frv/bhi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bhi.cgs
rename to sim/testsuite/frv/bhi.cgs

diff --git a/sim/testsuite/sim/frv/bhilr.cgs b/sim/testsuite/frv/bhilr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bhilr.cgs
rename to sim/testsuite/frv/bhilr.cgs

diff --git a/sim/testsuite/sim/frv/ble.cgs b/sim/testsuite/frv/ble.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ble.cgs
rename to sim/testsuite/frv/ble.cgs

diff --git a/sim/testsuite/sim/frv/blelr.cgs b/sim/testsuite/frv/blelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/blelr.cgs
rename to sim/testsuite/frv/blelr.cgs

diff --git a/sim/testsuite/sim/frv/bls.cgs b/sim/testsuite/frv/bls.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bls.cgs
rename to sim/testsuite/frv/bls.cgs

diff --git a/sim/testsuite/sim/frv/blslr.cgs b/sim/testsuite/frv/blslr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/blslr.cgs
rename to sim/testsuite/frv/blslr.cgs

diff --git a/sim/testsuite/sim/frv/blt.cgs b/sim/testsuite/frv/blt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/blt.cgs
rename to sim/testsuite/frv/blt.cgs

diff --git a/sim/testsuite/sim/frv/bltlr.cgs b/sim/testsuite/frv/bltlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bltlr.cgs
rename to sim/testsuite/frv/bltlr.cgs

diff --git a/sim/testsuite/sim/frv/bn.cgs b/sim/testsuite/frv/bn.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bn.cgs
rename to sim/testsuite/frv/bn.cgs

diff --git a/sim/testsuite/sim/frv/bnc.cgs b/sim/testsuite/frv/bnc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bnc.cgs
rename to sim/testsuite/frv/bnc.cgs

diff --git a/sim/testsuite/sim/frv/bnclr.cgs b/sim/testsuite/frv/bnclr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bnclr.cgs
rename to sim/testsuite/frv/bnclr.cgs

diff --git a/sim/testsuite/sim/frv/bne.cgs b/sim/testsuite/frv/bne.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bne.cgs
rename to sim/testsuite/frv/bne.cgs

diff --git a/sim/testsuite/sim/frv/bnelr.cgs b/sim/testsuite/frv/bnelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bnelr.cgs
rename to sim/testsuite/frv/bnelr.cgs

diff --git a/sim/testsuite/sim/frv/bnlr.cgs b/sim/testsuite/frv/bnlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bnlr.cgs
rename to sim/testsuite/frv/bnlr.cgs

diff --git a/sim/testsuite/sim/frv/bno.cgs b/sim/testsuite/frv/bno.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bno.cgs
rename to sim/testsuite/frv/bno.cgs

diff --git a/sim/testsuite/sim/frv/bnolr.cgs b/sim/testsuite/frv/bnolr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bnolr.cgs
rename to sim/testsuite/frv/bnolr.cgs

diff --git a/sim/testsuite/sim/frv/bnv.cgs b/sim/testsuite/frv/bnv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bnv.cgs
rename to sim/testsuite/frv/bnv.cgs

diff --git a/sim/testsuite/sim/frv/bnvlr.cgs b/sim/testsuite/frv/bnvlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bnvlr.cgs
rename to sim/testsuite/frv/bnvlr.cgs

diff --git a/sim/testsuite/sim/frv/bp.cgs b/sim/testsuite/frv/bp.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bp.cgs
rename to sim/testsuite/frv/bp.cgs

diff --git a/sim/testsuite/sim/frv/bplr.cgs b/sim/testsuite/frv/bplr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bplr.cgs
rename to sim/testsuite/frv/bplr.cgs

diff --git a/sim/testsuite/sim/frv/bra.cgs b/sim/testsuite/frv/bra.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bra.cgs
rename to sim/testsuite/frv/bra.cgs

diff --git a/sim/testsuite/sim/frv/bralr.cgs b/sim/testsuite/frv/bralr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bralr.cgs
rename to sim/testsuite/frv/bralr.cgs

diff --git a/sim/testsuite/sim/frv/branch.pcgs b/sim/testsuite/frv/branch.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/branch.pcgs
rename to sim/testsuite/frv/branch.pcgs

diff --git a/sim/testsuite/sim/frv/break.cgs b/sim/testsuite/frv/break.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/break.cgs
rename to sim/testsuite/frv/break.cgs

diff --git a/sim/testsuite/sim/frv/bv.cgs b/sim/testsuite/frv/bv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bv.cgs
rename to sim/testsuite/frv/bv.cgs

diff --git a/sim/testsuite/sim/frv/bvlr.cgs b/sim/testsuite/frv/bvlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/bvlr.cgs
rename to sim/testsuite/frv/bvlr.cgs

diff --git a/sim/testsuite/sim/frv/cache.ms b/sim/testsuite/frv/cache.ms
similarity index 100%
rename from sim/testsuite/sim/frv/cache.ms
rename to sim/testsuite/frv/cache.ms

diff --git a/sim/testsuite/sim/frv/cadd.cgs b/sim/testsuite/frv/cadd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cadd.cgs
rename to sim/testsuite/frv/cadd.cgs

diff --git a/sim/testsuite/sim/frv/caddcc.cgs b/sim/testsuite/frv/caddcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/caddcc.cgs
rename to sim/testsuite/frv/caddcc.cgs

diff --git a/sim/testsuite/sim/frv/call.cgs b/sim/testsuite/frv/call.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/call.cgs
rename to sim/testsuite/frv/call.cgs

diff --git a/sim/testsuite/sim/frv/call.pcgs b/sim/testsuite/frv/call.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/call.pcgs
rename to sim/testsuite/frv/call.pcgs

diff --git a/sim/testsuite/sim/frv/callil.cgs b/sim/testsuite/frv/callil.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/callil.cgs
rename to sim/testsuite/frv/callil.cgs

diff --git a/sim/testsuite/sim/frv/calll.cgs b/sim/testsuite/frv/calll.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/calll.cgs
rename to sim/testsuite/frv/calll.cgs

diff --git a/sim/testsuite/sim/frv/cand.cgs b/sim/testsuite/frv/cand.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cand.cgs
rename to sim/testsuite/frv/cand.cgs

diff --git a/sim/testsuite/sim/frv/candcc.cgs b/sim/testsuite/frv/candcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/candcc.cgs
rename to sim/testsuite/frv/candcc.cgs

diff --git a/sim/testsuite/sim/frv/ccalll.cgs b/sim/testsuite/frv/ccalll.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ccalll.cgs
rename to sim/testsuite/frv/ccalll.cgs

diff --git a/sim/testsuite/sim/frv/cckc.cgs b/sim/testsuite/frv/cckc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckc.cgs
rename to sim/testsuite/frv/cckc.cgs

diff --git a/sim/testsuite/sim/frv/cckeq.cgs b/sim/testsuite/frv/cckeq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckeq.cgs
rename to sim/testsuite/frv/cckeq.cgs

diff --git a/sim/testsuite/sim/frv/cckge.cgs b/sim/testsuite/frv/cckge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckge.cgs
rename to sim/testsuite/frv/cckge.cgs

diff --git a/sim/testsuite/sim/frv/cckgt.cgs b/sim/testsuite/frv/cckgt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckgt.cgs
rename to sim/testsuite/frv/cckgt.cgs

diff --git a/sim/testsuite/sim/frv/cckhi.cgs b/sim/testsuite/frv/cckhi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckhi.cgs
rename to sim/testsuite/frv/cckhi.cgs

diff --git a/sim/testsuite/sim/frv/cckle.cgs b/sim/testsuite/frv/cckle.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckle.cgs
rename to sim/testsuite/frv/cckle.cgs

diff --git a/sim/testsuite/sim/frv/cckls.cgs b/sim/testsuite/frv/cckls.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckls.cgs
rename to sim/testsuite/frv/cckls.cgs

diff --git a/sim/testsuite/sim/frv/ccklt.cgs b/sim/testsuite/frv/ccklt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ccklt.cgs
rename to sim/testsuite/frv/ccklt.cgs

diff --git a/sim/testsuite/sim/frv/cckn.cgs b/sim/testsuite/frv/cckn.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckn.cgs
rename to sim/testsuite/frv/cckn.cgs

diff --git a/sim/testsuite/sim/frv/ccknc.cgs b/sim/testsuite/frv/ccknc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ccknc.cgs
rename to sim/testsuite/frv/ccknc.cgs

diff --git a/sim/testsuite/sim/frv/cckne.cgs b/sim/testsuite/frv/cckne.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckne.cgs
rename to sim/testsuite/frv/cckne.cgs

diff --git a/sim/testsuite/sim/frv/cckno.cgs b/sim/testsuite/frv/cckno.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckno.cgs
rename to sim/testsuite/frv/cckno.cgs

diff --git a/sim/testsuite/sim/frv/ccknv.cgs b/sim/testsuite/frv/ccknv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ccknv.cgs
rename to sim/testsuite/frv/ccknv.cgs

diff --git a/sim/testsuite/sim/frv/cckp.cgs b/sim/testsuite/frv/cckp.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckp.cgs
rename to sim/testsuite/frv/cckp.cgs

diff --git a/sim/testsuite/sim/frv/cckra.cgs b/sim/testsuite/frv/cckra.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckra.cgs
rename to sim/testsuite/frv/cckra.cgs

diff --git a/sim/testsuite/sim/frv/cckv.cgs b/sim/testsuite/frv/cckv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cckv.cgs
rename to sim/testsuite/frv/cckv.cgs

diff --git a/sim/testsuite/sim/frv/ccmp.cgs b/sim/testsuite/frv/ccmp.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ccmp.cgs
rename to sim/testsuite/frv/ccmp.cgs

diff --git a/sim/testsuite/sim/frv/cfabss.cgs b/sim/testsuite/frv/cfabss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfabss.cgs
rename to sim/testsuite/frv/cfabss.cgs

diff --git a/sim/testsuite/sim/frv/cfadds.cgs b/sim/testsuite/frv/cfadds.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfadds.cgs
rename to sim/testsuite/frv/cfadds.cgs

diff --git a/sim/testsuite/sim/frv/cfckeq.cgs b/sim/testsuite/frv/cfckeq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckeq.cgs
rename to sim/testsuite/frv/cfckeq.cgs

diff --git a/sim/testsuite/sim/frv/cfckge.cgs b/sim/testsuite/frv/cfckge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckge.cgs
rename to sim/testsuite/frv/cfckge.cgs

diff --git a/sim/testsuite/sim/frv/cfckgt.cgs b/sim/testsuite/frv/cfckgt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckgt.cgs
rename to sim/testsuite/frv/cfckgt.cgs

diff --git a/sim/testsuite/sim/frv/cfckle.cgs b/sim/testsuite/frv/cfckle.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckle.cgs
rename to sim/testsuite/frv/cfckle.cgs

diff --git a/sim/testsuite/sim/frv/cfcklg.cgs b/sim/testsuite/frv/cfcklg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfcklg.cgs
rename to sim/testsuite/frv/cfcklg.cgs

diff --git a/sim/testsuite/sim/frv/cfcklt.cgs b/sim/testsuite/frv/cfcklt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfcklt.cgs
rename to sim/testsuite/frv/cfcklt.cgs

diff --git a/sim/testsuite/sim/frv/cfckne.cgs b/sim/testsuite/frv/cfckne.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckne.cgs
rename to sim/testsuite/frv/cfckne.cgs

diff --git a/sim/testsuite/sim/frv/cfckno.cgs b/sim/testsuite/frv/cfckno.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckno.cgs
rename to sim/testsuite/frv/cfckno.cgs

diff --git a/sim/testsuite/sim/frv/cfcko.cgs b/sim/testsuite/frv/cfcko.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfcko.cgs
rename to sim/testsuite/frv/cfcko.cgs

diff --git a/sim/testsuite/sim/frv/cfckra.cgs b/sim/testsuite/frv/cfckra.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckra.cgs
rename to sim/testsuite/frv/cfckra.cgs

diff --git a/sim/testsuite/sim/frv/cfcku.cgs b/sim/testsuite/frv/cfcku.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfcku.cgs
rename to sim/testsuite/frv/cfcku.cgs

diff --git a/sim/testsuite/sim/frv/cfckue.cgs b/sim/testsuite/frv/cfckue.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckue.cgs
rename to sim/testsuite/frv/cfckue.cgs

diff --git a/sim/testsuite/sim/frv/cfckug.cgs b/sim/testsuite/frv/cfckug.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckug.cgs
rename to sim/testsuite/frv/cfckug.cgs

diff --git a/sim/testsuite/sim/frv/cfckuge.cgs b/sim/testsuite/frv/cfckuge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckuge.cgs
rename to sim/testsuite/frv/cfckuge.cgs

diff --git a/sim/testsuite/sim/frv/cfckul.cgs b/sim/testsuite/frv/cfckul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckul.cgs
rename to sim/testsuite/frv/cfckul.cgs

diff --git a/sim/testsuite/sim/frv/cfckule.cgs b/sim/testsuite/frv/cfckule.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfckule.cgs
rename to sim/testsuite/frv/cfckule.cgs

diff --git a/sim/testsuite/sim/frv/cfcmps.cgs b/sim/testsuite/frv/cfcmps.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfcmps.cgs
rename to sim/testsuite/frv/cfcmps.cgs

diff --git a/sim/testsuite/sim/frv/cfdivs.cgs b/sim/testsuite/frv/cfdivs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfdivs.cgs
rename to sim/testsuite/frv/cfdivs.cgs

diff --git a/sim/testsuite/sim/frv/cfitos.cgs b/sim/testsuite/frv/cfitos.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfitos.cgs
rename to sim/testsuite/frv/cfitos.cgs

diff --git a/sim/testsuite/sim/frv/cfmadds.cgs b/sim/testsuite/frv/cfmadds.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfmadds.cgs
rename to sim/testsuite/frv/cfmadds.cgs

diff --git a/sim/testsuite/sim/frv/cfmas.cgs b/sim/testsuite/frv/cfmas.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfmas.cgs
rename to sim/testsuite/frv/cfmas.cgs

diff --git a/sim/testsuite/sim/frv/cfmovs.cgs b/sim/testsuite/frv/cfmovs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfmovs.cgs
rename to sim/testsuite/frv/cfmovs.cgs

diff --git a/sim/testsuite/sim/frv/cfmss.cgs b/sim/testsuite/frv/cfmss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfmss.cgs
rename to sim/testsuite/frv/cfmss.cgs

diff --git a/sim/testsuite/sim/frv/cfmsubs.cgs b/sim/testsuite/frv/cfmsubs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfmsubs.cgs
rename to sim/testsuite/frv/cfmsubs.cgs

diff --git a/sim/testsuite/sim/frv/cfmuls.cgs b/sim/testsuite/frv/cfmuls.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfmuls.cgs
rename to sim/testsuite/frv/cfmuls.cgs

diff --git a/sim/testsuite/sim/frv/cfnegs.cgs b/sim/testsuite/frv/cfnegs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfnegs.cgs
rename to sim/testsuite/frv/cfnegs.cgs

diff --git a/sim/testsuite/sim/frv/cfsqrts.cgs b/sim/testsuite/frv/cfsqrts.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfsqrts.cgs
rename to sim/testsuite/frv/cfsqrts.cgs

diff --git a/sim/testsuite/sim/frv/cfstoi.cgs b/sim/testsuite/frv/cfstoi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfstoi.cgs
rename to sim/testsuite/frv/cfstoi.cgs

diff --git a/sim/testsuite/sim/frv/cfsubs.cgs b/sim/testsuite/frv/cfsubs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cfsubs.cgs
rename to sim/testsuite/frv/cfsubs.cgs

diff --git a/sim/testsuite/sim/frv/cjmpl.cgs b/sim/testsuite/frv/cjmpl.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cjmpl.cgs
rename to sim/testsuite/frv/cjmpl.cgs

diff --git a/sim/testsuite/sim/frv/ckc.cgs b/sim/testsuite/frv/ckc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckc.cgs
rename to sim/testsuite/frv/ckc.cgs

diff --git a/sim/testsuite/sim/frv/ckeq.cgs b/sim/testsuite/frv/ckeq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckeq.cgs
rename to sim/testsuite/frv/ckeq.cgs

diff --git a/sim/testsuite/sim/frv/ckge.cgs b/sim/testsuite/frv/ckge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckge.cgs
rename to sim/testsuite/frv/ckge.cgs

diff --git a/sim/testsuite/sim/frv/ckgt.cgs b/sim/testsuite/frv/ckgt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckgt.cgs
rename to sim/testsuite/frv/ckgt.cgs

diff --git a/sim/testsuite/sim/frv/ckhi.cgs b/sim/testsuite/frv/ckhi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckhi.cgs
rename to sim/testsuite/frv/ckhi.cgs

diff --git a/sim/testsuite/sim/frv/ckle.cgs b/sim/testsuite/frv/ckle.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckle.cgs
rename to sim/testsuite/frv/ckle.cgs

diff --git a/sim/testsuite/sim/frv/ckls.cgs b/sim/testsuite/frv/ckls.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckls.cgs
rename to sim/testsuite/frv/ckls.cgs

diff --git a/sim/testsuite/sim/frv/cklt.cgs b/sim/testsuite/frv/cklt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cklt.cgs
rename to sim/testsuite/frv/cklt.cgs

diff --git a/sim/testsuite/sim/frv/ckn.cgs b/sim/testsuite/frv/ckn.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckn.cgs
rename to sim/testsuite/frv/ckn.cgs

diff --git a/sim/testsuite/sim/frv/cknc.cgs b/sim/testsuite/frv/cknc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cknc.cgs
rename to sim/testsuite/frv/cknc.cgs

diff --git a/sim/testsuite/sim/frv/ckne.cgs b/sim/testsuite/frv/ckne.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckne.cgs
rename to sim/testsuite/frv/ckne.cgs

diff --git a/sim/testsuite/sim/frv/ckno.cgs b/sim/testsuite/frv/ckno.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckno.cgs
rename to sim/testsuite/frv/ckno.cgs

diff --git a/sim/testsuite/sim/frv/cknv.cgs b/sim/testsuite/frv/cknv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cknv.cgs
rename to sim/testsuite/frv/cknv.cgs

diff --git a/sim/testsuite/sim/frv/ckp.cgs b/sim/testsuite/frv/ckp.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckp.cgs
rename to sim/testsuite/frv/ckp.cgs

diff --git a/sim/testsuite/sim/frv/ckra.cgs b/sim/testsuite/frv/ckra.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckra.cgs
rename to sim/testsuite/frv/ckra.cgs

diff --git a/sim/testsuite/sim/frv/ckv.cgs b/sim/testsuite/frv/ckv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ckv.cgs
rename to sim/testsuite/frv/ckv.cgs

diff --git a/sim/testsuite/sim/frv/cld.cgs b/sim/testsuite/frv/cld.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cld.cgs
rename to sim/testsuite/frv/cld.cgs

diff --git a/sim/testsuite/sim/frv/cldbf.cgs b/sim/testsuite/frv/cldbf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldbf.cgs
rename to sim/testsuite/frv/cldbf.cgs

diff --git a/sim/testsuite/sim/frv/cldbfu.cgs b/sim/testsuite/frv/cldbfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldbfu.cgs
rename to sim/testsuite/frv/cldbfu.cgs

diff --git a/sim/testsuite/sim/frv/cldd.cgs b/sim/testsuite/frv/cldd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldd.cgs
rename to sim/testsuite/frv/cldd.cgs

diff --git a/sim/testsuite/sim/frv/clddf.cgs b/sim/testsuite/frv/clddf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/clddf.cgs
rename to sim/testsuite/frv/clddf.cgs

diff --git a/sim/testsuite/sim/frv/clddfu.cgs b/sim/testsuite/frv/clddfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/clddfu.cgs
rename to sim/testsuite/frv/clddfu.cgs

diff --git a/sim/testsuite/sim/frv/clddu.cgs b/sim/testsuite/frv/clddu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/clddu.cgs
rename to sim/testsuite/frv/clddu.cgs

diff --git a/sim/testsuite/sim/frv/cldf.cgs b/sim/testsuite/frv/cldf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldf.cgs
rename to sim/testsuite/frv/cldf.cgs

diff --git a/sim/testsuite/sim/frv/cldfu.cgs b/sim/testsuite/frv/cldfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldfu.cgs
rename to sim/testsuite/frv/cldfu.cgs

diff --git a/sim/testsuite/sim/frv/cldhf.cgs b/sim/testsuite/frv/cldhf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldhf.cgs
rename to sim/testsuite/frv/cldhf.cgs

diff --git a/sim/testsuite/sim/frv/cldhfu.cgs b/sim/testsuite/frv/cldhfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldhfu.cgs
rename to sim/testsuite/frv/cldhfu.cgs

diff --git a/sim/testsuite/sim/frv/cldq.cgs b/sim/testsuite/frv/cldq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldq.cgs
rename to sim/testsuite/frv/cldq.cgs

diff --git a/sim/testsuite/sim/frv/cldqu.cgs b/sim/testsuite/frv/cldqu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldqu.cgs
rename to sim/testsuite/frv/cldqu.cgs

diff --git a/sim/testsuite/sim/frv/cldsb.cgs b/sim/testsuite/frv/cldsb.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldsb.cgs
rename to sim/testsuite/frv/cldsb.cgs

diff --git a/sim/testsuite/sim/frv/cldsbu.cgs b/sim/testsuite/frv/cldsbu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldsbu.cgs
rename to sim/testsuite/frv/cldsbu.cgs

diff --git a/sim/testsuite/sim/frv/cldsh.cgs b/sim/testsuite/frv/cldsh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldsh.cgs
rename to sim/testsuite/frv/cldsh.cgs

diff --git a/sim/testsuite/sim/frv/cldshu.cgs b/sim/testsuite/frv/cldshu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldshu.cgs
rename to sim/testsuite/frv/cldshu.cgs

diff --git a/sim/testsuite/sim/frv/cldu.cgs b/sim/testsuite/frv/cldu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldu.cgs
rename to sim/testsuite/frv/cldu.cgs

diff --git a/sim/testsuite/sim/frv/cldub.cgs b/sim/testsuite/frv/cldub.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldub.cgs
rename to sim/testsuite/frv/cldub.cgs

diff --git a/sim/testsuite/sim/frv/cldubu.cgs b/sim/testsuite/frv/cldubu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cldubu.cgs
rename to sim/testsuite/frv/cldubu.cgs

diff --git a/sim/testsuite/sim/frv/clduh.cgs b/sim/testsuite/frv/clduh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/clduh.cgs
rename to sim/testsuite/frv/clduh.cgs

diff --git a/sim/testsuite/sim/frv/clduhu.cgs b/sim/testsuite/frv/clduhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/clduhu.cgs
rename to sim/testsuite/frv/clduhu.cgs

diff --git a/sim/testsuite/sim/frv/clrfa.cgs b/sim/testsuite/frv/clrfa.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/clrfa.cgs
rename to sim/testsuite/frv/clrfa.cgs

diff --git a/sim/testsuite/sim/frv/clrfr.cgs b/sim/testsuite/frv/clrfr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/clrfr.cgs
rename to sim/testsuite/frv/clrfr.cgs

diff --git a/sim/testsuite/sim/frv/clrga.cgs b/sim/testsuite/frv/clrga.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/clrga.cgs
rename to sim/testsuite/frv/clrga.cgs

diff --git a/sim/testsuite/sim/frv/clrgr.cgs b/sim/testsuite/frv/clrgr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/clrgr.cgs
rename to sim/testsuite/frv/clrgr.cgs

diff --git a/sim/testsuite/sim/frv/cmaddhss.cgs b/sim/testsuite/frv/cmaddhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmaddhss.cgs
rename to sim/testsuite/frv/cmaddhss.cgs

diff --git a/sim/testsuite/sim/frv/cmaddhus.cgs b/sim/testsuite/frv/cmaddhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmaddhus.cgs
rename to sim/testsuite/frv/cmaddhus.cgs

diff --git a/sim/testsuite/sim/frv/cmand.cgs b/sim/testsuite/frv/cmand.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmand.cgs
rename to sim/testsuite/frv/cmand.cgs

diff --git a/sim/testsuite/sim/frv/cmbtoh.cgs b/sim/testsuite/frv/cmbtoh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmbtoh.cgs
rename to sim/testsuite/frv/cmbtoh.cgs

diff --git a/sim/testsuite/sim/frv/cmbtohe.cgs b/sim/testsuite/frv/cmbtohe.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmbtohe.cgs
rename to sim/testsuite/frv/cmbtohe.cgs

diff --git a/sim/testsuite/sim/frv/cmcpxis.cgs b/sim/testsuite/frv/cmcpxis.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmcpxis.cgs
rename to sim/testsuite/frv/cmcpxis.cgs

diff --git a/sim/testsuite/sim/frv/cmcpxiu.cgs b/sim/testsuite/frv/cmcpxiu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmcpxiu.cgs
rename to sim/testsuite/frv/cmcpxiu.cgs

diff --git a/sim/testsuite/sim/frv/cmcpxrs.cgs b/sim/testsuite/frv/cmcpxrs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmcpxrs.cgs
rename to sim/testsuite/frv/cmcpxrs.cgs

diff --git a/sim/testsuite/sim/frv/cmcpxru.cgs b/sim/testsuite/frv/cmcpxru.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmcpxru.cgs
rename to sim/testsuite/frv/cmcpxru.cgs

diff --git a/sim/testsuite/sim/frv/cmexpdhd.cgs b/sim/testsuite/frv/cmexpdhd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmexpdhd.cgs
rename to sim/testsuite/frv/cmexpdhd.cgs

diff --git a/sim/testsuite/sim/frv/cmexpdhw.cgs b/sim/testsuite/frv/cmexpdhw.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmexpdhw.cgs
rename to sim/testsuite/frv/cmexpdhw.cgs

diff --git a/sim/testsuite/sim/frv/cmhtob.cgs b/sim/testsuite/frv/cmhtob.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmhtob.cgs
rename to sim/testsuite/frv/cmhtob.cgs

diff --git a/sim/testsuite/sim/frv/cmmachs.cgs b/sim/testsuite/frv/cmmachs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmmachs.cgs
rename to sim/testsuite/frv/cmmachs.cgs

diff --git a/sim/testsuite/sim/frv/cmmachu.cgs b/sim/testsuite/frv/cmmachu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmmachu.cgs
rename to sim/testsuite/frv/cmmachu.cgs

diff --git a/sim/testsuite/sim/frv/cmmulhs.cgs b/sim/testsuite/frv/cmmulhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmmulhs.cgs
rename to sim/testsuite/frv/cmmulhs.cgs

diff --git a/sim/testsuite/sim/frv/cmmulhu.cgs b/sim/testsuite/frv/cmmulhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmmulhu.cgs
rename to sim/testsuite/frv/cmmulhu.cgs

diff --git a/sim/testsuite/sim/frv/cmnot.cgs b/sim/testsuite/frv/cmnot.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmnot.cgs
rename to sim/testsuite/frv/cmnot.cgs

diff --git a/sim/testsuite/sim/frv/cmor.cgs b/sim/testsuite/frv/cmor.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmor.cgs
rename to sim/testsuite/frv/cmor.cgs

diff --git a/sim/testsuite/sim/frv/cmov.cgs b/sim/testsuite/frv/cmov.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmov.cgs
rename to sim/testsuite/frv/cmov.cgs

diff --git a/sim/testsuite/sim/frv/cmovfg.cgs b/sim/testsuite/frv/cmovfg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmovfg.cgs
rename to sim/testsuite/frv/cmovfg.cgs

diff --git a/sim/testsuite/sim/frv/cmovfgd.cgs b/sim/testsuite/frv/cmovfgd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmovfgd.cgs
rename to sim/testsuite/frv/cmovfgd.cgs

diff --git a/sim/testsuite/sim/frv/cmovgf.cgs b/sim/testsuite/frv/cmovgf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmovgf.cgs
rename to sim/testsuite/frv/cmovgf.cgs

diff --git a/sim/testsuite/sim/frv/cmovgfd.cgs b/sim/testsuite/frv/cmovgfd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmovgfd.cgs
rename to sim/testsuite/frv/cmovgfd.cgs

diff --git a/sim/testsuite/sim/frv/cmp.cgs b/sim/testsuite/frv/cmp.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmp.cgs
rename to sim/testsuite/frv/cmp.cgs

diff --git a/sim/testsuite/sim/frv/cmpb.cgs b/sim/testsuite/frv/cmpb.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmpb.cgs
rename to sim/testsuite/frv/cmpb.cgs

diff --git a/sim/testsuite/sim/frv/cmpba.cgs b/sim/testsuite/frv/cmpba.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmpba.cgs
rename to sim/testsuite/frv/cmpba.cgs

diff --git a/sim/testsuite/sim/frv/cmpi.cgs b/sim/testsuite/frv/cmpi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmpi.cgs
rename to sim/testsuite/frv/cmpi.cgs

diff --git a/sim/testsuite/sim/frv/cmqmachs.cgs b/sim/testsuite/frv/cmqmachs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmqmachs.cgs
rename to sim/testsuite/frv/cmqmachs.cgs

diff --git a/sim/testsuite/sim/frv/cmqmachu.cgs b/sim/testsuite/frv/cmqmachu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmqmachu.cgs
rename to sim/testsuite/frv/cmqmachu.cgs

diff --git a/sim/testsuite/sim/frv/cmqmulhs.cgs b/sim/testsuite/frv/cmqmulhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmqmulhs.cgs
rename to sim/testsuite/frv/cmqmulhs.cgs

diff --git a/sim/testsuite/sim/frv/cmqmulhu.cgs b/sim/testsuite/frv/cmqmulhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmqmulhu.cgs
rename to sim/testsuite/frv/cmqmulhu.cgs

diff --git a/sim/testsuite/sim/frv/cmsubhss.cgs b/sim/testsuite/frv/cmsubhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmsubhss.cgs
rename to sim/testsuite/frv/cmsubhss.cgs

diff --git a/sim/testsuite/sim/frv/cmsubhus.cgs b/sim/testsuite/frv/cmsubhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmsubhus.cgs
rename to sim/testsuite/frv/cmsubhus.cgs

diff --git a/sim/testsuite/sim/frv/cmxor.cgs b/sim/testsuite/frv/cmxor.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cmxor.cgs
rename to sim/testsuite/frv/cmxor.cgs

diff --git a/sim/testsuite/sim/frv/cnot.cgs b/sim/testsuite/frv/cnot.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cnot.cgs
rename to sim/testsuite/frv/cnot.cgs

diff --git a/sim/testsuite/sim/frv/commitfa.cgs b/sim/testsuite/frv/commitfa.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/commitfa.cgs
rename to sim/testsuite/frv/commitfa.cgs

diff --git a/sim/testsuite/sim/frv/commitfr.cgs b/sim/testsuite/frv/commitfr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/commitfr.cgs
rename to sim/testsuite/frv/commitfr.cgs

diff --git a/sim/testsuite/sim/frv/commitga.cgs b/sim/testsuite/frv/commitga.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/commitga.cgs
rename to sim/testsuite/frv/commitga.cgs

diff --git a/sim/testsuite/sim/frv/commitgr.cgs b/sim/testsuite/frv/commitgr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/commitgr.cgs
rename to sim/testsuite/frv/commitgr.cgs

diff --git a/sim/testsuite/sim/frv/cop1.cgs b/sim/testsuite/frv/cop1.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cop1.cgs
rename to sim/testsuite/frv/cop1.cgs

diff --git a/sim/testsuite/sim/frv/cop2.cgs b/sim/testsuite/frv/cop2.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cop2.cgs
rename to sim/testsuite/frv/cop2.cgs

diff --git a/sim/testsuite/sim/frv/cor.cgs b/sim/testsuite/frv/cor.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cor.cgs
rename to sim/testsuite/frv/cor.cgs

diff --git a/sim/testsuite/sim/frv/corcc.cgs b/sim/testsuite/frv/corcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/corcc.cgs
rename to sim/testsuite/frv/corcc.cgs

diff --git a/sim/testsuite/sim/frv/cscan.cgs b/sim/testsuite/frv/cscan.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cscan.cgs
rename to sim/testsuite/frv/cscan.cgs

diff --git a/sim/testsuite/sim/frv/csdiv.cgs b/sim/testsuite/frv/csdiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csdiv.cgs
rename to sim/testsuite/frv/csdiv.cgs

diff --git a/sim/testsuite/sim/frv/csll.cgs b/sim/testsuite/frv/csll.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csll.cgs
rename to sim/testsuite/frv/csll.cgs

diff --git a/sim/testsuite/sim/frv/csllcc.cgs b/sim/testsuite/frv/csllcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csllcc.cgs
rename to sim/testsuite/frv/csllcc.cgs

diff --git a/sim/testsuite/sim/frv/csmul.cgs b/sim/testsuite/frv/csmul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csmul.cgs
rename to sim/testsuite/frv/csmul.cgs

diff --git a/sim/testsuite/sim/frv/csmulcc.cgs b/sim/testsuite/frv/csmulcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csmulcc.cgs
rename to sim/testsuite/frv/csmulcc.cgs

diff --git a/sim/testsuite/sim/frv/csra.cgs b/sim/testsuite/frv/csra.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csra.cgs
rename to sim/testsuite/frv/csra.cgs

diff --git a/sim/testsuite/sim/frv/csracc.cgs b/sim/testsuite/frv/csracc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csracc.cgs
rename to sim/testsuite/frv/csracc.cgs

diff --git a/sim/testsuite/sim/frv/csrl.cgs b/sim/testsuite/frv/csrl.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csrl.cgs
rename to sim/testsuite/frv/csrl.cgs

diff --git a/sim/testsuite/sim/frv/csrlcc.cgs b/sim/testsuite/frv/csrlcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csrlcc.cgs
rename to sim/testsuite/frv/csrlcc.cgs

diff --git a/sim/testsuite/sim/frv/cst.cgs b/sim/testsuite/frv/cst.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cst.cgs
rename to sim/testsuite/frv/cst.cgs

diff --git a/sim/testsuite/sim/frv/cstb.cgs b/sim/testsuite/frv/cstb.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstb.cgs
rename to sim/testsuite/frv/cstb.cgs

diff --git a/sim/testsuite/sim/frv/cstbf.cgs b/sim/testsuite/frv/cstbf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstbf.cgs
rename to sim/testsuite/frv/cstbf.cgs

diff --git a/sim/testsuite/sim/frv/cstbfu.cgs b/sim/testsuite/frv/cstbfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstbfu.cgs
rename to sim/testsuite/frv/cstbfu.cgs

diff --git a/sim/testsuite/sim/frv/cstbu.cgs b/sim/testsuite/frv/cstbu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstbu.cgs
rename to sim/testsuite/frv/cstbu.cgs

diff --git a/sim/testsuite/sim/frv/cstd.cgs b/sim/testsuite/frv/cstd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstd.cgs
rename to sim/testsuite/frv/cstd.cgs

diff --git a/sim/testsuite/sim/frv/cstdf.cgs b/sim/testsuite/frv/cstdf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstdf.cgs
rename to sim/testsuite/frv/cstdf.cgs

diff --git a/sim/testsuite/sim/frv/cstdfu.cgs b/sim/testsuite/frv/cstdfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstdfu.cgs
rename to sim/testsuite/frv/cstdfu.cgs

diff --git a/sim/testsuite/sim/frv/cstdu.cgs b/sim/testsuite/frv/cstdu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstdu.cgs
rename to sim/testsuite/frv/cstdu.cgs

diff --git a/sim/testsuite/sim/frv/cstf.cgs b/sim/testsuite/frv/cstf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstf.cgs
rename to sim/testsuite/frv/cstf.cgs

diff --git a/sim/testsuite/sim/frv/cstfu.cgs b/sim/testsuite/frv/cstfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstfu.cgs
rename to sim/testsuite/frv/cstfu.cgs

diff --git a/sim/testsuite/sim/frv/csth.cgs b/sim/testsuite/frv/csth.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csth.cgs
rename to sim/testsuite/frv/csth.cgs

diff --git a/sim/testsuite/sim/frv/csthf.cgs b/sim/testsuite/frv/csthf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csthf.cgs
rename to sim/testsuite/frv/csthf.cgs

diff --git a/sim/testsuite/sim/frv/csthfu.cgs b/sim/testsuite/frv/csthfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csthfu.cgs
rename to sim/testsuite/frv/csthfu.cgs

diff --git a/sim/testsuite/sim/frv/csthu.cgs b/sim/testsuite/frv/csthu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csthu.cgs
rename to sim/testsuite/frv/csthu.cgs

diff --git a/sim/testsuite/sim/frv/cstq.cgs b/sim/testsuite/frv/cstq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstq.cgs
rename to sim/testsuite/frv/cstq.cgs

diff --git a/sim/testsuite/sim/frv/cstu.cgs b/sim/testsuite/frv/cstu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cstu.cgs
rename to sim/testsuite/frv/cstu.cgs

diff --git a/sim/testsuite/sim/frv/csub.cgs b/sim/testsuite/frv/csub.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csub.cgs
rename to sim/testsuite/frv/csub.cgs

diff --git a/sim/testsuite/sim/frv/csubcc.cgs b/sim/testsuite/frv/csubcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/csubcc.cgs
rename to sim/testsuite/frv/csubcc.cgs

diff --git a/sim/testsuite/sim/frv/cswap.cgs b/sim/testsuite/frv/cswap.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cswap.cgs
rename to sim/testsuite/frv/cswap.cgs

diff --git a/sim/testsuite/sim/frv/cudiv.cgs b/sim/testsuite/frv/cudiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cudiv.cgs
rename to sim/testsuite/frv/cudiv.cgs

diff --git a/sim/testsuite/sim/frv/cxor.cgs b/sim/testsuite/frv/cxor.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cxor.cgs
rename to sim/testsuite/frv/cxor.cgs

diff --git a/sim/testsuite/sim/frv/cxorcc.cgs b/sim/testsuite/frv/cxorcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/cxorcc.cgs
rename to sim/testsuite/frv/cxorcc.cgs

diff --git a/sim/testsuite/sim/frv/dcef.cgs b/sim/testsuite/frv/dcef.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/dcef.cgs
rename to sim/testsuite/frv/dcef.cgs

diff --git a/sim/testsuite/sim/frv/dcei.cgs b/sim/testsuite/frv/dcei.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/dcei.cgs
rename to sim/testsuite/frv/dcei.cgs

diff --git a/sim/testsuite/sim/frv/dcf.cgs b/sim/testsuite/frv/dcf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/dcf.cgs
rename to sim/testsuite/frv/dcf.cgs

diff --git a/sim/testsuite/sim/frv/dci.cgs b/sim/testsuite/frv/dci.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/dci.cgs
rename to sim/testsuite/frv/dci.cgs

diff --git a/sim/testsuite/sim/frv/exit47.ms b/sim/testsuite/frv/exit47.ms
similarity index 100%
rename from sim/testsuite/sim/frv/exit47.ms
rename to sim/testsuite/frv/exit47.ms

diff --git a/sim/testsuite/sim/frv/fabsd.cgs b/sim/testsuite/frv/fabsd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fabsd.cgs
rename to sim/testsuite/frv/fabsd.cgs

diff --git a/sim/testsuite/sim/frv/fabss.cgs b/sim/testsuite/frv/fabss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fabss.cgs
rename to sim/testsuite/frv/fabss.cgs

diff --git a/sim/testsuite/sim/frv/faddd.cgs b/sim/testsuite/frv/faddd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/faddd.cgs
rename to sim/testsuite/frv/faddd.cgs

diff --git a/sim/testsuite/sim/frv/fadds.cgs b/sim/testsuite/frv/fadds.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fadds.cgs
rename to sim/testsuite/frv/fadds.cgs

diff --git a/sim/testsuite/sim/frv/fbeq.cgs b/sim/testsuite/frv/fbeq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbeq.cgs
rename to sim/testsuite/frv/fbeq.cgs

diff --git a/sim/testsuite/sim/frv/fbeqlr.cgs b/sim/testsuite/frv/fbeqlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbeqlr.cgs
rename to sim/testsuite/frv/fbeqlr.cgs

diff --git a/sim/testsuite/sim/frv/fbge.cgs b/sim/testsuite/frv/fbge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbge.cgs
rename to sim/testsuite/frv/fbge.cgs

diff --git a/sim/testsuite/sim/frv/fbgelr.cgs b/sim/testsuite/frv/fbgelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbgelr.cgs
rename to sim/testsuite/frv/fbgelr.cgs

diff --git a/sim/testsuite/sim/frv/fbgt.cgs b/sim/testsuite/frv/fbgt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbgt.cgs
rename to sim/testsuite/frv/fbgt.cgs

diff --git a/sim/testsuite/sim/frv/fbgtlr.cgs b/sim/testsuite/frv/fbgtlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbgtlr.cgs
rename to sim/testsuite/frv/fbgtlr.cgs

diff --git a/sim/testsuite/sim/frv/fble.cgs b/sim/testsuite/frv/fble.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fble.cgs
rename to sim/testsuite/frv/fble.cgs

diff --git a/sim/testsuite/sim/frv/fblelr.cgs b/sim/testsuite/frv/fblelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fblelr.cgs
rename to sim/testsuite/frv/fblelr.cgs

diff --git a/sim/testsuite/sim/frv/fblg.cgs b/sim/testsuite/frv/fblg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fblg.cgs
rename to sim/testsuite/frv/fblg.cgs

diff --git a/sim/testsuite/sim/frv/fblglr.cgs b/sim/testsuite/frv/fblglr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fblglr.cgs
rename to sim/testsuite/frv/fblglr.cgs

diff --git a/sim/testsuite/sim/frv/fblt.cgs b/sim/testsuite/frv/fblt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fblt.cgs
rename to sim/testsuite/frv/fblt.cgs

diff --git a/sim/testsuite/sim/frv/fbltlr.cgs b/sim/testsuite/frv/fbltlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbltlr.cgs
rename to sim/testsuite/frv/fbltlr.cgs

diff --git a/sim/testsuite/sim/frv/fbne.cgs b/sim/testsuite/frv/fbne.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbne.cgs
rename to sim/testsuite/frv/fbne.cgs

diff --git a/sim/testsuite/sim/frv/fbnelr.cgs b/sim/testsuite/frv/fbnelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbnelr.cgs
rename to sim/testsuite/frv/fbnelr.cgs

diff --git a/sim/testsuite/sim/frv/fbno.cgs b/sim/testsuite/frv/fbno.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbno.cgs
rename to sim/testsuite/frv/fbno.cgs

diff --git a/sim/testsuite/sim/frv/fbnolr.cgs b/sim/testsuite/frv/fbnolr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbnolr.cgs
rename to sim/testsuite/frv/fbnolr.cgs

diff --git a/sim/testsuite/sim/frv/fbo.cgs b/sim/testsuite/frv/fbo.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbo.cgs
rename to sim/testsuite/frv/fbo.cgs

diff --git a/sim/testsuite/sim/frv/fbolr.cgs b/sim/testsuite/frv/fbolr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbolr.cgs
rename to sim/testsuite/frv/fbolr.cgs

diff --git a/sim/testsuite/sim/frv/fbra.cgs b/sim/testsuite/frv/fbra.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbra.cgs
rename to sim/testsuite/frv/fbra.cgs

diff --git a/sim/testsuite/sim/frv/fbralr.cgs b/sim/testsuite/frv/fbralr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbralr.cgs
rename to sim/testsuite/frv/fbralr.cgs

diff --git a/sim/testsuite/sim/frv/fbu.cgs b/sim/testsuite/frv/fbu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbu.cgs
rename to sim/testsuite/frv/fbu.cgs

diff --git a/sim/testsuite/sim/frv/fbue.cgs b/sim/testsuite/frv/fbue.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbue.cgs
rename to sim/testsuite/frv/fbue.cgs

diff --git a/sim/testsuite/sim/frv/fbuelr.cgs b/sim/testsuite/frv/fbuelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbuelr.cgs
rename to sim/testsuite/frv/fbuelr.cgs

diff --git a/sim/testsuite/sim/frv/fbug.cgs b/sim/testsuite/frv/fbug.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbug.cgs
rename to sim/testsuite/frv/fbug.cgs

diff --git a/sim/testsuite/sim/frv/fbuge.cgs b/sim/testsuite/frv/fbuge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbuge.cgs
rename to sim/testsuite/frv/fbuge.cgs

diff --git a/sim/testsuite/sim/frv/fbugelr.cgs b/sim/testsuite/frv/fbugelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbugelr.cgs
rename to sim/testsuite/frv/fbugelr.cgs

diff --git a/sim/testsuite/sim/frv/fbuglr.cgs b/sim/testsuite/frv/fbuglr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbuglr.cgs
rename to sim/testsuite/frv/fbuglr.cgs

diff --git a/sim/testsuite/sim/frv/fbul.cgs b/sim/testsuite/frv/fbul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbul.cgs
rename to sim/testsuite/frv/fbul.cgs

diff --git a/sim/testsuite/sim/frv/fbule.cgs b/sim/testsuite/frv/fbule.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbule.cgs
rename to sim/testsuite/frv/fbule.cgs

diff --git a/sim/testsuite/sim/frv/fbulelr.cgs b/sim/testsuite/frv/fbulelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbulelr.cgs
rename to sim/testsuite/frv/fbulelr.cgs

diff --git a/sim/testsuite/sim/frv/fbullr.cgs b/sim/testsuite/frv/fbullr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbullr.cgs
rename to sim/testsuite/frv/fbullr.cgs

diff --git a/sim/testsuite/sim/frv/fbulr.cgs b/sim/testsuite/frv/fbulr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fbulr.cgs
rename to sim/testsuite/frv/fbulr.cgs

diff --git a/sim/testsuite/sim/frv/fcbeqlr.cgs b/sim/testsuite/frv/fcbeqlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbeqlr.cgs
rename to sim/testsuite/frv/fcbeqlr.cgs

diff --git a/sim/testsuite/sim/frv/fcbgelr.cgs b/sim/testsuite/frv/fcbgelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbgelr.cgs
rename to sim/testsuite/frv/fcbgelr.cgs

diff --git a/sim/testsuite/sim/frv/fcbgtlr.cgs b/sim/testsuite/frv/fcbgtlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbgtlr.cgs
rename to sim/testsuite/frv/fcbgtlr.cgs

diff --git a/sim/testsuite/sim/frv/fcblelr.cgs b/sim/testsuite/frv/fcblelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcblelr.cgs
rename to sim/testsuite/frv/fcblelr.cgs

diff --git a/sim/testsuite/sim/frv/fcblglr.cgs b/sim/testsuite/frv/fcblglr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcblglr.cgs
rename to sim/testsuite/frv/fcblglr.cgs

diff --git a/sim/testsuite/sim/frv/fcbltlr.cgs b/sim/testsuite/frv/fcbltlr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbltlr.cgs
rename to sim/testsuite/frv/fcbltlr.cgs

diff --git a/sim/testsuite/sim/frv/fcbnelr.cgs b/sim/testsuite/frv/fcbnelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbnelr.cgs
rename to sim/testsuite/frv/fcbnelr.cgs

diff --git a/sim/testsuite/sim/frv/fcbnolr.cgs b/sim/testsuite/frv/fcbnolr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbnolr.cgs
rename to sim/testsuite/frv/fcbnolr.cgs

diff --git a/sim/testsuite/sim/frv/fcbolr.cgs b/sim/testsuite/frv/fcbolr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbolr.cgs
rename to sim/testsuite/frv/fcbolr.cgs

diff --git a/sim/testsuite/sim/frv/fcbralr.cgs b/sim/testsuite/frv/fcbralr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbralr.cgs
rename to sim/testsuite/frv/fcbralr.cgs

diff --git a/sim/testsuite/sim/frv/fcbuelr.cgs b/sim/testsuite/frv/fcbuelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbuelr.cgs
rename to sim/testsuite/frv/fcbuelr.cgs

diff --git a/sim/testsuite/sim/frv/fcbugelr.cgs b/sim/testsuite/frv/fcbugelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbugelr.cgs
rename to sim/testsuite/frv/fcbugelr.cgs

diff --git a/sim/testsuite/sim/frv/fcbuglr.cgs b/sim/testsuite/frv/fcbuglr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbuglr.cgs
rename to sim/testsuite/frv/fcbuglr.cgs

diff --git a/sim/testsuite/sim/frv/fcbulelr.cgs b/sim/testsuite/frv/fcbulelr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbulelr.cgs
rename to sim/testsuite/frv/fcbulelr.cgs

diff --git a/sim/testsuite/sim/frv/fcbullr.cgs b/sim/testsuite/frv/fcbullr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbullr.cgs
rename to sim/testsuite/frv/fcbullr.cgs

diff --git a/sim/testsuite/sim/frv/fcbulr.cgs b/sim/testsuite/frv/fcbulr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcbulr.cgs
rename to sim/testsuite/frv/fcbulr.cgs

diff --git a/sim/testsuite/sim/frv/fckeq.cgs b/sim/testsuite/frv/fckeq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckeq.cgs
rename to sim/testsuite/frv/fckeq.cgs

diff --git a/sim/testsuite/sim/frv/fckge.cgs b/sim/testsuite/frv/fckge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckge.cgs
rename to sim/testsuite/frv/fckge.cgs

diff --git a/sim/testsuite/sim/frv/fckgt.cgs b/sim/testsuite/frv/fckgt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckgt.cgs
rename to sim/testsuite/frv/fckgt.cgs

diff --git a/sim/testsuite/sim/frv/fckle.cgs b/sim/testsuite/frv/fckle.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckle.cgs
rename to sim/testsuite/frv/fckle.cgs

diff --git a/sim/testsuite/sim/frv/fcklg.cgs b/sim/testsuite/frv/fcklg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcklg.cgs
rename to sim/testsuite/frv/fcklg.cgs

diff --git a/sim/testsuite/sim/frv/fcklt.cgs b/sim/testsuite/frv/fcklt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcklt.cgs
rename to sim/testsuite/frv/fcklt.cgs

diff --git a/sim/testsuite/sim/frv/fckne.cgs b/sim/testsuite/frv/fckne.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckne.cgs
rename to sim/testsuite/frv/fckne.cgs

diff --git a/sim/testsuite/sim/frv/fckno.cgs b/sim/testsuite/frv/fckno.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckno.cgs
rename to sim/testsuite/frv/fckno.cgs

diff --git a/sim/testsuite/sim/frv/fcko.cgs b/sim/testsuite/frv/fcko.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcko.cgs
rename to sim/testsuite/frv/fcko.cgs

diff --git a/sim/testsuite/sim/frv/fckra.cgs b/sim/testsuite/frv/fckra.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckra.cgs
rename to sim/testsuite/frv/fckra.cgs

diff --git a/sim/testsuite/sim/frv/fcku.cgs b/sim/testsuite/frv/fcku.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcku.cgs
rename to sim/testsuite/frv/fcku.cgs

diff --git a/sim/testsuite/sim/frv/fckue.cgs b/sim/testsuite/frv/fckue.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckue.cgs
rename to sim/testsuite/frv/fckue.cgs

diff --git a/sim/testsuite/sim/frv/fckug.cgs b/sim/testsuite/frv/fckug.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckug.cgs
rename to sim/testsuite/frv/fckug.cgs

diff --git a/sim/testsuite/sim/frv/fckuge.cgs b/sim/testsuite/frv/fckuge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckuge.cgs
rename to sim/testsuite/frv/fckuge.cgs

diff --git a/sim/testsuite/sim/frv/fckul.cgs b/sim/testsuite/frv/fckul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckul.cgs
rename to sim/testsuite/frv/fckul.cgs

diff --git a/sim/testsuite/sim/frv/fckule.cgs b/sim/testsuite/frv/fckule.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fckule.cgs
rename to sim/testsuite/frv/fckule.cgs

diff --git a/sim/testsuite/sim/frv/fcmpd.cgs b/sim/testsuite/frv/fcmpd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcmpd.cgs
rename to sim/testsuite/frv/fcmpd.cgs

diff --git a/sim/testsuite/sim/frv/fcmps.cgs b/sim/testsuite/frv/fcmps.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fcmps.cgs
rename to sim/testsuite/frv/fcmps.cgs

diff --git a/sim/testsuite/sim/frv/fdabss.cgs b/sim/testsuite/frv/fdabss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdabss.cgs
rename to sim/testsuite/frv/fdabss.cgs

diff --git a/sim/testsuite/sim/frv/fdadds.cgs b/sim/testsuite/frv/fdadds.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdadds.cgs
rename to sim/testsuite/frv/fdadds.cgs

diff --git a/sim/testsuite/sim/frv/fdcmps.cgs b/sim/testsuite/frv/fdcmps.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdcmps.cgs
rename to sim/testsuite/frv/fdcmps.cgs

diff --git a/sim/testsuite/sim/frv/fddivs.cgs b/sim/testsuite/frv/fddivs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fddivs.cgs
rename to sim/testsuite/frv/fddivs.cgs

diff --git a/sim/testsuite/sim/frv/fditos.cgs b/sim/testsuite/frv/fditos.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fditos.cgs
rename to sim/testsuite/frv/fditos.cgs

diff --git a/sim/testsuite/sim/frv/fdivd.cgs b/sim/testsuite/frv/fdivd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdivd.cgs
rename to sim/testsuite/frv/fdivd.cgs

diff --git a/sim/testsuite/sim/frv/fdivs.cgs b/sim/testsuite/frv/fdivs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdivs.cgs
rename to sim/testsuite/frv/fdivs.cgs

diff --git a/sim/testsuite/sim/frv/fdmadds.cgs b/sim/testsuite/frv/fdmadds.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdmadds.cgs
rename to sim/testsuite/frv/fdmadds.cgs

diff --git a/sim/testsuite/sim/frv/fdmas.cgs b/sim/testsuite/frv/fdmas.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdmas.cgs
rename to sim/testsuite/frv/fdmas.cgs

diff --git a/sim/testsuite/sim/frv/fdmovs.cgs b/sim/testsuite/frv/fdmovs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdmovs.cgs
rename to sim/testsuite/frv/fdmovs.cgs

diff --git a/sim/testsuite/sim/frv/fdmss.cgs b/sim/testsuite/frv/fdmss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdmss.cgs
rename to sim/testsuite/frv/fdmss.cgs

diff --git a/sim/testsuite/sim/frv/fdmulcs.cgs b/sim/testsuite/frv/fdmulcs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdmulcs.cgs
rename to sim/testsuite/frv/fdmulcs.cgs

diff --git a/sim/testsuite/sim/frv/fdmuls.cgs b/sim/testsuite/frv/fdmuls.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdmuls.cgs
rename to sim/testsuite/frv/fdmuls.cgs

diff --git a/sim/testsuite/sim/frv/fdnegs.cgs b/sim/testsuite/frv/fdnegs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdnegs.cgs
rename to sim/testsuite/frv/fdnegs.cgs

diff --git a/sim/testsuite/sim/frv/fdsads.cgs b/sim/testsuite/frv/fdsads.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdsads.cgs
rename to sim/testsuite/frv/fdsads.cgs

diff --git a/sim/testsuite/sim/frv/fdsqrts.cgs b/sim/testsuite/frv/fdsqrts.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdsqrts.cgs
rename to sim/testsuite/frv/fdsqrts.cgs

diff --git a/sim/testsuite/sim/frv/fdstoi.cgs b/sim/testsuite/frv/fdstoi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdstoi.cgs
rename to sim/testsuite/frv/fdstoi.cgs

diff --git a/sim/testsuite/sim/frv/fdsubs.cgs b/sim/testsuite/frv/fdsubs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdsubs.cgs
rename to sim/testsuite/frv/fdsubs.cgs

diff --git a/sim/testsuite/sim/frv/fdtoi.cgs b/sim/testsuite/frv/fdtoi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fdtoi.cgs
rename to sim/testsuite/frv/fdtoi.cgs

diff --git a/sim/testsuite/sim/frv/fitod.cgs b/sim/testsuite/frv/fitod.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fitod.cgs
rename to sim/testsuite/frv/fitod.cgs

diff --git a/sim/testsuite/sim/frv/fitos.cgs b/sim/testsuite/frv/fitos.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fitos.cgs
rename to sim/testsuite/frv/fitos.cgs

diff --git a/sim/testsuite/sim/frv/fmad.cgs b/sim/testsuite/frv/fmad.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmad.cgs
rename to sim/testsuite/frv/fmad.cgs

diff --git a/sim/testsuite/sim/frv/fmaddd.cgs b/sim/testsuite/frv/fmaddd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmaddd.cgs
rename to sim/testsuite/frv/fmaddd.cgs

diff --git a/sim/testsuite/sim/frv/fmadds.cgs b/sim/testsuite/frv/fmadds.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmadds.cgs
rename to sim/testsuite/frv/fmadds.cgs

diff --git a/sim/testsuite/sim/frv/fmas.cgs b/sim/testsuite/frv/fmas.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmas.cgs
rename to sim/testsuite/frv/fmas.cgs

diff --git a/sim/testsuite/sim/frv/fmovd.cgs b/sim/testsuite/frv/fmovd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmovd.cgs
rename to sim/testsuite/frv/fmovd.cgs

diff --git a/sim/testsuite/sim/frv/fmovs.cgs b/sim/testsuite/frv/fmovs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmovs.cgs
rename to sim/testsuite/frv/fmovs.cgs

diff --git a/sim/testsuite/sim/frv/fmsd.cgs b/sim/testsuite/frv/fmsd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmsd.cgs
rename to sim/testsuite/frv/fmsd.cgs

diff --git a/sim/testsuite/sim/frv/fmss.cgs b/sim/testsuite/frv/fmss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmss.cgs
rename to sim/testsuite/frv/fmss.cgs

diff --git a/sim/testsuite/sim/frv/fmsubd.cgs b/sim/testsuite/frv/fmsubd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmsubd.cgs
rename to sim/testsuite/frv/fmsubd.cgs

diff --git a/sim/testsuite/sim/frv/fmsubs.cgs b/sim/testsuite/frv/fmsubs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmsubs.cgs
rename to sim/testsuite/frv/fmsubs.cgs

diff --git a/sim/testsuite/sim/frv/fmuld.cgs b/sim/testsuite/frv/fmuld.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmuld.cgs
rename to sim/testsuite/frv/fmuld.cgs

diff --git a/sim/testsuite/sim/frv/fmuls.cgs b/sim/testsuite/frv/fmuls.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fmuls.cgs
rename to sim/testsuite/frv/fmuls.cgs

diff --git a/sim/testsuite/sim/frv/fnegd.cgs b/sim/testsuite/frv/fnegd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fnegd.cgs
rename to sim/testsuite/frv/fnegd.cgs

diff --git a/sim/testsuite/sim/frv/fnegs.cgs b/sim/testsuite/frv/fnegs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fnegs.cgs
rename to sim/testsuite/frv/fnegs.cgs

diff --git a/sim/testsuite/sim/frv/fnop.cgs b/sim/testsuite/frv/fnop.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fnop.cgs
rename to sim/testsuite/frv/fnop.cgs

diff --git a/sim/testsuite/sim/frv/fr400/addss.cgs b/sim/testsuite/frv/fr400/addss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/addss.cgs
rename to sim/testsuite/frv/fr400/addss.cgs

diff --git a/sim/testsuite/sim/frv/fr400/allinsn.exp b/sim/testsuite/frv/fr400/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/allinsn.exp
rename to sim/testsuite/frv/fr400/allinsn.exp

diff --git a/sim/testsuite/sim/frv/fr400/csdiv.cgs b/sim/testsuite/frv/fr400/csdiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/csdiv.cgs
rename to sim/testsuite/frv/fr400/csdiv.cgs

diff --git a/sim/testsuite/sim/frv/fr400/maddaccs.cgs b/sim/testsuite/frv/fr400/maddaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/maddaccs.cgs
rename to sim/testsuite/frv/fr400/maddaccs.cgs

diff --git a/sim/testsuite/sim/frv/fr400/masaccs.cgs b/sim/testsuite/frv/fr400/masaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/masaccs.cgs
rename to sim/testsuite/frv/fr400/masaccs.cgs

diff --git a/sim/testsuite/sim/frv/fr400/maveh.cgs b/sim/testsuite/frv/fr400/maveh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/maveh.cgs
rename to sim/testsuite/frv/fr400/maveh.cgs

diff --git a/sim/testsuite/sim/frv/fr400/mclracc.cgs b/sim/testsuite/frv/fr400/mclracc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/mclracc.cgs
rename to sim/testsuite/frv/fr400/mclracc.cgs

diff --git a/sim/testsuite/sim/frv/fr400/mhdseth.cgs b/sim/testsuite/frv/fr400/mhdseth.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/mhdseth.cgs
rename to sim/testsuite/frv/fr400/mhdseth.cgs

diff --git a/sim/testsuite/sim/frv/fr400/mhdsets.cgs b/sim/testsuite/frv/fr400/mhdsets.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/mhdsets.cgs
rename to sim/testsuite/frv/fr400/mhdsets.cgs

diff --git a/sim/testsuite/sim/frv/fr400/mhsethih.cgs b/sim/testsuite/frv/fr400/mhsethih.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/mhsethih.cgs
rename to sim/testsuite/frv/fr400/mhsethih.cgs

diff --git a/sim/testsuite/sim/frv/fr400/mhsethis.cgs b/sim/testsuite/frv/fr400/mhsethis.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/mhsethis.cgs
rename to sim/testsuite/frv/fr400/mhsethis.cgs

diff --git a/sim/testsuite/sim/frv/fr400/mhsetloh.cgs b/sim/testsuite/frv/fr400/mhsetloh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/mhsetloh.cgs
rename to sim/testsuite/frv/fr400/mhsetloh.cgs

diff --git a/sim/testsuite/sim/frv/fr400/mhsetlos.cgs b/sim/testsuite/frv/fr400/mhsetlos.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/mhsetlos.cgs
rename to sim/testsuite/frv/fr400/mhsetlos.cgs

diff --git a/sim/testsuite/sim/frv/fr400/movgs.cgs b/sim/testsuite/frv/fr400/movgs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/movgs.cgs
rename to sim/testsuite/frv/fr400/movgs.cgs

diff --git a/sim/testsuite/sim/frv/fr400/movsg.cgs b/sim/testsuite/frv/fr400/movsg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/movsg.cgs
rename to sim/testsuite/frv/fr400/movsg.cgs

diff --git a/sim/testsuite/sim/frv/fr400/msubaccs.cgs b/sim/testsuite/frv/fr400/msubaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/msubaccs.cgs
rename to sim/testsuite/frv/fr400/msubaccs.cgs

diff --git a/sim/testsuite/sim/frv/fr400/scutss.cgs b/sim/testsuite/frv/fr400/scutss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/scutss.cgs
rename to sim/testsuite/frv/fr400/scutss.cgs

diff --git a/sim/testsuite/sim/frv/fr400/sdiv.cgs b/sim/testsuite/frv/fr400/sdiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/sdiv.cgs
rename to sim/testsuite/frv/fr400/sdiv.cgs

diff --git a/sim/testsuite/sim/frv/fr400/sdivi.cgs b/sim/testsuite/frv/fr400/sdivi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/sdivi.cgs
rename to sim/testsuite/frv/fr400/sdivi.cgs

diff --git a/sim/testsuite/sim/frv/fr400/slass.cgs b/sim/testsuite/frv/fr400/slass.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/slass.cgs
rename to sim/testsuite/frv/fr400/slass.cgs

diff --git a/sim/testsuite/sim/frv/fr400/smass.cgs b/sim/testsuite/frv/fr400/smass.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/smass.cgs
rename to sim/testsuite/frv/fr400/smass.cgs

diff --git a/sim/testsuite/sim/frv/fr400/smsss.cgs b/sim/testsuite/frv/fr400/smsss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/smsss.cgs
rename to sim/testsuite/frv/fr400/smsss.cgs

diff --git a/sim/testsuite/sim/frv/fr400/smu.cgs b/sim/testsuite/frv/fr400/smu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/smu.cgs
rename to sim/testsuite/frv/fr400/smu.cgs

diff --git a/sim/testsuite/sim/frv/fr400/subss.cgs b/sim/testsuite/frv/fr400/subss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/subss.cgs
rename to sim/testsuite/frv/fr400/subss.cgs

diff --git a/sim/testsuite/sim/frv/fr400/udiv.cgs b/sim/testsuite/frv/fr400/udiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/udiv.cgs
rename to sim/testsuite/frv/fr400/udiv.cgs

diff --git a/sim/testsuite/sim/frv/fr400/udivi.cgs b/sim/testsuite/frv/fr400/udivi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr400/udivi.cgs
rename to sim/testsuite/frv/fr400/udivi.cgs

diff --git a/sim/testsuite/sim/frv/fr500/allinsn.exp b/sim/testsuite/frv/fr500/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/allinsn.exp
rename to sim/testsuite/frv/fr500/allinsn.exp

diff --git a/sim/testsuite/sim/frv/fr500/cmqaddhss.cgs b/sim/testsuite/frv/fr500/cmqaddhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/cmqaddhss.cgs
rename to sim/testsuite/frv/fr500/cmqaddhss.cgs

diff --git a/sim/testsuite/sim/frv/fr500/cmqaddhus.cgs b/sim/testsuite/frv/fr500/cmqaddhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/cmqaddhus.cgs
rename to sim/testsuite/frv/fr500/cmqaddhus.cgs

diff --git a/sim/testsuite/sim/frv/fr500/cmqsubhss.cgs b/sim/testsuite/frv/fr500/cmqsubhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/cmqsubhss.cgs
rename to sim/testsuite/frv/fr500/cmqsubhss.cgs

diff --git a/sim/testsuite/sim/frv/fr500/cmqsubhus.cgs b/sim/testsuite/frv/fr500/cmqsubhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/cmqsubhus.cgs
rename to sim/testsuite/frv/fr500/cmqsubhus.cgs

diff --git a/sim/testsuite/sim/frv/fr500/dcpl.cgs b/sim/testsuite/frv/fr500/dcpl.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/dcpl.cgs
rename to sim/testsuite/frv/fr500/dcpl.cgs

diff --git a/sim/testsuite/sim/frv/fr500/dcul.cgs b/sim/testsuite/frv/fr500/dcul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/dcul.cgs
rename to sim/testsuite/frv/fr500/dcul.cgs

diff --git a/sim/testsuite/sim/frv/fr500/mclracc.cgs b/sim/testsuite/frv/fr500/mclracc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/mclracc.cgs
rename to sim/testsuite/frv/fr500/mclracc.cgs

diff --git a/sim/testsuite/sim/frv/fr500/mqaddhss.cgs b/sim/testsuite/frv/fr500/mqaddhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/mqaddhss.cgs
rename to sim/testsuite/frv/fr500/mqaddhss.cgs

diff --git a/sim/testsuite/sim/frv/fr500/mqaddhus.cgs b/sim/testsuite/frv/fr500/mqaddhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/mqaddhus.cgs
rename to sim/testsuite/frv/fr500/mqaddhus.cgs

diff --git a/sim/testsuite/sim/frv/fr500/mqsubhss.cgs b/sim/testsuite/frv/fr500/mqsubhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/mqsubhss.cgs
rename to sim/testsuite/frv/fr500/mqsubhss.cgs

diff --git a/sim/testsuite/sim/frv/fr500/mqsubhus.cgs b/sim/testsuite/frv/fr500/mqsubhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr500/mqsubhus.cgs
rename to sim/testsuite/frv/fr500/mqsubhus.cgs

diff --git a/sim/testsuite/sim/frv/fr550/allinsn.exp b/sim/testsuite/frv/fr550/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/allinsn.exp
rename to sim/testsuite/frv/fr550/allinsn.exp

diff --git a/sim/testsuite/sim/frv/fr550/cmaddhss.cgs b/sim/testsuite/frv/fr550/cmaddhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmaddhss.cgs
rename to sim/testsuite/frv/fr550/cmaddhss.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmaddhus.cgs b/sim/testsuite/frv/fr550/cmaddhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmaddhus.cgs
rename to sim/testsuite/frv/fr550/cmaddhus.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmcpxiu.cgs b/sim/testsuite/frv/fr550/cmcpxiu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmcpxiu.cgs
rename to sim/testsuite/frv/fr550/cmcpxiu.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmcpxru.cgs b/sim/testsuite/frv/fr550/cmcpxru.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmcpxru.cgs
rename to sim/testsuite/frv/fr550/cmcpxru.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmmachs.cgs b/sim/testsuite/frv/fr550/cmmachs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmmachs.cgs
rename to sim/testsuite/frv/fr550/cmmachs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmmachu.cgs b/sim/testsuite/frv/fr550/cmmachu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmmachu.cgs
rename to sim/testsuite/frv/fr550/cmmachu.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmqaddhss.cgs b/sim/testsuite/frv/fr550/cmqaddhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmqaddhss.cgs
rename to sim/testsuite/frv/fr550/cmqaddhss.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmqaddhus.cgs b/sim/testsuite/frv/fr550/cmqaddhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmqaddhus.cgs
rename to sim/testsuite/frv/fr550/cmqaddhus.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmqmachs.cgs b/sim/testsuite/frv/fr550/cmqmachs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmqmachs.cgs
rename to sim/testsuite/frv/fr550/cmqmachs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmqmachu.cgs b/sim/testsuite/frv/fr550/cmqmachu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmqmachu.cgs
rename to sim/testsuite/frv/fr550/cmqmachu.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmqsubhss.cgs b/sim/testsuite/frv/fr550/cmqsubhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmqsubhss.cgs
rename to sim/testsuite/frv/fr550/cmqsubhss.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmqsubhus.cgs b/sim/testsuite/frv/fr550/cmqsubhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmqsubhus.cgs
rename to sim/testsuite/frv/fr550/cmqsubhus.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmsubhss.cgs b/sim/testsuite/frv/fr550/cmsubhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmsubhss.cgs
rename to sim/testsuite/frv/fr550/cmsubhss.cgs

diff --git a/sim/testsuite/sim/frv/fr550/cmsubhus.cgs b/sim/testsuite/frv/fr550/cmsubhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/cmsubhus.cgs
rename to sim/testsuite/frv/fr550/cmsubhus.cgs

diff --git a/sim/testsuite/sim/frv/fr550/dcpl.cgs b/sim/testsuite/frv/fr550/dcpl.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/dcpl.cgs
rename to sim/testsuite/frv/fr550/dcpl.cgs

diff --git a/sim/testsuite/sim/frv/fr550/dcul.cgs b/sim/testsuite/frv/fr550/dcul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/dcul.cgs
rename to sim/testsuite/frv/fr550/dcul.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mabshs.cgs b/sim/testsuite/frv/fr550/mabshs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mabshs.cgs
rename to sim/testsuite/frv/fr550/mabshs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/maddaccs.cgs b/sim/testsuite/frv/fr550/maddaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/maddaccs.cgs
rename to sim/testsuite/frv/fr550/maddaccs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/maddhss.cgs b/sim/testsuite/frv/fr550/maddhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/maddhss.cgs
rename to sim/testsuite/frv/fr550/maddhss.cgs

diff --git a/sim/testsuite/sim/frv/fr550/maddhus.cgs b/sim/testsuite/frv/fr550/maddhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/maddhus.cgs
rename to sim/testsuite/frv/fr550/maddhus.cgs

diff --git a/sim/testsuite/sim/frv/fr550/masaccs.cgs b/sim/testsuite/frv/fr550/masaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/masaccs.cgs
rename to sim/testsuite/frv/fr550/masaccs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mdaddaccs.cgs b/sim/testsuite/frv/fr550/mdaddaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mdaddaccs.cgs
rename to sim/testsuite/frv/fr550/mdaddaccs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mdasaccs.cgs b/sim/testsuite/frv/fr550/mdasaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mdasaccs.cgs
rename to sim/testsuite/frv/fr550/mdasaccs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mdsubaccs.cgs b/sim/testsuite/frv/fr550/mdsubaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mdsubaccs.cgs
rename to sim/testsuite/frv/fr550/mdsubaccs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mmachs.cgs b/sim/testsuite/frv/fr550/mmachs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mmachs.cgs
rename to sim/testsuite/frv/fr550/mmachs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mmachu.cgs b/sim/testsuite/frv/fr550/mmachu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mmachu.cgs
rename to sim/testsuite/frv/fr550/mmachu.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mmrdhs.cgs b/sim/testsuite/frv/fr550/mmrdhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mmrdhs.cgs
rename to sim/testsuite/frv/fr550/mmrdhs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mmrdhu.cgs b/sim/testsuite/frv/fr550/mmrdhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mmrdhu.cgs
rename to sim/testsuite/frv/fr550/mmrdhu.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mqaddhss.cgs b/sim/testsuite/frv/fr550/mqaddhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mqaddhss.cgs
rename to sim/testsuite/frv/fr550/mqaddhss.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mqaddhus.cgs b/sim/testsuite/frv/fr550/mqaddhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mqaddhus.cgs
rename to sim/testsuite/frv/fr550/mqaddhus.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mqmachs.cgs b/sim/testsuite/frv/fr550/mqmachs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mqmachs.cgs
rename to sim/testsuite/frv/fr550/mqmachs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mqmachu.cgs b/sim/testsuite/frv/fr550/mqmachu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mqmachu.cgs
rename to sim/testsuite/frv/fr550/mqmachu.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mqmacxhs.cgs b/sim/testsuite/frv/fr550/mqmacxhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mqmacxhs.cgs
rename to sim/testsuite/frv/fr550/mqmacxhs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mqsubhss.cgs b/sim/testsuite/frv/fr550/mqsubhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mqsubhss.cgs
rename to sim/testsuite/frv/fr550/mqsubhss.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mqsubhus.cgs b/sim/testsuite/frv/fr550/mqsubhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mqsubhus.cgs
rename to sim/testsuite/frv/fr550/mqsubhus.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mqxmachs.cgs b/sim/testsuite/frv/fr550/mqxmachs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mqxmachs.cgs
rename to sim/testsuite/frv/fr550/mqxmachs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mqxmacxhs.cgs b/sim/testsuite/frv/fr550/mqxmacxhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mqxmacxhs.cgs
rename to sim/testsuite/frv/fr550/mqxmacxhs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/msubaccs.cgs b/sim/testsuite/frv/fr550/msubaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/msubaccs.cgs
rename to sim/testsuite/frv/fr550/msubaccs.cgs

diff --git a/sim/testsuite/sim/frv/fr550/msubhss.cgs b/sim/testsuite/frv/fr550/msubhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/msubhss.cgs
rename to sim/testsuite/frv/fr550/msubhss.cgs

diff --git a/sim/testsuite/sim/frv/fr550/msubhus.cgs b/sim/testsuite/frv/fr550/msubhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/msubhus.cgs
rename to sim/testsuite/frv/fr550/msubhus.cgs

diff --git a/sim/testsuite/sim/frv/fr550/mtrap.cgs b/sim/testsuite/frv/fr550/mtrap.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/mtrap.cgs
rename to sim/testsuite/frv/fr550/mtrap.cgs

diff --git a/sim/testsuite/sim/frv/fr550/udiv.cgs b/sim/testsuite/frv/fr550/udiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/udiv.cgs
rename to sim/testsuite/frv/fr550/udiv.cgs

diff --git a/sim/testsuite/sim/frv/fr550/udivi.cgs b/sim/testsuite/frv/fr550/udivi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fr550/udivi.cgs
rename to sim/testsuite/frv/fr550/udivi.cgs

diff --git a/sim/testsuite/sim/frv/fsqrtd.cgs b/sim/testsuite/frv/fsqrtd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fsqrtd.cgs
rename to sim/testsuite/frv/fsqrtd.cgs

diff --git a/sim/testsuite/sim/frv/fsqrts.cgs b/sim/testsuite/frv/fsqrts.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fsqrts.cgs
rename to sim/testsuite/frv/fsqrts.cgs

diff --git a/sim/testsuite/sim/frv/fstoi.cgs b/sim/testsuite/frv/fstoi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fstoi.cgs
rename to sim/testsuite/frv/fstoi.cgs

diff --git a/sim/testsuite/sim/frv/fsubd.cgs b/sim/testsuite/frv/fsubd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fsubd.cgs
rename to sim/testsuite/frv/fsubd.cgs

diff --git a/sim/testsuite/sim/frv/fsubs.cgs b/sim/testsuite/frv/fsubs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fsubs.cgs
rename to sim/testsuite/frv/fsubs.cgs

diff --git a/sim/testsuite/sim/frv/fteq.cgs b/sim/testsuite/frv/fteq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fteq.cgs
rename to sim/testsuite/frv/fteq.cgs

diff --git a/sim/testsuite/sim/frv/ftge.cgs b/sim/testsuite/frv/ftge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftge.cgs
rename to sim/testsuite/frv/ftge.cgs

diff --git a/sim/testsuite/sim/frv/ftgt.cgs b/sim/testsuite/frv/ftgt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftgt.cgs
rename to sim/testsuite/frv/ftgt.cgs

diff --git a/sim/testsuite/sim/frv/ftieq.cgs b/sim/testsuite/frv/ftieq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftieq.cgs
rename to sim/testsuite/frv/ftieq.cgs

diff --git a/sim/testsuite/sim/frv/ftige.cgs b/sim/testsuite/frv/ftige.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftige.cgs
rename to sim/testsuite/frv/ftige.cgs

diff --git a/sim/testsuite/sim/frv/ftigt.cgs b/sim/testsuite/frv/ftigt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftigt.cgs
rename to sim/testsuite/frv/ftigt.cgs

diff --git a/sim/testsuite/sim/frv/ftile.cgs b/sim/testsuite/frv/ftile.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftile.cgs
rename to sim/testsuite/frv/ftile.cgs

diff --git a/sim/testsuite/sim/frv/ftilg.cgs b/sim/testsuite/frv/ftilg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftilg.cgs
rename to sim/testsuite/frv/ftilg.cgs

diff --git a/sim/testsuite/sim/frv/ftilt.cgs b/sim/testsuite/frv/ftilt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftilt.cgs
rename to sim/testsuite/frv/ftilt.cgs

diff --git a/sim/testsuite/sim/frv/ftine.cgs b/sim/testsuite/frv/ftine.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftine.cgs
rename to sim/testsuite/frv/ftine.cgs

diff --git a/sim/testsuite/sim/frv/ftino.cgs b/sim/testsuite/frv/ftino.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftino.cgs
rename to sim/testsuite/frv/ftino.cgs

diff --git a/sim/testsuite/sim/frv/ftio.cgs b/sim/testsuite/frv/ftio.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftio.cgs
rename to sim/testsuite/frv/ftio.cgs

diff --git a/sim/testsuite/sim/frv/ftira.cgs b/sim/testsuite/frv/ftira.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftira.cgs
rename to sim/testsuite/frv/ftira.cgs

diff --git a/sim/testsuite/sim/frv/ftiu.cgs b/sim/testsuite/frv/ftiu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftiu.cgs
rename to sim/testsuite/frv/ftiu.cgs

diff --git a/sim/testsuite/sim/frv/ftiue.cgs b/sim/testsuite/frv/ftiue.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftiue.cgs
rename to sim/testsuite/frv/ftiue.cgs

diff --git a/sim/testsuite/sim/frv/ftiug.cgs b/sim/testsuite/frv/ftiug.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftiug.cgs
rename to sim/testsuite/frv/ftiug.cgs

diff --git a/sim/testsuite/sim/frv/ftiuge.cgs b/sim/testsuite/frv/ftiuge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftiuge.cgs
rename to sim/testsuite/frv/ftiuge.cgs

diff --git a/sim/testsuite/sim/frv/ftiul.cgs b/sim/testsuite/frv/ftiul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftiul.cgs
rename to sim/testsuite/frv/ftiul.cgs

diff --git a/sim/testsuite/sim/frv/ftle.cgs b/sim/testsuite/frv/ftle.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftle.cgs
rename to sim/testsuite/frv/ftle.cgs

diff --git a/sim/testsuite/sim/frv/ftlg.cgs b/sim/testsuite/frv/ftlg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftlg.cgs
rename to sim/testsuite/frv/ftlg.cgs

diff --git a/sim/testsuite/sim/frv/ftlt.cgs b/sim/testsuite/frv/ftlt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftlt.cgs
rename to sim/testsuite/frv/ftlt.cgs

diff --git a/sim/testsuite/sim/frv/ftne.cgs b/sim/testsuite/frv/ftne.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftne.cgs
rename to sim/testsuite/frv/ftne.cgs

diff --git a/sim/testsuite/sim/frv/ftno.cgs b/sim/testsuite/frv/ftno.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftno.cgs
rename to sim/testsuite/frv/ftno.cgs

diff --git a/sim/testsuite/sim/frv/fto.cgs b/sim/testsuite/frv/fto.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/fto.cgs
rename to sim/testsuite/frv/fto.cgs

diff --git a/sim/testsuite/sim/frv/ftra.cgs b/sim/testsuite/frv/ftra.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftra.cgs
rename to sim/testsuite/frv/ftra.cgs

diff --git a/sim/testsuite/sim/frv/ftu.cgs b/sim/testsuite/frv/ftu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftu.cgs
rename to sim/testsuite/frv/ftu.cgs

diff --git a/sim/testsuite/sim/frv/ftue.cgs b/sim/testsuite/frv/ftue.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftue.cgs
rename to sim/testsuite/frv/ftue.cgs

diff --git a/sim/testsuite/sim/frv/ftug.cgs b/sim/testsuite/frv/ftug.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftug.cgs
rename to sim/testsuite/frv/ftug.cgs

diff --git a/sim/testsuite/sim/frv/ftuge.cgs b/sim/testsuite/frv/ftuge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftuge.cgs
rename to sim/testsuite/frv/ftuge.cgs

diff --git a/sim/testsuite/sim/frv/ftul.cgs b/sim/testsuite/frv/ftul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftul.cgs
rename to sim/testsuite/frv/ftul.cgs

diff --git a/sim/testsuite/sim/frv/ftule.cgs b/sim/testsuite/frv/ftule.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ftule.cgs
rename to sim/testsuite/frv/ftule.cgs

diff --git a/sim/testsuite/sim/frv/grloop.ms b/sim/testsuite/frv/grloop.ms
similarity index 100%
rename from sim/testsuite/sim/frv/grloop.ms
rename to sim/testsuite/frv/grloop.ms

diff --git a/sim/testsuite/sim/frv/hello.ms b/sim/testsuite/frv/hello.ms
similarity index 100%
rename from sim/testsuite/sim/frv/hello.ms
rename to sim/testsuite/frv/hello.ms

diff --git a/sim/testsuite/sim/frv/icei.cgs b/sim/testsuite/frv/icei.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/icei.cgs
rename to sim/testsuite/frv/icei.cgs

diff --git a/sim/testsuite/sim/frv/ici.cgs b/sim/testsuite/frv/ici.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ici.cgs
rename to sim/testsuite/frv/ici.cgs

diff --git a/sim/testsuite/sim/frv/icpl.cgs b/sim/testsuite/frv/icpl.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/icpl.cgs
rename to sim/testsuite/frv/icpl.cgs

diff --git a/sim/testsuite/sim/frv/icul.cgs b/sim/testsuite/frv/icul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/icul.cgs
rename to sim/testsuite/frv/icul.cgs

diff --git a/sim/testsuite/sim/frv/interrupts.exp b/sim/testsuite/frv/interrupts.exp
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts.exp
rename to sim/testsuite/frv/interrupts.exp

diff --git a/sim/testsuite/sim/frv/interrupts/Ipipe-fr400.cgs b/sim/testsuite/frv/interrupts/Ipipe-fr400.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/Ipipe-fr400.cgs
rename to sim/testsuite/frv/interrupts/Ipipe-fr400.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/Ipipe-fr500.cgs b/sim/testsuite/frv/interrupts/Ipipe-fr500.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/Ipipe-fr500.cgs
rename to sim/testsuite/frv/interrupts/Ipipe-fr500.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/badalign-fr550.cgs b/sim/testsuite/frv/interrupts/badalign-fr550.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/badalign-fr550.cgs
rename to sim/testsuite/frv/interrupts/badalign-fr550.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/badalign.cgs b/sim/testsuite/frv/interrupts/badalign.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/badalign.cgs
rename to sim/testsuite/frv/interrupts/badalign.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/compound-fr550.cgs b/sim/testsuite/frv/interrupts/compound-fr550.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/compound-fr550.cgs
rename to sim/testsuite/frv/interrupts/compound-fr550.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/compound.cgs b/sim/testsuite/frv/interrupts/compound.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/compound.cgs
rename to sim/testsuite/frv/interrupts/compound.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/data_store_error-fr550.cgs b/sim/testsuite/frv/interrupts/data_store_error-fr550.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/data_store_error-fr550.cgs
rename to sim/testsuite/frv/interrupts/data_store_error-fr550.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/data_store_error.cgs b/sim/testsuite/frv/interrupts/data_store_error.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/data_store_error.cgs
rename to sim/testsuite/frv/interrupts/data_store_error.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/fp_exception-fr550.cgs b/sim/testsuite/frv/interrupts/fp_exception-fr550.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/fp_exception-fr550.cgs
rename to sim/testsuite/frv/interrupts/fp_exception-fr550.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/fp_exception.cgs b/sim/testsuite/frv/interrupts/fp_exception.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/fp_exception.cgs
rename to sim/testsuite/frv/interrupts/fp_exception.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/illinsn.cgs b/sim/testsuite/frv/interrupts/illinsn.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/illinsn.cgs
rename to sim/testsuite/frv/interrupts/illinsn.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/insn_access_error-fr550.cgs b/sim/testsuite/frv/interrupts/insn_access_error-fr550.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/insn_access_error-fr550.cgs
rename to sim/testsuite/frv/interrupts/insn_access_error-fr550.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/insn_access_error.cgs b/sim/testsuite/frv/interrupts/insn_access_error.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/insn_access_error.cgs
rename to sim/testsuite/frv/interrupts/insn_access_error.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/mp_exception.cgs b/sim/testsuite/frv/interrupts/mp_exception.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/mp_exception.cgs
rename to sim/testsuite/frv/interrupts/mp_exception.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/privileged_instruction.cgs b/sim/testsuite/frv/interrupts/privileged_instruction.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/privileged_instruction.cgs
rename to sim/testsuite/frv/interrupts/privileged_instruction.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/regalign.cgs b/sim/testsuite/frv/interrupts/regalign.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/regalign.cgs
rename to sim/testsuite/frv/interrupts/regalign.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/reset.cgs b/sim/testsuite/frv/interrupts/reset.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/reset.cgs
rename to sim/testsuite/frv/interrupts/reset.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/shadow_regs.cgs b/sim/testsuite/frv/interrupts/shadow_regs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/shadow_regs.cgs
rename to sim/testsuite/frv/interrupts/shadow_regs.cgs

diff --git a/sim/testsuite/sim/frv/interrupts/timer.cgs b/sim/testsuite/frv/interrupts/timer.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/interrupts/timer.cgs
rename to sim/testsuite/frv/interrupts/timer.cgs

diff --git a/sim/testsuite/sim/frv/jmpil.cgs b/sim/testsuite/frv/jmpil.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/jmpil.cgs
rename to sim/testsuite/frv/jmpil.cgs

diff --git a/sim/testsuite/sim/frv/jmpl.cgs b/sim/testsuite/frv/jmpl.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/jmpl.cgs
rename to sim/testsuite/frv/jmpl.cgs

diff --git a/sim/testsuite/sim/frv/jmpl.pcgs b/sim/testsuite/frv/jmpl.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/jmpl.pcgs
rename to sim/testsuite/frv/jmpl.pcgs

diff --git a/sim/testsuite/sim/frv/ld.cgs b/sim/testsuite/frv/ld.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ld.cgs
rename to sim/testsuite/frv/ld.cgs

diff --git a/sim/testsuite/sim/frv/ldbf.cgs b/sim/testsuite/frv/ldbf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldbf.cgs
rename to sim/testsuite/frv/ldbf.cgs

diff --git a/sim/testsuite/sim/frv/ldbfi.cgs b/sim/testsuite/frv/ldbfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldbfi.cgs
rename to sim/testsuite/frv/ldbfi.cgs

diff --git a/sim/testsuite/sim/frv/ldbfu.cgs b/sim/testsuite/frv/ldbfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldbfu.cgs
rename to sim/testsuite/frv/ldbfu.cgs

diff --git a/sim/testsuite/sim/frv/ldc.cgs b/sim/testsuite/frv/ldc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldc.cgs
rename to sim/testsuite/frv/ldc.cgs

diff --git a/sim/testsuite/sim/frv/ldcu.cgs b/sim/testsuite/frv/ldcu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldcu.cgs
rename to sim/testsuite/frv/ldcu.cgs

diff --git a/sim/testsuite/sim/frv/ldd.cgs b/sim/testsuite/frv/ldd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldd.cgs
rename to sim/testsuite/frv/ldd.cgs

diff --git a/sim/testsuite/sim/frv/lddc.cgs b/sim/testsuite/frv/lddc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/lddc.cgs
rename to sim/testsuite/frv/lddc.cgs

diff --git a/sim/testsuite/sim/frv/lddcu.cgs b/sim/testsuite/frv/lddcu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/lddcu.cgs
rename to sim/testsuite/frv/lddcu.cgs

diff --git a/sim/testsuite/sim/frv/lddf.cgs b/sim/testsuite/frv/lddf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/lddf.cgs
rename to sim/testsuite/frv/lddf.cgs

diff --git a/sim/testsuite/sim/frv/lddfi.cgs b/sim/testsuite/frv/lddfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/lddfi.cgs
rename to sim/testsuite/frv/lddfi.cgs

diff --git a/sim/testsuite/sim/frv/lddfu.cgs b/sim/testsuite/frv/lddfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/lddfu.cgs
rename to sim/testsuite/frv/lddfu.cgs

diff --git a/sim/testsuite/sim/frv/lddi.cgs b/sim/testsuite/frv/lddi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/lddi.cgs
rename to sim/testsuite/frv/lddi.cgs

diff --git a/sim/testsuite/sim/frv/lddu.cgs b/sim/testsuite/frv/lddu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/lddu.cgs
rename to sim/testsuite/frv/lddu.cgs

diff --git a/sim/testsuite/sim/frv/ldf.cgs b/sim/testsuite/frv/ldf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldf.cgs
rename to sim/testsuite/frv/ldf.cgs

diff --git a/sim/testsuite/sim/frv/ldfi.cgs b/sim/testsuite/frv/ldfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldfi.cgs
rename to sim/testsuite/frv/ldfi.cgs

diff --git a/sim/testsuite/sim/frv/ldfu.cgs b/sim/testsuite/frv/ldfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldfu.cgs
rename to sim/testsuite/frv/ldfu.cgs

diff --git a/sim/testsuite/sim/frv/ldhf.cgs b/sim/testsuite/frv/ldhf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldhf.cgs
rename to sim/testsuite/frv/ldhf.cgs

diff --git a/sim/testsuite/sim/frv/ldhfi.cgs b/sim/testsuite/frv/ldhfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldhfi.cgs
rename to sim/testsuite/frv/ldhfi.cgs

diff --git a/sim/testsuite/sim/frv/ldhfu.cgs b/sim/testsuite/frv/ldhfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldhfu.cgs
rename to sim/testsuite/frv/ldhfu.cgs

diff --git a/sim/testsuite/sim/frv/ldi.cgs b/sim/testsuite/frv/ldi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldi.cgs
rename to sim/testsuite/frv/ldi.cgs

diff --git a/sim/testsuite/sim/frv/ldq.cgs b/sim/testsuite/frv/ldq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldq.cgs
rename to sim/testsuite/frv/ldq.cgs

diff --git a/sim/testsuite/sim/frv/ldqc.cgs b/sim/testsuite/frv/ldqc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldqc.cgs
rename to sim/testsuite/frv/ldqc.cgs

diff --git a/sim/testsuite/sim/frv/ldqcu.cgs b/sim/testsuite/frv/ldqcu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldqcu.cgs
rename to sim/testsuite/frv/ldqcu.cgs

diff --git a/sim/testsuite/sim/frv/ldqf.cgs b/sim/testsuite/frv/ldqf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldqf.cgs
rename to sim/testsuite/frv/ldqf.cgs

diff --git a/sim/testsuite/sim/frv/ldqfi.cgs b/sim/testsuite/frv/ldqfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldqfi.cgs
rename to sim/testsuite/frv/ldqfi.cgs

diff --git a/sim/testsuite/sim/frv/ldqfu.cgs b/sim/testsuite/frv/ldqfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldqfu.cgs
rename to sim/testsuite/frv/ldqfu.cgs

diff --git a/sim/testsuite/sim/frv/ldqi.cgs b/sim/testsuite/frv/ldqi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldqi.cgs
rename to sim/testsuite/frv/ldqi.cgs

diff --git a/sim/testsuite/sim/frv/ldqu.cgs b/sim/testsuite/frv/ldqu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldqu.cgs
rename to sim/testsuite/frv/ldqu.cgs

diff --git a/sim/testsuite/sim/frv/ldsb.cgs b/sim/testsuite/frv/ldsb.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldsb.cgs
rename to sim/testsuite/frv/ldsb.cgs

diff --git a/sim/testsuite/sim/frv/ldsbi.cgs b/sim/testsuite/frv/ldsbi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldsbi.cgs
rename to sim/testsuite/frv/ldsbi.cgs

diff --git a/sim/testsuite/sim/frv/ldsbu.cgs b/sim/testsuite/frv/ldsbu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldsbu.cgs
rename to sim/testsuite/frv/ldsbu.cgs

diff --git a/sim/testsuite/sim/frv/ldsh.cgs b/sim/testsuite/frv/ldsh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldsh.cgs
rename to sim/testsuite/frv/ldsh.cgs

diff --git a/sim/testsuite/sim/frv/ldshi.cgs b/sim/testsuite/frv/ldshi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldshi.cgs
rename to sim/testsuite/frv/ldshi.cgs

diff --git a/sim/testsuite/sim/frv/ldshu.cgs b/sim/testsuite/frv/ldshu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldshu.cgs
rename to sim/testsuite/frv/ldshu.cgs

diff --git a/sim/testsuite/sim/frv/ldu.cgs b/sim/testsuite/frv/ldu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldu.cgs
rename to sim/testsuite/frv/ldu.cgs

diff --git a/sim/testsuite/sim/frv/ldub.cgs b/sim/testsuite/frv/ldub.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldub.cgs
rename to sim/testsuite/frv/ldub.cgs

diff --git a/sim/testsuite/sim/frv/ldubi.cgs b/sim/testsuite/frv/ldubi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldubi.cgs
rename to sim/testsuite/frv/ldubi.cgs

diff --git a/sim/testsuite/sim/frv/ldubu.cgs b/sim/testsuite/frv/ldubu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ldubu.cgs
rename to sim/testsuite/frv/ldubu.cgs

diff --git a/sim/testsuite/sim/frv/lduh.cgs b/sim/testsuite/frv/lduh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/lduh.cgs
rename to sim/testsuite/frv/lduh.cgs

diff --git a/sim/testsuite/sim/frv/lduhi.cgs b/sim/testsuite/frv/lduhi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/lduhi.cgs
rename to sim/testsuite/frv/lduhi.cgs

diff --git a/sim/testsuite/sim/frv/lduhu.cgs b/sim/testsuite/frv/lduhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/lduhu.cgs
rename to sim/testsuite/frv/lduhu.cgs

diff --git a/sim/testsuite/sim/frv/lrbranch.pcgs b/sim/testsuite/frv/lrbranch.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/lrbranch.pcgs
rename to sim/testsuite/frv/lrbranch.pcgs

diff --git a/sim/testsuite/sim/frv/mabshs.cgs b/sim/testsuite/frv/mabshs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mabshs.cgs
rename to sim/testsuite/frv/mabshs.cgs

diff --git a/sim/testsuite/sim/frv/maddhss.cgs b/sim/testsuite/frv/maddhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/maddhss.cgs
rename to sim/testsuite/frv/maddhss.cgs

diff --git a/sim/testsuite/sim/frv/maddhus.cgs b/sim/testsuite/frv/maddhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/maddhus.cgs
rename to sim/testsuite/frv/maddhus.cgs

diff --git a/sim/testsuite/sim/frv/mand.cgs b/sim/testsuite/frv/mand.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mand.cgs
rename to sim/testsuite/frv/mand.cgs

diff --git a/sim/testsuite/sim/frv/maveh.cgs b/sim/testsuite/frv/maveh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/maveh.cgs
rename to sim/testsuite/frv/maveh.cgs

diff --git a/sim/testsuite/sim/frv/mbtoh.cgs b/sim/testsuite/frv/mbtoh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mbtoh.cgs
rename to sim/testsuite/frv/mbtoh.cgs

diff --git a/sim/testsuite/sim/frv/mbtohe.cgs b/sim/testsuite/frv/mbtohe.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mbtohe.cgs
rename to sim/testsuite/frv/mbtohe.cgs

diff --git a/sim/testsuite/sim/frv/mclracc.cgs b/sim/testsuite/frv/mclracc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mclracc.cgs
rename to sim/testsuite/frv/mclracc.cgs

diff --git a/sim/testsuite/sim/frv/mcmpsh.cgs b/sim/testsuite/frv/mcmpsh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcmpsh.cgs
rename to sim/testsuite/frv/mcmpsh.cgs

diff --git a/sim/testsuite/sim/frv/mcmpuh.cgs b/sim/testsuite/frv/mcmpuh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcmpuh.cgs
rename to sim/testsuite/frv/mcmpuh.cgs

diff --git a/sim/testsuite/sim/frv/mcop1.cgs b/sim/testsuite/frv/mcop1.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcop1.cgs
rename to sim/testsuite/frv/mcop1.cgs

diff --git a/sim/testsuite/sim/frv/mcop2.cgs b/sim/testsuite/frv/mcop2.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcop2.cgs
rename to sim/testsuite/frv/mcop2.cgs

diff --git a/sim/testsuite/sim/frv/mcplhi.cgs b/sim/testsuite/frv/mcplhi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcplhi.cgs
rename to sim/testsuite/frv/mcplhi.cgs

diff --git a/sim/testsuite/sim/frv/mcpli.cgs b/sim/testsuite/frv/mcpli.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcpli.cgs
rename to sim/testsuite/frv/mcpli.cgs

diff --git a/sim/testsuite/sim/frv/mcpxis.cgs b/sim/testsuite/frv/mcpxis.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcpxis.cgs
rename to sim/testsuite/frv/mcpxis.cgs

diff --git a/sim/testsuite/sim/frv/mcpxiu.cgs b/sim/testsuite/frv/mcpxiu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcpxiu.cgs
rename to sim/testsuite/frv/mcpxiu.cgs

diff --git a/sim/testsuite/sim/frv/mcpxrs.cgs b/sim/testsuite/frv/mcpxrs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcpxrs.cgs
rename to sim/testsuite/frv/mcpxrs.cgs

diff --git a/sim/testsuite/sim/frv/mcpxru.cgs b/sim/testsuite/frv/mcpxru.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcpxru.cgs
rename to sim/testsuite/frv/mcpxru.cgs

diff --git a/sim/testsuite/sim/frv/mcut.cgs b/sim/testsuite/frv/mcut.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcut.cgs
rename to sim/testsuite/frv/mcut.cgs

diff --git a/sim/testsuite/sim/frv/mcuti.cgs b/sim/testsuite/frv/mcuti.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcuti.cgs
rename to sim/testsuite/frv/mcuti.cgs

diff --git a/sim/testsuite/sim/frv/mcutss.cgs b/sim/testsuite/frv/mcutss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcutss.cgs
rename to sim/testsuite/frv/mcutss.cgs

diff --git a/sim/testsuite/sim/frv/mcutssi.cgs b/sim/testsuite/frv/mcutssi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mcutssi.cgs
rename to sim/testsuite/frv/mcutssi.cgs

diff --git a/sim/testsuite/sim/frv/mdaddaccs.cgs b/sim/testsuite/frv/mdaddaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mdaddaccs.cgs
rename to sim/testsuite/frv/mdaddaccs.cgs

diff --git a/sim/testsuite/sim/frv/mdasaccs.cgs b/sim/testsuite/frv/mdasaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mdasaccs.cgs
rename to sim/testsuite/frv/mdasaccs.cgs

diff --git a/sim/testsuite/sim/frv/mdcutssi.cgs b/sim/testsuite/frv/mdcutssi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mdcutssi.cgs
rename to sim/testsuite/frv/mdcutssi.cgs

diff --git a/sim/testsuite/sim/frv/mdpackh.cgs b/sim/testsuite/frv/mdpackh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mdpackh.cgs
rename to sim/testsuite/frv/mdpackh.cgs

diff --git a/sim/testsuite/sim/frv/mdrotli.cgs b/sim/testsuite/frv/mdrotli.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mdrotli.cgs
rename to sim/testsuite/frv/mdrotli.cgs

diff --git a/sim/testsuite/sim/frv/mdsubaccs.cgs b/sim/testsuite/frv/mdsubaccs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mdsubaccs.cgs
rename to sim/testsuite/frv/mdsubaccs.cgs

diff --git a/sim/testsuite/sim/frv/mdunpackh.cgs b/sim/testsuite/frv/mdunpackh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mdunpackh.cgs
rename to sim/testsuite/frv/mdunpackh.cgs

diff --git a/sim/testsuite/sim/frv/membar.cgs b/sim/testsuite/frv/membar.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/membar.cgs
rename to sim/testsuite/frv/membar.cgs

diff --git a/sim/testsuite/sim/frv/mexpdhd.cgs b/sim/testsuite/frv/mexpdhd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mexpdhd.cgs
rename to sim/testsuite/frv/mexpdhd.cgs

diff --git a/sim/testsuite/sim/frv/mexpdhw.cgs b/sim/testsuite/frv/mexpdhw.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mexpdhw.cgs
rename to sim/testsuite/frv/mexpdhw.cgs

diff --git a/sim/testsuite/sim/frv/mhdseth.cgs b/sim/testsuite/frv/mhdseth.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mhdseth.cgs
rename to sim/testsuite/frv/mhdseth.cgs

diff --git a/sim/testsuite/sim/frv/mhdsets.cgs b/sim/testsuite/frv/mhdsets.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mhdsets.cgs
rename to sim/testsuite/frv/mhdsets.cgs

diff --git a/sim/testsuite/sim/frv/mhsethih.cgs b/sim/testsuite/frv/mhsethih.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mhsethih.cgs
rename to sim/testsuite/frv/mhsethih.cgs

diff --git a/sim/testsuite/sim/frv/mhsethis.cgs b/sim/testsuite/frv/mhsethis.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mhsethis.cgs
rename to sim/testsuite/frv/mhsethis.cgs

diff --git a/sim/testsuite/sim/frv/mhsetloh.cgs b/sim/testsuite/frv/mhsetloh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mhsetloh.cgs
rename to sim/testsuite/frv/mhsetloh.cgs

diff --git a/sim/testsuite/sim/frv/mhsetlos.cgs b/sim/testsuite/frv/mhsetlos.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mhsetlos.cgs
rename to sim/testsuite/frv/mhsetlos.cgs

diff --git a/sim/testsuite/sim/frv/mhtob.cgs b/sim/testsuite/frv/mhtob.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mhtob.cgs
rename to sim/testsuite/frv/mhtob.cgs

diff --git a/sim/testsuite/sim/frv/misc.exp b/sim/testsuite/frv/misc.exp
similarity index 100%
rename from sim/testsuite/sim/frv/misc.exp
rename to sim/testsuite/frv/misc.exp

diff --git a/sim/testsuite/sim/frv/mmachs.cgs b/sim/testsuite/frv/mmachs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mmachs.cgs
rename to sim/testsuite/frv/mmachs.cgs

diff --git a/sim/testsuite/sim/frv/mmachu.cgs b/sim/testsuite/frv/mmachu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mmachu.cgs
rename to sim/testsuite/frv/mmachu.cgs

diff --git a/sim/testsuite/sim/frv/mmrdhs.cgs b/sim/testsuite/frv/mmrdhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mmrdhs.cgs
rename to sim/testsuite/frv/mmrdhs.cgs

diff --git a/sim/testsuite/sim/frv/mmrdhu.cgs b/sim/testsuite/frv/mmrdhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mmrdhu.cgs
rename to sim/testsuite/frv/mmrdhu.cgs

diff --git a/sim/testsuite/sim/frv/mmulhs.cgs b/sim/testsuite/frv/mmulhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mmulhs.cgs
rename to sim/testsuite/frv/mmulhs.cgs

diff --git a/sim/testsuite/sim/frv/mmulhu.cgs b/sim/testsuite/frv/mmulhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mmulhu.cgs
rename to sim/testsuite/frv/mmulhu.cgs

diff --git a/sim/testsuite/sim/frv/mmulxhs.cgs b/sim/testsuite/frv/mmulxhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mmulxhs.cgs
rename to sim/testsuite/frv/mmulxhs.cgs

diff --git a/sim/testsuite/sim/frv/mmulxhu.cgs b/sim/testsuite/frv/mmulxhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mmulxhu.cgs
rename to sim/testsuite/frv/mmulxhu.cgs

diff --git a/sim/testsuite/sim/frv/mnop.cgs b/sim/testsuite/frv/mnop.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mnop.cgs
rename to sim/testsuite/frv/mnop.cgs

diff --git a/sim/testsuite/sim/frv/mnot.cgs b/sim/testsuite/frv/mnot.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mnot.cgs
rename to sim/testsuite/frv/mnot.cgs

diff --git a/sim/testsuite/sim/frv/mor.cgs b/sim/testsuite/frv/mor.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mor.cgs
rename to sim/testsuite/frv/mor.cgs

diff --git a/sim/testsuite/sim/frv/mov.cgs b/sim/testsuite/frv/mov.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mov.cgs
rename to sim/testsuite/frv/mov.cgs

diff --git a/sim/testsuite/sim/frv/movfg.cgs b/sim/testsuite/frv/movfg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/movfg.cgs
rename to sim/testsuite/frv/movfg.cgs

diff --git a/sim/testsuite/sim/frv/movfgd.cgs b/sim/testsuite/frv/movfgd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/movfgd.cgs
rename to sim/testsuite/frv/movfgd.cgs

diff --git a/sim/testsuite/sim/frv/movfgq.cgs b/sim/testsuite/frv/movfgq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/movfgq.cgs
rename to sim/testsuite/frv/movfgq.cgs

diff --git a/sim/testsuite/sim/frv/movgf.cgs b/sim/testsuite/frv/movgf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/movgf.cgs
rename to sim/testsuite/frv/movgf.cgs

diff --git a/sim/testsuite/sim/frv/movgfd.cgs b/sim/testsuite/frv/movgfd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/movgfd.cgs
rename to sim/testsuite/frv/movgfd.cgs

diff --git a/sim/testsuite/sim/frv/movgfq.cgs b/sim/testsuite/frv/movgfq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/movgfq.cgs
rename to sim/testsuite/frv/movgfq.cgs

diff --git a/sim/testsuite/sim/frv/movgs.cgs b/sim/testsuite/frv/movgs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/movgs.cgs
rename to sim/testsuite/frv/movgs.cgs

diff --git a/sim/testsuite/sim/frv/movsg.cgs b/sim/testsuite/frv/movsg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/movsg.cgs
rename to sim/testsuite/frv/movsg.cgs

diff --git a/sim/testsuite/sim/frv/mpackh.cgs b/sim/testsuite/frv/mpackh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mpackh.cgs
rename to sim/testsuite/frv/mpackh.cgs

diff --git a/sim/testsuite/sim/frv/mqcpxis.cgs b/sim/testsuite/frv/mqcpxis.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqcpxis.cgs
rename to sim/testsuite/frv/mqcpxis.cgs

diff --git a/sim/testsuite/sim/frv/mqcpxiu.cgs b/sim/testsuite/frv/mqcpxiu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqcpxiu.cgs
rename to sim/testsuite/frv/mqcpxiu.cgs

diff --git a/sim/testsuite/sim/frv/mqcpxrs.cgs b/sim/testsuite/frv/mqcpxrs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqcpxrs.cgs
rename to sim/testsuite/frv/mqcpxrs.cgs

diff --git a/sim/testsuite/sim/frv/mqcpxru.cgs b/sim/testsuite/frv/mqcpxru.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqcpxru.cgs
rename to sim/testsuite/frv/mqcpxru.cgs

diff --git a/sim/testsuite/sim/frv/mqlclrhs.cgs b/sim/testsuite/frv/mqlclrhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqlclrhs.cgs
rename to sim/testsuite/frv/mqlclrhs.cgs

diff --git a/sim/testsuite/sim/frv/mqlmths.cgs b/sim/testsuite/frv/mqlmths.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqlmths.cgs
rename to sim/testsuite/frv/mqlmths.cgs

diff --git a/sim/testsuite/sim/frv/mqmachs.cgs b/sim/testsuite/frv/mqmachs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqmachs.cgs
rename to sim/testsuite/frv/mqmachs.cgs

diff --git a/sim/testsuite/sim/frv/mqmachu.cgs b/sim/testsuite/frv/mqmachu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqmachu.cgs
rename to sim/testsuite/frv/mqmachu.cgs

diff --git a/sim/testsuite/sim/frv/mqmacxhs.cgs b/sim/testsuite/frv/mqmacxhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqmacxhs.cgs
rename to sim/testsuite/frv/mqmacxhs.cgs

diff --git a/sim/testsuite/sim/frv/mqmulhs.cgs b/sim/testsuite/frv/mqmulhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqmulhs.cgs
rename to sim/testsuite/frv/mqmulhs.cgs

diff --git a/sim/testsuite/sim/frv/mqmulhu.cgs b/sim/testsuite/frv/mqmulhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqmulhu.cgs
rename to sim/testsuite/frv/mqmulhu.cgs

diff --git a/sim/testsuite/sim/frv/mqmulxhs.cgs b/sim/testsuite/frv/mqmulxhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqmulxhs.cgs
rename to sim/testsuite/frv/mqmulxhs.cgs

diff --git a/sim/testsuite/sim/frv/mqmulxhu.cgs b/sim/testsuite/frv/mqmulxhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqmulxhu.cgs
rename to sim/testsuite/frv/mqmulxhu.cgs

diff --git a/sim/testsuite/sim/frv/mqsaths.cgs b/sim/testsuite/frv/mqsaths.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqsaths.cgs
rename to sim/testsuite/frv/mqsaths.cgs

diff --git a/sim/testsuite/sim/frv/mqsllhi.cgs b/sim/testsuite/frv/mqsllhi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqsllhi.cgs
rename to sim/testsuite/frv/mqsllhi.cgs

diff --git a/sim/testsuite/sim/frv/mqsrahi.cgs b/sim/testsuite/frv/mqsrahi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqsrahi.cgs
rename to sim/testsuite/frv/mqsrahi.cgs

diff --git a/sim/testsuite/sim/frv/mqxmachs.cgs b/sim/testsuite/frv/mqxmachs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqxmachs.cgs
rename to sim/testsuite/frv/mqxmachs.cgs

diff --git a/sim/testsuite/sim/frv/mqxmacxhs.cgs b/sim/testsuite/frv/mqxmacxhs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mqxmacxhs.cgs
rename to sim/testsuite/frv/mqxmacxhs.cgs

diff --git a/sim/testsuite/sim/frv/mrdacc.cgs b/sim/testsuite/frv/mrdacc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mrdacc.cgs
rename to sim/testsuite/frv/mrdacc.cgs

diff --git a/sim/testsuite/sim/frv/mrdaccg.cgs b/sim/testsuite/frv/mrdaccg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mrdaccg.cgs
rename to sim/testsuite/frv/mrdaccg.cgs

diff --git a/sim/testsuite/sim/frv/mrotli.cgs b/sim/testsuite/frv/mrotli.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mrotli.cgs
rename to sim/testsuite/frv/mrotli.cgs

diff --git a/sim/testsuite/sim/frv/mrotri.cgs b/sim/testsuite/frv/mrotri.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mrotri.cgs
rename to sim/testsuite/frv/mrotri.cgs

diff --git a/sim/testsuite/sim/frv/msaths.cgs b/sim/testsuite/frv/msaths.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/msaths.cgs
rename to sim/testsuite/frv/msaths.cgs

diff --git a/sim/testsuite/sim/frv/msathu.cgs b/sim/testsuite/frv/msathu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/msathu.cgs
rename to sim/testsuite/frv/msathu.cgs

diff --git a/sim/testsuite/sim/frv/msllhi.cgs b/sim/testsuite/frv/msllhi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/msllhi.cgs
rename to sim/testsuite/frv/msllhi.cgs

diff --git a/sim/testsuite/sim/frv/msrahi.cgs b/sim/testsuite/frv/msrahi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/msrahi.cgs
rename to sim/testsuite/frv/msrahi.cgs

diff --git a/sim/testsuite/sim/frv/msrlhi.cgs b/sim/testsuite/frv/msrlhi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/msrlhi.cgs
rename to sim/testsuite/frv/msrlhi.cgs

diff --git a/sim/testsuite/sim/frv/msubhss.cgs b/sim/testsuite/frv/msubhss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/msubhss.cgs
rename to sim/testsuite/frv/msubhss.cgs

diff --git a/sim/testsuite/sim/frv/msubhus.cgs b/sim/testsuite/frv/msubhus.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/msubhus.cgs
rename to sim/testsuite/frv/msubhus.cgs

diff --git a/sim/testsuite/sim/frv/mtrap.cgs b/sim/testsuite/frv/mtrap.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mtrap.cgs
rename to sim/testsuite/frv/mtrap.cgs

diff --git a/sim/testsuite/sim/frv/munpackh.cgs b/sim/testsuite/frv/munpackh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/munpackh.cgs
rename to sim/testsuite/frv/munpackh.cgs

diff --git a/sim/testsuite/sim/frv/mwcut.cgs b/sim/testsuite/frv/mwcut.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mwcut.cgs
rename to sim/testsuite/frv/mwcut.cgs

diff --git a/sim/testsuite/sim/frv/mwcuti.cgs b/sim/testsuite/frv/mwcuti.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mwcuti.cgs
rename to sim/testsuite/frv/mwcuti.cgs

diff --git a/sim/testsuite/sim/frv/mwtacc.cgs b/sim/testsuite/frv/mwtacc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mwtacc.cgs
rename to sim/testsuite/frv/mwtacc.cgs

diff --git a/sim/testsuite/sim/frv/mwtaccg.cgs b/sim/testsuite/frv/mwtaccg.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mwtaccg.cgs
rename to sim/testsuite/frv/mwtaccg.cgs

diff --git a/sim/testsuite/sim/frv/mxor.cgs b/sim/testsuite/frv/mxor.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/mxor.cgs
rename to sim/testsuite/frv/mxor.cgs

diff --git a/sim/testsuite/sim/frv/nandcr.cgs b/sim/testsuite/frv/nandcr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nandcr.cgs
rename to sim/testsuite/frv/nandcr.cgs

diff --git a/sim/testsuite/sim/frv/nandncr.cgs b/sim/testsuite/frv/nandncr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nandncr.cgs
rename to sim/testsuite/frv/nandncr.cgs

diff --git a/sim/testsuite/sim/frv/nfadds.cgs b/sim/testsuite/frv/nfadds.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfadds.cgs
rename to sim/testsuite/frv/nfadds.cgs

diff --git a/sim/testsuite/sim/frv/nfdadds.cgs b/sim/testsuite/frv/nfdadds.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdadds.cgs
rename to sim/testsuite/frv/nfdadds.cgs

diff --git a/sim/testsuite/sim/frv/nfdcmps.cgs b/sim/testsuite/frv/nfdcmps.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdcmps.cgs
rename to sim/testsuite/frv/nfdcmps.cgs

diff --git a/sim/testsuite/sim/frv/nfddivs.cgs b/sim/testsuite/frv/nfddivs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfddivs.cgs
rename to sim/testsuite/frv/nfddivs.cgs

diff --git a/sim/testsuite/sim/frv/nfditos.cgs b/sim/testsuite/frv/nfditos.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfditos.cgs
rename to sim/testsuite/frv/nfditos.cgs

diff --git a/sim/testsuite/sim/frv/nfdivs.cgs b/sim/testsuite/frv/nfdivs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdivs.cgs
rename to sim/testsuite/frv/nfdivs.cgs

diff --git a/sim/testsuite/sim/frv/nfdmadds.cgs b/sim/testsuite/frv/nfdmadds.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdmadds.cgs
rename to sim/testsuite/frv/nfdmadds.cgs

diff --git a/sim/testsuite/sim/frv/nfdmas.cgs b/sim/testsuite/frv/nfdmas.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdmas.cgs
rename to sim/testsuite/frv/nfdmas.cgs

diff --git a/sim/testsuite/sim/frv/nfdmss.cgs b/sim/testsuite/frv/nfdmss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdmss.cgs
rename to sim/testsuite/frv/nfdmss.cgs

diff --git a/sim/testsuite/sim/frv/nfdmulcs.cgs b/sim/testsuite/frv/nfdmulcs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdmulcs.cgs
rename to sim/testsuite/frv/nfdmulcs.cgs

diff --git a/sim/testsuite/sim/frv/nfdmuls.cgs b/sim/testsuite/frv/nfdmuls.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdmuls.cgs
rename to sim/testsuite/frv/nfdmuls.cgs

diff --git a/sim/testsuite/sim/frv/nfdsads.cgs b/sim/testsuite/frv/nfdsads.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdsads.cgs
rename to sim/testsuite/frv/nfdsads.cgs

diff --git a/sim/testsuite/sim/frv/nfdsqrts.cgs b/sim/testsuite/frv/nfdsqrts.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdsqrts.cgs
rename to sim/testsuite/frv/nfdsqrts.cgs

diff --git a/sim/testsuite/sim/frv/nfdstoi.cgs b/sim/testsuite/frv/nfdstoi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdstoi.cgs
rename to sim/testsuite/frv/nfdstoi.cgs

diff --git a/sim/testsuite/sim/frv/nfdsubs.cgs b/sim/testsuite/frv/nfdsubs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfdsubs.cgs
rename to sim/testsuite/frv/nfdsubs.cgs

diff --git a/sim/testsuite/sim/frv/nfitos.cgs b/sim/testsuite/frv/nfitos.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfitos.cgs
rename to sim/testsuite/frv/nfitos.cgs

diff --git a/sim/testsuite/sim/frv/nfmadds.cgs b/sim/testsuite/frv/nfmadds.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfmadds.cgs
rename to sim/testsuite/frv/nfmadds.cgs

diff --git a/sim/testsuite/sim/frv/nfmas.cgs b/sim/testsuite/frv/nfmas.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfmas.cgs
rename to sim/testsuite/frv/nfmas.cgs

diff --git a/sim/testsuite/sim/frv/nfmss.cgs b/sim/testsuite/frv/nfmss.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfmss.cgs
rename to sim/testsuite/frv/nfmss.cgs

diff --git a/sim/testsuite/sim/frv/nfmsubs.cgs b/sim/testsuite/frv/nfmsubs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfmsubs.cgs
rename to sim/testsuite/frv/nfmsubs.cgs

diff --git a/sim/testsuite/sim/frv/nfmuls.cgs b/sim/testsuite/frv/nfmuls.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfmuls.cgs
rename to sim/testsuite/frv/nfmuls.cgs

diff --git a/sim/testsuite/sim/frv/nfsqrts.cgs b/sim/testsuite/frv/nfsqrts.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfsqrts.cgs
rename to sim/testsuite/frv/nfsqrts.cgs

diff --git a/sim/testsuite/sim/frv/nfstoi.cgs b/sim/testsuite/frv/nfstoi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfstoi.cgs
rename to sim/testsuite/frv/nfstoi.cgs

diff --git a/sim/testsuite/sim/frv/nfsubs.cgs b/sim/testsuite/frv/nfsubs.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nfsubs.cgs
rename to sim/testsuite/frv/nfsubs.cgs

diff --git a/sim/testsuite/sim/frv/nld.cgs b/sim/testsuite/frv/nld.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nld.cgs
rename to sim/testsuite/frv/nld.cgs

diff --git a/sim/testsuite/sim/frv/nldbf.cgs b/sim/testsuite/frv/nldbf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldbf.cgs
rename to sim/testsuite/frv/nldbf.cgs

diff --git a/sim/testsuite/sim/frv/nldbfi.cgs b/sim/testsuite/frv/nldbfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldbfi.cgs
rename to sim/testsuite/frv/nldbfi.cgs

diff --git a/sim/testsuite/sim/frv/nldbfu.cgs b/sim/testsuite/frv/nldbfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldbfu.cgs
rename to sim/testsuite/frv/nldbfu.cgs

diff --git a/sim/testsuite/sim/frv/nldd.cgs b/sim/testsuite/frv/nldd.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldd.cgs
rename to sim/testsuite/frv/nldd.cgs

diff --git a/sim/testsuite/sim/frv/nlddf.cgs b/sim/testsuite/frv/nlddf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nlddf.cgs
rename to sim/testsuite/frv/nlddf.cgs

diff --git a/sim/testsuite/sim/frv/nlddfi.cgs b/sim/testsuite/frv/nlddfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nlddfi.cgs
rename to sim/testsuite/frv/nlddfi.cgs

diff --git a/sim/testsuite/sim/frv/nlddfu.cgs b/sim/testsuite/frv/nlddfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nlddfu.cgs
rename to sim/testsuite/frv/nlddfu.cgs

diff --git a/sim/testsuite/sim/frv/nlddi.cgs b/sim/testsuite/frv/nlddi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nlddi.cgs
rename to sim/testsuite/frv/nlddi.cgs

diff --git a/sim/testsuite/sim/frv/nlddu.cgs b/sim/testsuite/frv/nlddu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nlddu.cgs
rename to sim/testsuite/frv/nlddu.cgs

diff --git a/sim/testsuite/sim/frv/nldf.cgs b/sim/testsuite/frv/nldf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldf.cgs
rename to sim/testsuite/frv/nldf.cgs

diff --git a/sim/testsuite/sim/frv/nldfi.cgs b/sim/testsuite/frv/nldfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldfi.cgs
rename to sim/testsuite/frv/nldfi.cgs

diff --git a/sim/testsuite/sim/frv/nldfu.cgs b/sim/testsuite/frv/nldfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldfu.cgs
rename to sim/testsuite/frv/nldfu.cgs

diff --git a/sim/testsuite/sim/frv/nldhf.cgs b/sim/testsuite/frv/nldhf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldhf.cgs
rename to sim/testsuite/frv/nldhf.cgs

diff --git a/sim/testsuite/sim/frv/nldhfi.cgs b/sim/testsuite/frv/nldhfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldhfi.cgs
rename to sim/testsuite/frv/nldhfi.cgs

diff --git a/sim/testsuite/sim/frv/nldhfu.cgs b/sim/testsuite/frv/nldhfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldhfu.cgs
rename to sim/testsuite/frv/nldhfu.cgs

diff --git a/sim/testsuite/sim/frv/nldi.cgs b/sim/testsuite/frv/nldi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldi.cgs
rename to sim/testsuite/frv/nldi.cgs

diff --git a/sim/testsuite/sim/frv/nldq.cgs b/sim/testsuite/frv/nldq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldq.cgs
rename to sim/testsuite/frv/nldq.cgs

diff --git a/sim/testsuite/sim/frv/nldqf.cgs b/sim/testsuite/frv/nldqf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldqf.cgs
rename to sim/testsuite/frv/nldqf.cgs

diff --git a/sim/testsuite/sim/frv/nldqfi.cgs b/sim/testsuite/frv/nldqfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldqfi.cgs
rename to sim/testsuite/frv/nldqfi.cgs

diff --git a/sim/testsuite/sim/frv/nldqfu.cgs b/sim/testsuite/frv/nldqfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldqfu.cgs
rename to sim/testsuite/frv/nldqfu.cgs

diff --git a/sim/testsuite/sim/frv/nldqu.cgs b/sim/testsuite/frv/nldqu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldqu.cgs
rename to sim/testsuite/frv/nldqu.cgs

diff --git a/sim/testsuite/sim/frv/nldsb.cgs b/sim/testsuite/frv/nldsb.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldsb.cgs
rename to sim/testsuite/frv/nldsb.cgs

diff --git a/sim/testsuite/sim/frv/nldsbi.cgs b/sim/testsuite/frv/nldsbi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldsbi.cgs
rename to sim/testsuite/frv/nldsbi.cgs

diff --git a/sim/testsuite/sim/frv/nldsbu.cgs b/sim/testsuite/frv/nldsbu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldsbu.cgs
rename to sim/testsuite/frv/nldsbu.cgs

diff --git a/sim/testsuite/sim/frv/nldsh.cgs b/sim/testsuite/frv/nldsh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldsh.cgs
rename to sim/testsuite/frv/nldsh.cgs

diff --git a/sim/testsuite/sim/frv/nldshi.cgs b/sim/testsuite/frv/nldshi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldshi.cgs
rename to sim/testsuite/frv/nldshi.cgs

diff --git a/sim/testsuite/sim/frv/nldshu.cgs b/sim/testsuite/frv/nldshu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldshu.cgs
rename to sim/testsuite/frv/nldshu.cgs

diff --git a/sim/testsuite/sim/frv/nldu.cgs b/sim/testsuite/frv/nldu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldu.cgs
rename to sim/testsuite/frv/nldu.cgs

diff --git a/sim/testsuite/sim/frv/nldub.cgs b/sim/testsuite/frv/nldub.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldub.cgs
rename to sim/testsuite/frv/nldub.cgs

diff --git a/sim/testsuite/sim/frv/nldubi.cgs b/sim/testsuite/frv/nldubi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldubi.cgs
rename to sim/testsuite/frv/nldubi.cgs

diff --git a/sim/testsuite/sim/frv/nldubu.cgs b/sim/testsuite/frv/nldubu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nldubu.cgs
rename to sim/testsuite/frv/nldubu.cgs

diff --git a/sim/testsuite/sim/frv/nlduh.cgs b/sim/testsuite/frv/nlduh.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nlduh.cgs
rename to sim/testsuite/frv/nlduh.cgs

diff --git a/sim/testsuite/sim/frv/nlduhi.cgs b/sim/testsuite/frv/nlduhi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nlduhi.cgs
rename to sim/testsuite/frv/nlduhi.cgs

diff --git a/sim/testsuite/sim/frv/nlduhu.cgs b/sim/testsuite/frv/nlduhu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nlduhu.cgs
rename to sim/testsuite/frv/nlduhu.cgs

diff --git a/sim/testsuite/sim/frv/nop.cgs b/sim/testsuite/frv/nop.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nop.cgs
rename to sim/testsuite/frv/nop.cgs

diff --git a/sim/testsuite/sim/frv/norcr.cgs b/sim/testsuite/frv/norcr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/norcr.cgs
rename to sim/testsuite/frv/norcr.cgs

diff --git a/sim/testsuite/sim/frv/norncr.cgs b/sim/testsuite/frv/norncr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/norncr.cgs
rename to sim/testsuite/frv/norncr.cgs

diff --git a/sim/testsuite/sim/frv/not.cgs b/sim/testsuite/frv/not.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/not.cgs
rename to sim/testsuite/frv/not.cgs

diff --git a/sim/testsuite/sim/frv/notcr.cgs b/sim/testsuite/frv/notcr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/notcr.cgs
rename to sim/testsuite/frv/notcr.cgs

diff --git a/sim/testsuite/sim/frv/nsdiv.cgs b/sim/testsuite/frv/nsdiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nsdiv.cgs
rename to sim/testsuite/frv/nsdiv.cgs

diff --git a/sim/testsuite/sim/frv/nsdivi.cgs b/sim/testsuite/frv/nsdivi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nsdivi.cgs
rename to sim/testsuite/frv/nsdivi.cgs

diff --git a/sim/testsuite/sim/frv/nudiv.cgs b/sim/testsuite/frv/nudiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nudiv.cgs
rename to sim/testsuite/frv/nudiv.cgs

diff --git a/sim/testsuite/sim/frv/nudivi.cgs b/sim/testsuite/frv/nudivi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/nudivi.cgs
rename to sim/testsuite/frv/nudivi.cgs

diff --git a/sim/testsuite/sim/frv/or.cgs b/sim/testsuite/frv/or.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/or.cgs
rename to sim/testsuite/frv/or.cgs

diff --git a/sim/testsuite/sim/frv/orcc.cgs b/sim/testsuite/frv/orcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/orcc.cgs
rename to sim/testsuite/frv/orcc.cgs

diff --git a/sim/testsuite/sim/frv/orcr.cgs b/sim/testsuite/frv/orcr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/orcr.cgs
rename to sim/testsuite/frv/orcr.cgs

diff --git a/sim/testsuite/sim/frv/ori.cgs b/sim/testsuite/frv/ori.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ori.cgs
rename to sim/testsuite/frv/ori.cgs

diff --git a/sim/testsuite/sim/frv/oricc.cgs b/sim/testsuite/frv/oricc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/oricc.cgs
rename to sim/testsuite/frv/oricc.cgs

diff --git a/sim/testsuite/sim/frv/orncr.cgs b/sim/testsuite/frv/orncr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/orncr.cgs
rename to sim/testsuite/frv/orncr.cgs

diff --git a/sim/testsuite/sim/frv/parallel.exp b/sim/testsuite/frv/parallel.exp
similarity index 100%
rename from sim/testsuite/sim/frv/parallel.exp
rename to sim/testsuite/frv/parallel.exp

diff --git a/sim/testsuite/sim/frv/ret.cgs b/sim/testsuite/frv/ret.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/ret.cgs
rename to sim/testsuite/frv/ret.cgs

diff --git a/sim/testsuite/sim/frv/rett.cgs b/sim/testsuite/frv/rett.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/rett.cgs
rename to sim/testsuite/frv/rett.cgs

diff --git a/sim/testsuite/sim/frv/scan.cgs b/sim/testsuite/frv/scan.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/scan.cgs
rename to sim/testsuite/frv/scan.cgs

diff --git a/sim/testsuite/sim/frv/scani.cgs b/sim/testsuite/frv/scani.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/scani.cgs
rename to sim/testsuite/frv/scani.cgs

diff --git a/sim/testsuite/sim/frv/sdiv.cgs b/sim/testsuite/frv/sdiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sdiv.cgs
rename to sim/testsuite/frv/sdiv.cgs

diff --git a/sim/testsuite/sim/frv/sdivi.cgs b/sim/testsuite/frv/sdivi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sdivi.cgs
rename to sim/testsuite/frv/sdivi.cgs

diff --git a/sim/testsuite/sim/frv/sethi.cgs b/sim/testsuite/frv/sethi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sethi.cgs
rename to sim/testsuite/frv/sethi.cgs

diff --git a/sim/testsuite/sim/frv/sethilo.pcgs b/sim/testsuite/frv/sethilo.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/sethilo.pcgs
rename to sim/testsuite/frv/sethilo.pcgs

diff --git a/sim/testsuite/sim/frv/setlo.cgs b/sim/testsuite/frv/setlo.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/setlo.cgs
rename to sim/testsuite/frv/setlo.cgs

diff --git a/sim/testsuite/sim/frv/setlos.cgs b/sim/testsuite/frv/setlos.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/setlos.cgs
rename to sim/testsuite/frv/setlos.cgs

diff --git a/sim/testsuite/sim/frv/sll.cgs b/sim/testsuite/frv/sll.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sll.cgs
rename to sim/testsuite/frv/sll.cgs

diff --git a/sim/testsuite/sim/frv/sllcc.cgs b/sim/testsuite/frv/sllcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sllcc.cgs
rename to sim/testsuite/frv/sllcc.cgs

diff --git a/sim/testsuite/sim/frv/slli.cgs b/sim/testsuite/frv/slli.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/slli.cgs
rename to sim/testsuite/frv/slli.cgs

diff --git a/sim/testsuite/sim/frv/sllicc.cgs b/sim/testsuite/frv/sllicc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sllicc.cgs
rename to sim/testsuite/frv/sllicc.cgs

diff --git a/sim/testsuite/sim/frv/smul.cgs b/sim/testsuite/frv/smul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/smul.cgs
rename to sim/testsuite/frv/smul.cgs

diff --git a/sim/testsuite/sim/frv/smulcc.cgs b/sim/testsuite/frv/smulcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/smulcc.cgs
rename to sim/testsuite/frv/smulcc.cgs

diff --git a/sim/testsuite/sim/frv/smuli.cgs b/sim/testsuite/frv/smuli.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/smuli.cgs
rename to sim/testsuite/frv/smuli.cgs

diff --git a/sim/testsuite/sim/frv/smulicc.cgs b/sim/testsuite/frv/smulicc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/smulicc.cgs
rename to sim/testsuite/frv/smulicc.cgs

diff --git a/sim/testsuite/sim/frv/sra.cgs b/sim/testsuite/frv/sra.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sra.cgs
rename to sim/testsuite/frv/sra.cgs

diff --git a/sim/testsuite/sim/frv/sracc.cgs b/sim/testsuite/frv/sracc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sracc.cgs
rename to sim/testsuite/frv/sracc.cgs

diff --git a/sim/testsuite/sim/frv/srai.cgs b/sim/testsuite/frv/srai.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/srai.cgs
rename to sim/testsuite/frv/srai.cgs

diff --git a/sim/testsuite/sim/frv/sraicc.cgs b/sim/testsuite/frv/sraicc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sraicc.cgs
rename to sim/testsuite/frv/sraicc.cgs

diff --git a/sim/testsuite/sim/frv/srl.cgs b/sim/testsuite/frv/srl.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/srl.cgs
rename to sim/testsuite/frv/srl.cgs

diff --git a/sim/testsuite/sim/frv/srlcc.cgs b/sim/testsuite/frv/srlcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/srlcc.cgs
rename to sim/testsuite/frv/srlcc.cgs

diff --git a/sim/testsuite/sim/frv/srli.cgs b/sim/testsuite/frv/srli.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/srli.cgs
rename to sim/testsuite/frv/srli.cgs

diff --git a/sim/testsuite/sim/frv/srlicc.cgs b/sim/testsuite/frv/srlicc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/srlicc.cgs
rename to sim/testsuite/frv/srlicc.cgs

diff --git a/sim/testsuite/sim/frv/st.cgs b/sim/testsuite/frv/st.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/st.cgs
rename to sim/testsuite/frv/st.cgs

diff --git a/sim/testsuite/sim/frv/stb.cgs b/sim/testsuite/frv/stb.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stb.cgs
rename to sim/testsuite/frv/stb.cgs

diff --git a/sim/testsuite/sim/frv/stbf.cgs b/sim/testsuite/frv/stbf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stbf.cgs
rename to sim/testsuite/frv/stbf.cgs

diff --git a/sim/testsuite/sim/frv/stbfi.cgs b/sim/testsuite/frv/stbfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stbfi.cgs
rename to sim/testsuite/frv/stbfi.cgs

diff --git a/sim/testsuite/sim/frv/stbfu.cgs b/sim/testsuite/frv/stbfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stbfu.cgs
rename to sim/testsuite/frv/stbfu.cgs

diff --git a/sim/testsuite/sim/frv/stbi.cgs b/sim/testsuite/frv/stbi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stbi.cgs
rename to sim/testsuite/frv/stbi.cgs

diff --git a/sim/testsuite/sim/frv/stbu.cgs b/sim/testsuite/frv/stbu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stbu.cgs
rename to sim/testsuite/frv/stbu.cgs

diff --git a/sim/testsuite/sim/frv/stc.cgs b/sim/testsuite/frv/stc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stc.cgs
rename to sim/testsuite/frv/stc.cgs

diff --git a/sim/testsuite/sim/frv/stcu.cgs b/sim/testsuite/frv/stcu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stcu.cgs
rename to sim/testsuite/frv/stcu.cgs

diff --git a/sim/testsuite/sim/frv/std.cgs b/sim/testsuite/frv/std.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/std.cgs
rename to sim/testsuite/frv/std.cgs

diff --git a/sim/testsuite/sim/frv/std.pcgs b/sim/testsuite/frv/std.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/std.pcgs
rename to sim/testsuite/frv/std.pcgs

diff --git a/sim/testsuite/sim/frv/stdc.cgs b/sim/testsuite/frv/stdc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stdc.cgs
rename to sim/testsuite/frv/stdc.cgs

diff --git a/sim/testsuite/sim/frv/stdc.pcgs b/sim/testsuite/frv/stdc.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/stdc.pcgs
rename to sim/testsuite/frv/stdc.pcgs

diff --git a/sim/testsuite/sim/frv/stdcu.cgs b/sim/testsuite/frv/stdcu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stdcu.cgs
rename to sim/testsuite/frv/stdcu.cgs

diff --git a/sim/testsuite/sim/frv/stdf.cgs b/sim/testsuite/frv/stdf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stdf.cgs
rename to sim/testsuite/frv/stdf.cgs

diff --git a/sim/testsuite/sim/frv/stdf.pcgs b/sim/testsuite/frv/stdf.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/stdf.pcgs
rename to sim/testsuite/frv/stdf.pcgs

diff --git a/sim/testsuite/sim/frv/stdfi.cgs b/sim/testsuite/frv/stdfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stdfi.cgs
rename to sim/testsuite/frv/stdfi.cgs

diff --git a/sim/testsuite/sim/frv/stdfu.cgs b/sim/testsuite/frv/stdfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stdfu.cgs
rename to sim/testsuite/frv/stdfu.cgs

diff --git a/sim/testsuite/sim/frv/stdi.cgs b/sim/testsuite/frv/stdi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stdi.cgs
rename to sim/testsuite/frv/stdi.cgs

diff --git a/sim/testsuite/sim/frv/stdu.cgs b/sim/testsuite/frv/stdu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stdu.cgs
rename to sim/testsuite/frv/stdu.cgs

diff --git a/sim/testsuite/sim/frv/stf.cgs b/sim/testsuite/frv/stf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stf.cgs
rename to sim/testsuite/frv/stf.cgs

diff --git a/sim/testsuite/sim/frv/stfi.cgs b/sim/testsuite/frv/stfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stfi.cgs
rename to sim/testsuite/frv/stfi.cgs

diff --git a/sim/testsuite/sim/frv/stfu.cgs b/sim/testsuite/frv/stfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stfu.cgs
rename to sim/testsuite/frv/stfu.cgs

diff --git a/sim/testsuite/sim/frv/sth.cgs b/sim/testsuite/frv/sth.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sth.cgs
rename to sim/testsuite/frv/sth.cgs

diff --git a/sim/testsuite/sim/frv/sthf.cgs b/sim/testsuite/frv/sthf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sthf.cgs
rename to sim/testsuite/frv/sthf.cgs

diff --git a/sim/testsuite/sim/frv/sthfi.cgs b/sim/testsuite/frv/sthfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sthfi.cgs
rename to sim/testsuite/frv/sthfi.cgs

diff --git a/sim/testsuite/sim/frv/sthfu.cgs b/sim/testsuite/frv/sthfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sthfu.cgs
rename to sim/testsuite/frv/sthfu.cgs

diff --git a/sim/testsuite/sim/frv/sthi.cgs b/sim/testsuite/frv/sthi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sthi.cgs
rename to sim/testsuite/frv/sthi.cgs

diff --git a/sim/testsuite/sim/frv/sthu.cgs b/sim/testsuite/frv/sthu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sthu.cgs
rename to sim/testsuite/frv/sthu.cgs

diff --git a/sim/testsuite/sim/frv/sti.cgs b/sim/testsuite/frv/sti.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sti.cgs
rename to sim/testsuite/frv/sti.cgs

diff --git a/sim/testsuite/sim/frv/stq.cgs b/sim/testsuite/frv/stq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stq.cgs
rename to sim/testsuite/frv/stq.cgs

diff --git a/sim/testsuite/sim/frv/stq.pcgs b/sim/testsuite/frv/stq.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/stq.pcgs
rename to sim/testsuite/frv/stq.pcgs

diff --git a/sim/testsuite/sim/frv/stqc.cgs b/sim/testsuite/frv/stqc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stqc.cgs
rename to sim/testsuite/frv/stqc.cgs

diff --git a/sim/testsuite/sim/frv/stqc.pcgs b/sim/testsuite/frv/stqc.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/stqc.pcgs
rename to sim/testsuite/frv/stqc.pcgs

diff --git a/sim/testsuite/sim/frv/stqcu.cgs b/sim/testsuite/frv/stqcu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stqcu.cgs
rename to sim/testsuite/frv/stqcu.cgs

diff --git a/sim/testsuite/sim/frv/stqf.cgs b/sim/testsuite/frv/stqf.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stqf.cgs
rename to sim/testsuite/frv/stqf.cgs

diff --git a/sim/testsuite/sim/frv/stqf.pcgs b/sim/testsuite/frv/stqf.pcgs
similarity index 100%
rename from sim/testsuite/sim/frv/stqf.pcgs
rename to sim/testsuite/frv/stqf.pcgs

diff --git a/sim/testsuite/sim/frv/stqfi.cgs b/sim/testsuite/frv/stqfi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stqfi.cgs
rename to sim/testsuite/frv/stqfi.cgs

diff --git a/sim/testsuite/sim/frv/stqfu.cgs b/sim/testsuite/frv/stqfu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stqfu.cgs
rename to sim/testsuite/frv/stqfu.cgs

diff --git a/sim/testsuite/sim/frv/stqi.cgs b/sim/testsuite/frv/stqi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stqi.cgs
rename to sim/testsuite/frv/stqi.cgs

diff --git a/sim/testsuite/sim/frv/stqu.cgs b/sim/testsuite/frv/stqu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stqu.cgs
rename to sim/testsuite/frv/stqu.cgs

diff --git a/sim/testsuite/sim/frv/stu.cgs b/sim/testsuite/frv/stu.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/stu.cgs
rename to sim/testsuite/frv/stu.cgs

diff --git a/sim/testsuite/sim/frv/sub.cgs b/sim/testsuite/frv/sub.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/sub.cgs
rename to sim/testsuite/frv/sub.cgs

diff --git a/sim/testsuite/sim/frv/subcc.cgs b/sim/testsuite/frv/subcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/subcc.cgs
rename to sim/testsuite/frv/subcc.cgs

diff --git a/sim/testsuite/sim/frv/subi.cgs b/sim/testsuite/frv/subi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/subi.cgs
rename to sim/testsuite/frv/subi.cgs

diff --git a/sim/testsuite/sim/frv/subicc.cgs b/sim/testsuite/frv/subicc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/subicc.cgs
rename to sim/testsuite/frv/subicc.cgs

diff --git a/sim/testsuite/sim/frv/subx.cgs b/sim/testsuite/frv/subx.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/subx.cgs
rename to sim/testsuite/frv/subx.cgs

diff --git a/sim/testsuite/sim/frv/subxcc.cgs b/sim/testsuite/frv/subxcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/subxcc.cgs
rename to sim/testsuite/frv/subxcc.cgs

diff --git a/sim/testsuite/sim/frv/subxi.cgs b/sim/testsuite/frv/subxi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/subxi.cgs
rename to sim/testsuite/frv/subxi.cgs

diff --git a/sim/testsuite/sim/frv/subxicc.cgs b/sim/testsuite/frv/subxicc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/subxicc.cgs
rename to sim/testsuite/frv/subxicc.cgs

diff --git a/sim/testsuite/sim/frv/swap.cgs b/sim/testsuite/frv/swap.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/swap.cgs
rename to sim/testsuite/frv/swap.cgs

diff --git a/sim/testsuite/sim/frv/swapi.cgs b/sim/testsuite/frv/swapi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/swapi.cgs
rename to sim/testsuite/frv/swapi.cgs

diff --git a/sim/testsuite/sim/frv/tc.cgs b/sim/testsuite/frv/tc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tc.cgs
rename to sim/testsuite/frv/tc.cgs

diff --git a/sim/testsuite/sim/frv/teq.cgs b/sim/testsuite/frv/teq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/teq.cgs
rename to sim/testsuite/frv/teq.cgs

diff --git a/sim/testsuite/sim/frv/testutils.inc b/sim/testsuite/frv/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/frv/testutils.inc
rename to sim/testsuite/frv/testutils.inc

diff --git a/sim/testsuite/sim/frv/tge.cgs b/sim/testsuite/frv/tge.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tge.cgs
rename to sim/testsuite/frv/tge.cgs

diff --git a/sim/testsuite/sim/frv/tgt.cgs b/sim/testsuite/frv/tgt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tgt.cgs
rename to sim/testsuite/frv/tgt.cgs

diff --git a/sim/testsuite/sim/frv/thi.cgs b/sim/testsuite/frv/thi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/thi.cgs
rename to sim/testsuite/frv/thi.cgs

diff --git a/sim/testsuite/sim/frv/tic.cgs b/sim/testsuite/frv/tic.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tic.cgs
rename to sim/testsuite/frv/tic.cgs

diff --git a/sim/testsuite/sim/frv/tieq.cgs b/sim/testsuite/frv/tieq.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tieq.cgs
rename to sim/testsuite/frv/tieq.cgs

diff --git a/sim/testsuite/sim/frv/tige.cgs b/sim/testsuite/frv/tige.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tige.cgs
rename to sim/testsuite/frv/tige.cgs

diff --git a/sim/testsuite/sim/frv/tigt.cgs b/sim/testsuite/frv/tigt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tigt.cgs
rename to sim/testsuite/frv/tigt.cgs

diff --git a/sim/testsuite/sim/frv/tihi.cgs b/sim/testsuite/frv/tihi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tihi.cgs
rename to sim/testsuite/frv/tihi.cgs

diff --git a/sim/testsuite/sim/frv/tile.cgs b/sim/testsuite/frv/tile.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tile.cgs
rename to sim/testsuite/frv/tile.cgs

diff --git a/sim/testsuite/sim/frv/tils.cgs b/sim/testsuite/frv/tils.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tils.cgs
rename to sim/testsuite/frv/tils.cgs

diff --git a/sim/testsuite/sim/frv/tilt.cgs b/sim/testsuite/frv/tilt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tilt.cgs
rename to sim/testsuite/frv/tilt.cgs

diff --git a/sim/testsuite/sim/frv/tin.cgs b/sim/testsuite/frv/tin.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tin.cgs
rename to sim/testsuite/frv/tin.cgs

diff --git a/sim/testsuite/sim/frv/tinc.cgs b/sim/testsuite/frv/tinc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tinc.cgs
rename to sim/testsuite/frv/tinc.cgs

diff --git a/sim/testsuite/sim/frv/tine.cgs b/sim/testsuite/frv/tine.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tine.cgs
rename to sim/testsuite/frv/tine.cgs

diff --git a/sim/testsuite/sim/frv/tino.cgs b/sim/testsuite/frv/tino.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tino.cgs
rename to sim/testsuite/frv/tino.cgs

diff --git a/sim/testsuite/sim/frv/tinv.cgs b/sim/testsuite/frv/tinv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tinv.cgs
rename to sim/testsuite/frv/tinv.cgs

diff --git a/sim/testsuite/sim/frv/tip.cgs b/sim/testsuite/frv/tip.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tip.cgs
rename to sim/testsuite/frv/tip.cgs

diff --git a/sim/testsuite/sim/frv/tira.cgs b/sim/testsuite/frv/tira.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tira.cgs
rename to sim/testsuite/frv/tira.cgs

diff --git a/sim/testsuite/sim/frv/tiv.cgs b/sim/testsuite/frv/tiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tiv.cgs
rename to sim/testsuite/frv/tiv.cgs

diff --git a/sim/testsuite/sim/frv/tle.cgs b/sim/testsuite/frv/tle.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tle.cgs
rename to sim/testsuite/frv/tle.cgs

diff --git a/sim/testsuite/sim/frv/tls.cgs b/sim/testsuite/frv/tls.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tls.cgs
rename to sim/testsuite/frv/tls.cgs

diff --git a/sim/testsuite/sim/frv/tlt.cgs b/sim/testsuite/frv/tlt.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tlt.cgs
rename to sim/testsuite/frv/tlt.cgs

diff --git a/sim/testsuite/sim/frv/tn.cgs b/sim/testsuite/frv/tn.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tn.cgs
rename to sim/testsuite/frv/tn.cgs

diff --git a/sim/testsuite/sim/frv/tnc.cgs b/sim/testsuite/frv/tnc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tnc.cgs
rename to sim/testsuite/frv/tnc.cgs

diff --git a/sim/testsuite/sim/frv/tne.cgs b/sim/testsuite/frv/tne.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tne.cgs
rename to sim/testsuite/frv/tne.cgs

diff --git a/sim/testsuite/sim/frv/tno.cgs b/sim/testsuite/frv/tno.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tno.cgs
rename to sim/testsuite/frv/tno.cgs

diff --git a/sim/testsuite/sim/frv/tnv.cgs b/sim/testsuite/frv/tnv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tnv.cgs
rename to sim/testsuite/frv/tnv.cgs

diff --git a/sim/testsuite/sim/frv/tp.cgs b/sim/testsuite/frv/tp.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tp.cgs
rename to sim/testsuite/frv/tp.cgs

diff --git a/sim/testsuite/sim/frv/tra.cgs b/sim/testsuite/frv/tra.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tra.cgs
rename to sim/testsuite/frv/tra.cgs

diff --git a/sim/testsuite/sim/frv/tv.cgs b/sim/testsuite/frv/tv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/tv.cgs
rename to sim/testsuite/frv/tv.cgs

diff --git a/sim/testsuite/sim/frv/udiv.cgs b/sim/testsuite/frv/udiv.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/udiv.cgs
rename to sim/testsuite/frv/udiv.cgs

diff --git a/sim/testsuite/sim/frv/udivi.cgs b/sim/testsuite/frv/udivi.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/udivi.cgs
rename to sim/testsuite/frv/udivi.cgs

diff --git a/sim/testsuite/sim/frv/umul.cgs b/sim/testsuite/frv/umul.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/umul.cgs
rename to sim/testsuite/frv/umul.cgs

diff --git a/sim/testsuite/sim/frv/umulcc.cgs b/sim/testsuite/frv/umulcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/umulcc.cgs
rename to sim/testsuite/frv/umulcc.cgs

diff --git a/sim/testsuite/sim/frv/umuli.cgs b/sim/testsuite/frv/umuli.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/umuli.cgs
rename to sim/testsuite/frv/umuli.cgs

diff --git a/sim/testsuite/sim/frv/umulicc.cgs b/sim/testsuite/frv/umulicc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/umulicc.cgs
rename to sim/testsuite/frv/umulicc.cgs

diff --git a/sim/testsuite/sim/frv/xor.cgs b/sim/testsuite/frv/xor.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/xor.cgs
rename to sim/testsuite/frv/xor.cgs

diff --git a/sim/testsuite/sim/frv/xorcc.cgs b/sim/testsuite/frv/xorcc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/xorcc.cgs
rename to sim/testsuite/frv/xorcc.cgs

diff --git a/sim/testsuite/sim/frv/xorcr.cgs b/sim/testsuite/frv/xorcr.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/xorcr.cgs
rename to sim/testsuite/frv/xorcr.cgs

diff --git a/sim/testsuite/sim/frv/xori.cgs b/sim/testsuite/frv/xori.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/xori.cgs
rename to sim/testsuite/frv/xori.cgs

diff --git a/sim/testsuite/sim/frv/xoricc.cgs b/sim/testsuite/frv/xoricc.cgs
similarity index 100%
rename from sim/testsuite/sim/frv/xoricc.cgs
rename to sim/testsuite/frv/xoricc.cgs

diff --git a/sim/testsuite/sim/ft32/ChangeLog b/sim/testsuite/ft32/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/ft32/ChangeLog
rename to sim/testsuite/ft32/ChangeLog

diff --git a/sim/testsuite/sim/ft32/allinsn.exp b/sim/testsuite/ft32/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/ft32/allinsn.exp
rename to sim/testsuite/ft32/allinsn.exp

diff --git a/sim/testsuite/sim/ft32/basic.s b/sim/testsuite/ft32/basic.s
similarity index 100%
rename from sim/testsuite/sim/ft32/basic.s
rename to sim/testsuite/ft32/basic.s

diff --git a/sim/testsuite/sim/ft32/testutils.inc b/sim/testsuite/ft32/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/ft32/testutils.inc
rename to sim/testsuite/ft32/testutils.inc

diff --git a/sim/testsuite/sim/h8300/ChangeLog b/sim/testsuite/h8300/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/h8300/ChangeLog
rename to sim/testsuite/h8300/ChangeLog

diff --git a/sim/testsuite/sim/h8300/addb.s b/sim/testsuite/h8300/addb.s
similarity index 100%
rename from sim/testsuite/sim/h8300/addb.s
rename to sim/testsuite/h8300/addb.s

diff --git a/sim/testsuite/sim/h8300/addl.s b/sim/testsuite/h8300/addl.s
similarity index 100%
rename from sim/testsuite/sim/h8300/addl.s
rename to sim/testsuite/h8300/addl.s

diff --git a/sim/testsuite/sim/h8300/adds.s b/sim/testsuite/h8300/adds.s
similarity index 100%
rename from sim/testsuite/sim/h8300/adds.s
rename to sim/testsuite/h8300/adds.s

diff --git a/sim/testsuite/sim/h8300/addw.s b/sim/testsuite/h8300/addw.s
similarity index 100%
rename from sim/testsuite/sim/h8300/addw.s
rename to sim/testsuite/h8300/addw.s

diff --git a/sim/testsuite/sim/h8300/addx.s b/sim/testsuite/h8300/addx.s
similarity index 100%
rename from sim/testsuite/sim/h8300/addx.s
rename to sim/testsuite/h8300/addx.s

diff --git a/sim/testsuite/sim/h8300/allinsn.exp b/sim/testsuite/h8300/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/h8300/allinsn.exp
rename to sim/testsuite/h8300/allinsn.exp

diff --git a/sim/testsuite/sim/h8300/andb.s b/sim/testsuite/h8300/andb.s
similarity index 100%
rename from sim/testsuite/sim/h8300/andb.s
rename to sim/testsuite/h8300/andb.s

diff --git a/sim/testsuite/sim/h8300/andl.s b/sim/testsuite/h8300/andl.s
similarity index 100%
rename from sim/testsuite/sim/h8300/andl.s
rename to sim/testsuite/h8300/andl.s

diff --git a/sim/testsuite/sim/h8300/andw.s b/sim/testsuite/h8300/andw.s
similarity index 100%
rename from sim/testsuite/sim/h8300/andw.s
rename to sim/testsuite/h8300/andw.s

diff --git a/sim/testsuite/sim/h8300/band.s b/sim/testsuite/h8300/band.s
similarity index 100%
rename from sim/testsuite/sim/h8300/band.s
rename to sim/testsuite/h8300/band.s

diff --git a/sim/testsuite/sim/h8300/bfld.s b/sim/testsuite/h8300/bfld.s
similarity index 100%
rename from sim/testsuite/sim/h8300/bfld.s
rename to sim/testsuite/h8300/bfld.s

diff --git a/sim/testsuite/sim/h8300/biand.s b/sim/testsuite/h8300/biand.s
similarity index 100%
rename from sim/testsuite/sim/h8300/biand.s
rename to sim/testsuite/h8300/biand.s

diff --git a/sim/testsuite/sim/h8300/bra.s b/sim/testsuite/h8300/bra.s
similarity index 100%
rename from sim/testsuite/sim/h8300/bra.s
rename to sim/testsuite/h8300/bra.s

diff --git a/sim/testsuite/sim/h8300/brabc.s b/sim/testsuite/h8300/brabc.s
similarity index 100%
rename from sim/testsuite/sim/h8300/brabc.s
rename to sim/testsuite/h8300/brabc.s

diff --git a/sim/testsuite/sim/h8300/bset.s b/sim/testsuite/h8300/bset.s
similarity index 100%
rename from sim/testsuite/sim/h8300/bset.s
rename to sim/testsuite/h8300/bset.s

diff --git a/sim/testsuite/sim/h8300/cmpb.s b/sim/testsuite/h8300/cmpb.s
similarity index 100%
rename from sim/testsuite/sim/h8300/cmpb.s
rename to sim/testsuite/h8300/cmpb.s

diff --git a/sim/testsuite/sim/h8300/cmpl.s b/sim/testsuite/h8300/cmpl.s
similarity index 100%
rename from sim/testsuite/sim/h8300/cmpl.s
rename to sim/testsuite/h8300/cmpl.s

diff --git a/sim/testsuite/sim/h8300/cmpw.s b/sim/testsuite/h8300/cmpw.s
similarity index 100%
rename from sim/testsuite/sim/h8300/cmpw.s
rename to sim/testsuite/h8300/cmpw.s

diff --git a/sim/testsuite/sim/h8300/daa.s b/sim/testsuite/h8300/daa.s
similarity index 100%
rename from sim/testsuite/sim/h8300/daa.s
rename to sim/testsuite/h8300/daa.s

diff --git a/sim/testsuite/sim/h8300/das.s b/sim/testsuite/h8300/das.s
similarity index 100%
rename from sim/testsuite/sim/h8300/das.s
rename to sim/testsuite/h8300/das.s

diff --git a/sim/testsuite/sim/h8300/dec.s b/sim/testsuite/h8300/dec.s
similarity index 100%
rename from sim/testsuite/sim/h8300/dec.s
rename to sim/testsuite/h8300/dec.s

diff --git a/sim/testsuite/sim/h8300/div.s b/sim/testsuite/h8300/div.s
similarity index 100%
rename from sim/testsuite/sim/h8300/div.s
rename to sim/testsuite/h8300/div.s

diff --git a/sim/testsuite/sim/h8300/extl.s b/sim/testsuite/h8300/extl.s
similarity index 100%
rename from sim/testsuite/sim/h8300/extl.s
rename to sim/testsuite/h8300/extl.s

diff --git a/sim/testsuite/sim/h8300/extw.s b/sim/testsuite/h8300/extw.s
similarity index 100%
rename from sim/testsuite/sim/h8300/extw.s
rename to sim/testsuite/h8300/extw.s

diff --git a/sim/testsuite/sim/h8300/inc.s b/sim/testsuite/h8300/inc.s
similarity index 100%
rename from sim/testsuite/sim/h8300/inc.s
rename to sim/testsuite/h8300/inc.s

diff --git a/sim/testsuite/sim/h8300/jmp.s b/sim/testsuite/h8300/jmp.s
similarity index 100%
rename from sim/testsuite/sim/h8300/jmp.s
rename to sim/testsuite/h8300/jmp.s

diff --git a/sim/testsuite/sim/h8300/ldc.s b/sim/testsuite/h8300/ldc.s
similarity index 100%
rename from sim/testsuite/sim/h8300/ldc.s
rename to sim/testsuite/h8300/ldc.s

diff --git a/sim/testsuite/sim/h8300/ldm.s b/sim/testsuite/h8300/ldm.s
similarity index 100%
rename from sim/testsuite/sim/h8300/ldm.s
rename to sim/testsuite/h8300/ldm.s

diff --git a/sim/testsuite/sim/h8300/mac.s b/sim/testsuite/h8300/mac.s
similarity index 100%
rename from sim/testsuite/sim/h8300/mac.s
rename to sim/testsuite/h8300/mac.s

diff --git a/sim/testsuite/sim/h8300/mova.s b/sim/testsuite/h8300/mova.s
similarity index 100%
rename from sim/testsuite/sim/h8300/mova.s
rename to sim/testsuite/h8300/mova.s

diff --git a/sim/testsuite/sim/h8300/movb.s b/sim/testsuite/h8300/movb.s
similarity index 100%
rename from sim/testsuite/sim/h8300/movb.s
rename to sim/testsuite/h8300/movb.s

diff --git a/sim/testsuite/sim/h8300/movl.s b/sim/testsuite/h8300/movl.s
similarity index 100%
rename from sim/testsuite/sim/h8300/movl.s
rename to sim/testsuite/h8300/movl.s

diff --git a/sim/testsuite/sim/h8300/movmd.s b/sim/testsuite/h8300/movmd.s
similarity index 100%
rename from sim/testsuite/sim/h8300/movmd.s
rename to sim/testsuite/h8300/movmd.s

diff --git a/sim/testsuite/sim/h8300/movsd.s b/sim/testsuite/h8300/movsd.s
similarity index 100%
rename from sim/testsuite/sim/h8300/movsd.s
rename to sim/testsuite/h8300/movsd.s

diff --git a/sim/testsuite/sim/h8300/movw.s b/sim/testsuite/h8300/movw.s
similarity index 100%
rename from sim/testsuite/sim/h8300/movw.s
rename to sim/testsuite/h8300/movw.s

diff --git a/sim/testsuite/sim/h8300/mul.s b/sim/testsuite/h8300/mul.s
similarity index 100%
rename from sim/testsuite/sim/h8300/mul.s
rename to sim/testsuite/h8300/mul.s

diff --git a/sim/testsuite/sim/h8300/neg.s b/sim/testsuite/h8300/neg.s
similarity index 100%
rename from sim/testsuite/sim/h8300/neg.s
rename to sim/testsuite/h8300/neg.s

diff --git a/sim/testsuite/sim/h8300/nop.s b/sim/testsuite/h8300/nop.s
similarity index 100%
rename from sim/testsuite/sim/h8300/nop.s
rename to sim/testsuite/h8300/nop.s

diff --git a/sim/testsuite/sim/h8300/not.s b/sim/testsuite/h8300/not.s
similarity index 100%
rename from sim/testsuite/sim/h8300/not.s
rename to sim/testsuite/h8300/not.s

diff --git a/sim/testsuite/sim/h8300/orb.s b/sim/testsuite/h8300/orb.s
similarity index 100%
rename from sim/testsuite/sim/h8300/orb.s
rename to sim/testsuite/h8300/orb.s

diff --git a/sim/testsuite/sim/h8300/orl.s b/sim/testsuite/h8300/orl.s
similarity index 100%
rename from sim/testsuite/sim/h8300/orl.s
rename to sim/testsuite/h8300/orl.s

diff --git a/sim/testsuite/sim/h8300/orw.s b/sim/testsuite/h8300/orw.s
similarity index 100%
rename from sim/testsuite/sim/h8300/orw.s
rename to sim/testsuite/h8300/orw.s

diff --git a/sim/testsuite/sim/h8300/rotl.s b/sim/testsuite/h8300/rotl.s
similarity index 100%
rename from sim/testsuite/sim/h8300/rotl.s
rename to sim/testsuite/h8300/rotl.s

diff --git a/sim/testsuite/sim/h8300/rotr.s b/sim/testsuite/h8300/rotr.s
similarity index 100%
rename from sim/testsuite/sim/h8300/rotr.s
rename to sim/testsuite/h8300/rotr.s

diff --git a/sim/testsuite/sim/h8300/rotxl.s b/sim/testsuite/h8300/rotxl.s
similarity index 100%
rename from sim/testsuite/sim/h8300/rotxl.s
rename to sim/testsuite/h8300/rotxl.s

diff --git a/sim/testsuite/sim/h8300/rotxr.s b/sim/testsuite/h8300/rotxr.s
similarity index 100%
rename from sim/testsuite/sim/h8300/rotxr.s
rename to sim/testsuite/h8300/rotxr.s

diff --git a/sim/testsuite/sim/h8300/shal.s b/sim/testsuite/h8300/shal.s
similarity index 100%
rename from sim/testsuite/sim/h8300/shal.s
rename to sim/testsuite/h8300/shal.s

diff --git a/sim/testsuite/sim/h8300/shar.s b/sim/testsuite/h8300/shar.s
similarity index 100%
rename from sim/testsuite/sim/h8300/shar.s
rename to sim/testsuite/h8300/shar.s

diff --git a/sim/testsuite/sim/h8300/shll.s b/sim/testsuite/h8300/shll.s
similarity index 100%
rename from sim/testsuite/sim/h8300/shll.s
rename to sim/testsuite/h8300/shll.s

diff --git a/sim/testsuite/sim/h8300/shlr.s b/sim/testsuite/h8300/shlr.s
similarity index 100%
rename from sim/testsuite/sim/h8300/shlr.s
rename to sim/testsuite/h8300/shlr.s

diff --git a/sim/testsuite/sim/h8300/stack.s b/sim/testsuite/h8300/stack.s
similarity index 100%
rename from sim/testsuite/sim/h8300/stack.s
rename to sim/testsuite/h8300/stack.s

diff --git a/sim/testsuite/sim/h8300/stc.s b/sim/testsuite/h8300/stc.s
similarity index 100%
rename from sim/testsuite/sim/h8300/stc.s
rename to sim/testsuite/h8300/stc.s

diff --git a/sim/testsuite/sim/h8300/subb.s b/sim/testsuite/h8300/subb.s
similarity index 100%
rename from sim/testsuite/sim/h8300/subb.s
rename to sim/testsuite/h8300/subb.s

diff --git a/sim/testsuite/sim/h8300/subl.s b/sim/testsuite/h8300/subl.s
similarity index 100%
rename from sim/testsuite/sim/h8300/subl.s
rename to sim/testsuite/h8300/subl.s

diff --git a/sim/testsuite/sim/h8300/subs.s b/sim/testsuite/h8300/subs.s
similarity index 100%
rename from sim/testsuite/sim/h8300/subs.s
rename to sim/testsuite/h8300/subs.s

diff --git a/sim/testsuite/sim/h8300/subw.s b/sim/testsuite/h8300/subw.s
similarity index 100%
rename from sim/testsuite/sim/h8300/subw.s
rename to sim/testsuite/h8300/subw.s

diff --git a/sim/testsuite/sim/h8300/subx.s b/sim/testsuite/h8300/subx.s
similarity index 100%
rename from sim/testsuite/sim/h8300/subx.s
rename to sim/testsuite/h8300/subx.s

diff --git a/sim/testsuite/sim/h8300/tas.s b/sim/testsuite/h8300/tas.s
similarity index 100%
rename from sim/testsuite/sim/h8300/tas.s
rename to sim/testsuite/h8300/tas.s

diff --git a/sim/testsuite/sim/h8300/testutils.inc b/sim/testsuite/h8300/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/h8300/testutils.inc
rename to sim/testsuite/h8300/testutils.inc

diff --git a/sim/testsuite/sim/h8300/xorb.s b/sim/testsuite/h8300/xorb.s
similarity index 100%
rename from sim/testsuite/sim/h8300/xorb.s
rename to sim/testsuite/h8300/xorb.s

diff --git a/sim/testsuite/sim/h8300/xorl.s b/sim/testsuite/h8300/xorl.s
similarity index 100%
rename from sim/testsuite/sim/h8300/xorl.s
rename to sim/testsuite/h8300/xorl.s

diff --git a/sim/testsuite/sim/h8300/xorw.s b/sim/testsuite/h8300/xorw.s
similarity index 100%
rename from sim/testsuite/sim/h8300/xorw.s
rename to sim/testsuite/h8300/xorw.s

diff --git a/sim/testsuite/sim/iq2000/ChangeLog b/sim/testsuite/iq2000/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/iq2000/ChangeLog
rename to sim/testsuite/iq2000/ChangeLog

diff --git a/sim/testsuite/sim/iq2000/allinsn.exp b/sim/testsuite/iq2000/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/iq2000/allinsn.exp
rename to sim/testsuite/iq2000/allinsn.exp

diff --git a/sim/testsuite/sim/iq2000/pass.s b/sim/testsuite/iq2000/pass.s
similarity index 100%
rename from sim/testsuite/sim/iq2000/pass.s
rename to sim/testsuite/iq2000/pass.s

diff --git a/sim/testsuite/sim/iq2000/testutils.inc b/sim/testsuite/iq2000/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/iq2000/testutils.inc
rename to sim/testsuite/iq2000/testutils.inc

diff --git a/sim/testsuite/sim/lm32/ChangeLog b/sim/testsuite/lm32/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/lm32/ChangeLog
rename to sim/testsuite/lm32/ChangeLog

diff --git a/sim/testsuite/sim/lm32/allinsn.exp b/sim/testsuite/lm32/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/lm32/allinsn.exp
rename to sim/testsuite/lm32/allinsn.exp

diff --git a/sim/testsuite/sim/lm32/pass.s b/sim/testsuite/lm32/pass.s
similarity index 100%
rename from sim/testsuite/sim/lm32/pass.s
rename to sim/testsuite/lm32/pass.s

diff --git a/sim/testsuite/sim/lm32/testutils.inc b/sim/testsuite/lm32/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/lm32/testutils.inc
rename to sim/testsuite/lm32/testutils.inc

diff --git a/sim/testsuite/sim/m32c/ChangeLog b/sim/testsuite/m32c/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/m32c/ChangeLog
rename to sim/testsuite/m32c/ChangeLog

diff --git a/sim/testsuite/sim/m32c/allinsn.exp b/sim/testsuite/m32c/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/m32c/allinsn.exp
rename to sim/testsuite/m32c/allinsn.exp

diff --git a/sim/testsuite/sim/m32c/blinky.s b/sim/testsuite/m32c/blinky.s
similarity index 100%
rename from sim/testsuite/sim/m32c/blinky.s
rename to sim/testsuite/m32c/blinky.s

diff --git a/sim/testsuite/sim/m32c/fail.s b/sim/testsuite/m32c/fail.s
similarity index 100%
rename from sim/testsuite/sim/m32c/fail.s
rename to sim/testsuite/m32c/fail.s

diff --git a/sim/testsuite/sim/m32c/gloss.s b/sim/testsuite/m32c/gloss.s
similarity index 100%
rename from sim/testsuite/sim/m32c/gloss.s
rename to sim/testsuite/m32c/gloss.s

diff --git a/sim/testsuite/sim/m32c/pass.s b/sim/testsuite/m32c/pass.s
similarity index 100%
rename from sim/testsuite/sim/m32c/pass.s
rename to sim/testsuite/m32c/pass.s

diff --git a/sim/testsuite/sim/m32c/sample.ld b/sim/testsuite/m32c/sample.ld
similarity index 100%
rename from sim/testsuite/sim/m32c/sample.ld
rename to sim/testsuite/m32c/sample.ld

diff --git a/sim/testsuite/sim/m32c/sample.s b/sim/testsuite/m32c/sample.s
similarity index 100%
rename from sim/testsuite/sim/m32c/sample.s
rename to sim/testsuite/m32c/sample.s

diff --git a/sim/testsuite/sim/m32c/sample2.c b/sim/testsuite/m32c/sample2.c
similarity index 100%
rename from sim/testsuite/sim/m32c/sample2.c
rename to sim/testsuite/m32c/sample2.c

diff --git a/sim/testsuite/sim/m32c/testutils.inc b/sim/testsuite/m32c/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/m32c/testutils.inc
rename to sim/testsuite/m32c/testutils.inc

diff --git a/sim/testsuite/sim/m32r/ChangeLog b/sim/testsuite/m32r/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/m32r/ChangeLog
rename to sim/testsuite/m32r/ChangeLog

diff --git a/sim/testsuite/sim/m32r/add.cgs b/sim/testsuite/m32r/add.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/add.cgs
rename to sim/testsuite/m32r/add.cgs

diff --git a/sim/testsuite/sim/m32r/add3.cgs b/sim/testsuite/m32r/add3.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/add3.cgs
rename to sim/testsuite/m32r/add3.cgs

diff --git a/sim/testsuite/sim/m32r/addi.cgs b/sim/testsuite/m32r/addi.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/addi.cgs
rename to sim/testsuite/m32r/addi.cgs

diff --git a/sim/testsuite/sim/m32r/addv.cgs b/sim/testsuite/m32r/addv.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/addv.cgs
rename to sim/testsuite/m32r/addv.cgs

diff --git a/sim/testsuite/sim/m32r/addv3.cgs b/sim/testsuite/m32r/addv3.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/addv3.cgs
rename to sim/testsuite/m32r/addv3.cgs

diff --git a/sim/testsuite/sim/m32r/addx.cgs b/sim/testsuite/m32r/addx.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/addx.cgs
rename to sim/testsuite/m32r/addx.cgs

diff --git a/sim/testsuite/sim/m32r/allinsn.exp b/sim/testsuite/m32r/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/m32r/allinsn.exp
rename to sim/testsuite/m32r/allinsn.exp

diff --git a/sim/testsuite/sim/m32r/and.cgs b/sim/testsuite/m32r/and.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/and.cgs
rename to sim/testsuite/m32r/and.cgs

diff --git a/sim/testsuite/sim/m32r/and3.cgs b/sim/testsuite/m32r/and3.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/and3.cgs
rename to sim/testsuite/m32r/and3.cgs

diff --git a/sim/testsuite/sim/m32r/bc24.cgs b/sim/testsuite/m32r/bc24.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bc24.cgs
rename to sim/testsuite/m32r/bc24.cgs

diff --git a/sim/testsuite/sim/m32r/bc8.cgs b/sim/testsuite/m32r/bc8.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bc8.cgs
rename to sim/testsuite/m32r/bc8.cgs

diff --git a/sim/testsuite/sim/m32r/beq.cgs b/sim/testsuite/m32r/beq.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/beq.cgs
rename to sim/testsuite/m32r/beq.cgs

diff --git a/sim/testsuite/sim/m32r/beqz.cgs b/sim/testsuite/m32r/beqz.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/beqz.cgs
rename to sim/testsuite/m32r/beqz.cgs

diff --git a/sim/testsuite/sim/m32r/bgez.cgs b/sim/testsuite/m32r/bgez.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bgez.cgs
rename to sim/testsuite/m32r/bgez.cgs

diff --git a/sim/testsuite/sim/m32r/bgtz.cgs b/sim/testsuite/m32r/bgtz.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bgtz.cgs
rename to sim/testsuite/m32r/bgtz.cgs

diff --git a/sim/testsuite/sim/m32r/bl24.cgs b/sim/testsuite/m32r/bl24.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bl24.cgs
rename to sim/testsuite/m32r/bl24.cgs

diff --git a/sim/testsuite/sim/m32r/bl8.cgs b/sim/testsuite/m32r/bl8.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bl8.cgs
rename to sim/testsuite/m32r/bl8.cgs

diff --git a/sim/testsuite/sim/m32r/blez.cgs b/sim/testsuite/m32r/blez.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/blez.cgs
rename to sim/testsuite/m32r/blez.cgs

diff --git a/sim/testsuite/sim/m32r/bltz.cgs b/sim/testsuite/m32r/bltz.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bltz.cgs
rename to sim/testsuite/m32r/bltz.cgs

diff --git a/sim/testsuite/sim/m32r/bnc24.cgs b/sim/testsuite/m32r/bnc24.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bnc24.cgs
rename to sim/testsuite/m32r/bnc24.cgs

diff --git a/sim/testsuite/sim/m32r/bnc8.cgs b/sim/testsuite/m32r/bnc8.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bnc8.cgs
rename to sim/testsuite/m32r/bnc8.cgs

diff --git a/sim/testsuite/sim/m32r/bne.cgs b/sim/testsuite/m32r/bne.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bne.cgs
rename to sim/testsuite/m32r/bne.cgs

diff --git a/sim/testsuite/sim/m32r/bnez.cgs b/sim/testsuite/m32r/bnez.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bnez.cgs
rename to sim/testsuite/m32r/bnez.cgs

diff --git a/sim/testsuite/sim/m32r/bra24.cgs b/sim/testsuite/m32r/bra24.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bra24.cgs
rename to sim/testsuite/m32r/bra24.cgs

diff --git a/sim/testsuite/sim/m32r/bra8.cgs b/sim/testsuite/m32r/bra8.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/bra8.cgs
rename to sim/testsuite/m32r/bra8.cgs

diff --git a/sim/testsuite/sim/m32r/cmp.cgs b/sim/testsuite/m32r/cmp.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/cmp.cgs
rename to sim/testsuite/m32r/cmp.cgs

diff --git a/sim/testsuite/sim/m32r/cmpi.cgs b/sim/testsuite/m32r/cmpi.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/cmpi.cgs
rename to sim/testsuite/m32r/cmpi.cgs

diff --git a/sim/testsuite/sim/m32r/cmpu.cgs b/sim/testsuite/m32r/cmpu.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/cmpu.cgs
rename to sim/testsuite/m32r/cmpu.cgs

diff --git a/sim/testsuite/sim/m32r/cmpui.cgs b/sim/testsuite/m32r/cmpui.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/cmpui.cgs
rename to sim/testsuite/m32r/cmpui.cgs

diff --git a/sim/testsuite/sim/m32r/div.cgs b/sim/testsuite/m32r/div.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/div.cgs
rename to sim/testsuite/m32r/div.cgs

diff --git a/sim/testsuite/sim/m32r/divu.cgs b/sim/testsuite/m32r/divu.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/divu.cgs
rename to sim/testsuite/m32r/divu.cgs

diff --git a/sim/testsuite/sim/m32r/exit47.ms b/sim/testsuite/m32r/exit47.ms
similarity index 100%
rename from sim/testsuite/sim/m32r/exit47.ms
rename to sim/testsuite/m32r/exit47.ms

diff --git a/sim/testsuite/sim/m32r/hello.ms b/sim/testsuite/m32r/hello.ms
similarity index 100%
rename from sim/testsuite/sim/m32r/hello.ms
rename to sim/testsuite/m32r/hello.ms

diff --git a/sim/testsuite/sim/m32r/hw-trap.ms b/sim/testsuite/m32r/hw-trap.ms
similarity index 100%
rename from sim/testsuite/sim/m32r/hw-trap.ms
rename to sim/testsuite/m32r/hw-trap.ms

diff --git a/sim/testsuite/sim/m32r/jl.cgs b/sim/testsuite/m32r/jl.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/jl.cgs
rename to sim/testsuite/m32r/jl.cgs

diff --git a/sim/testsuite/sim/m32r/jmp.cgs b/sim/testsuite/m32r/jmp.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/jmp.cgs
rename to sim/testsuite/m32r/jmp.cgs

diff --git a/sim/testsuite/sim/m32r/ld-d.cgs b/sim/testsuite/m32r/ld-d.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ld-d.cgs
rename to sim/testsuite/m32r/ld-d.cgs

diff --git a/sim/testsuite/sim/m32r/ld-plus.cgs b/sim/testsuite/m32r/ld-plus.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ld-plus.cgs
rename to sim/testsuite/m32r/ld-plus.cgs

diff --git a/sim/testsuite/sim/m32r/ld.cgs b/sim/testsuite/m32r/ld.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ld.cgs
rename to sim/testsuite/m32r/ld.cgs

diff --git a/sim/testsuite/sim/m32r/ld24.cgs b/sim/testsuite/m32r/ld24.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ld24.cgs
rename to sim/testsuite/m32r/ld24.cgs

diff --git a/sim/testsuite/sim/m32r/ldb-d.cgs b/sim/testsuite/m32r/ldb-d.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ldb-d.cgs
rename to sim/testsuite/m32r/ldb-d.cgs

diff --git a/sim/testsuite/sim/m32r/ldb.cgs b/sim/testsuite/m32r/ldb.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ldb.cgs
rename to sim/testsuite/m32r/ldb.cgs

diff --git a/sim/testsuite/sim/m32r/ldh-d.cgs b/sim/testsuite/m32r/ldh-d.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ldh-d.cgs
rename to sim/testsuite/m32r/ldh-d.cgs

diff --git a/sim/testsuite/sim/m32r/ldh.cgs b/sim/testsuite/m32r/ldh.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ldh.cgs
rename to sim/testsuite/m32r/ldh.cgs

diff --git a/sim/testsuite/sim/m32r/ldi16.cgs b/sim/testsuite/m32r/ldi16.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ldi16.cgs
rename to sim/testsuite/m32r/ldi16.cgs

diff --git a/sim/testsuite/sim/m32r/ldi8.cgs b/sim/testsuite/m32r/ldi8.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ldi8.cgs
rename to sim/testsuite/m32r/ldi8.cgs

diff --git a/sim/testsuite/sim/m32r/ldub-d.cgs b/sim/testsuite/m32r/ldub-d.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ldub-d.cgs
rename to sim/testsuite/m32r/ldub-d.cgs

diff --git a/sim/testsuite/sim/m32r/ldub.cgs b/sim/testsuite/m32r/ldub.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/ldub.cgs
rename to sim/testsuite/m32r/ldub.cgs

diff --git a/sim/testsuite/sim/m32r/lduh-d.cgs b/sim/testsuite/m32r/lduh-d.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/lduh-d.cgs
rename to sim/testsuite/m32r/lduh-d.cgs

diff --git a/sim/testsuite/sim/m32r/lduh.cgs b/sim/testsuite/m32r/lduh.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/lduh.cgs
rename to sim/testsuite/m32r/lduh.cgs

diff --git a/sim/testsuite/sim/m32r/lock.cgs b/sim/testsuite/m32r/lock.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/lock.cgs
rename to sim/testsuite/m32r/lock.cgs

diff --git a/sim/testsuite/sim/m32r/machi.cgs b/sim/testsuite/m32r/machi.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/machi.cgs
rename to sim/testsuite/m32r/machi.cgs

diff --git a/sim/testsuite/sim/m32r/maclo.cgs b/sim/testsuite/m32r/maclo.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/maclo.cgs
rename to sim/testsuite/m32r/maclo.cgs

diff --git a/sim/testsuite/sim/m32r/macwhi.cgs b/sim/testsuite/m32r/macwhi.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/macwhi.cgs
rename to sim/testsuite/m32r/macwhi.cgs

diff --git a/sim/testsuite/sim/m32r/macwlo.cgs b/sim/testsuite/m32r/macwlo.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/macwlo.cgs
rename to sim/testsuite/m32r/macwlo.cgs

diff --git a/sim/testsuite/sim/m32r/misc.exp b/sim/testsuite/m32r/misc.exp
similarity index 100%
rename from sim/testsuite/sim/m32r/misc.exp
rename to sim/testsuite/m32r/misc.exp

diff --git a/sim/testsuite/sim/m32r/mul.cgs b/sim/testsuite/m32r/mul.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mul.cgs
rename to sim/testsuite/m32r/mul.cgs

diff --git a/sim/testsuite/sim/m32r/mulhi.cgs b/sim/testsuite/m32r/mulhi.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mulhi.cgs
rename to sim/testsuite/m32r/mulhi.cgs

diff --git a/sim/testsuite/sim/m32r/mullo.cgs b/sim/testsuite/m32r/mullo.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mullo.cgs
rename to sim/testsuite/m32r/mullo.cgs

diff --git a/sim/testsuite/sim/m32r/mulwhi.cgs b/sim/testsuite/m32r/mulwhi.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mulwhi.cgs
rename to sim/testsuite/m32r/mulwhi.cgs

diff --git a/sim/testsuite/sim/m32r/mulwlo.cgs b/sim/testsuite/m32r/mulwlo.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mulwlo.cgs
rename to sim/testsuite/m32r/mulwlo.cgs

diff --git a/sim/testsuite/sim/m32r/mv.cgs b/sim/testsuite/m32r/mv.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mv.cgs
rename to sim/testsuite/m32r/mv.cgs

diff --git a/sim/testsuite/sim/m32r/mvfachi.cgs b/sim/testsuite/m32r/mvfachi.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mvfachi.cgs
rename to sim/testsuite/m32r/mvfachi.cgs

diff --git a/sim/testsuite/sim/m32r/mvfaclo.cgs b/sim/testsuite/m32r/mvfaclo.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mvfaclo.cgs
rename to sim/testsuite/m32r/mvfaclo.cgs

diff --git a/sim/testsuite/sim/m32r/mvfacmi.cgs b/sim/testsuite/m32r/mvfacmi.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mvfacmi.cgs
rename to sim/testsuite/m32r/mvfacmi.cgs

diff --git a/sim/testsuite/sim/m32r/mvfc.cgs b/sim/testsuite/m32r/mvfc.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mvfc.cgs
rename to sim/testsuite/m32r/mvfc.cgs

diff --git a/sim/testsuite/sim/m32r/mvtachi.cgs b/sim/testsuite/m32r/mvtachi.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mvtachi.cgs
rename to sim/testsuite/m32r/mvtachi.cgs

diff --git a/sim/testsuite/sim/m32r/mvtaclo.cgs b/sim/testsuite/m32r/mvtaclo.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mvtaclo.cgs
rename to sim/testsuite/m32r/mvtaclo.cgs

diff --git a/sim/testsuite/sim/m32r/mvtc.cgs b/sim/testsuite/m32r/mvtc.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/mvtc.cgs
rename to sim/testsuite/m32r/mvtc.cgs

diff --git a/sim/testsuite/sim/m32r/neg.cgs b/sim/testsuite/m32r/neg.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/neg.cgs
rename to sim/testsuite/m32r/neg.cgs

diff --git a/sim/testsuite/sim/m32r/nop.cgs b/sim/testsuite/m32r/nop.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/nop.cgs
rename to sim/testsuite/m32r/nop.cgs

diff --git a/sim/testsuite/sim/m32r/not.cgs b/sim/testsuite/m32r/not.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/not.cgs
rename to sim/testsuite/m32r/not.cgs

diff --git a/sim/testsuite/sim/m32r/or.cgs b/sim/testsuite/m32r/or.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/or.cgs
rename to sim/testsuite/m32r/or.cgs

diff --git a/sim/testsuite/sim/m32r/or3.cgs b/sim/testsuite/m32r/or3.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/or3.cgs
rename to sim/testsuite/m32r/or3.cgs

diff --git a/sim/testsuite/sim/m32r/rac.cgs b/sim/testsuite/m32r/rac.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/rac.cgs
rename to sim/testsuite/m32r/rac.cgs

diff --git a/sim/testsuite/sim/m32r/rach.cgs b/sim/testsuite/m32r/rach.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/rach.cgs
rename to sim/testsuite/m32r/rach.cgs

diff --git a/sim/testsuite/sim/m32r/rem.cgs b/sim/testsuite/m32r/rem.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/rem.cgs
rename to sim/testsuite/m32r/rem.cgs

diff --git a/sim/testsuite/sim/m32r/remu.cgs b/sim/testsuite/m32r/remu.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/remu.cgs
rename to sim/testsuite/m32r/remu.cgs

diff --git a/sim/testsuite/sim/m32r/rte.cgs b/sim/testsuite/m32r/rte.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/rte.cgs
rename to sim/testsuite/m32r/rte.cgs

diff --git a/sim/testsuite/sim/m32r/seth.cgs b/sim/testsuite/m32r/seth.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/seth.cgs
rename to sim/testsuite/m32r/seth.cgs

diff --git a/sim/testsuite/sim/m32r/sll.cgs b/sim/testsuite/m32r/sll.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/sll.cgs
rename to sim/testsuite/m32r/sll.cgs

diff --git a/sim/testsuite/sim/m32r/sll3.cgs b/sim/testsuite/m32r/sll3.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/sll3.cgs
rename to sim/testsuite/m32r/sll3.cgs

diff --git a/sim/testsuite/sim/m32r/slli.cgs b/sim/testsuite/m32r/slli.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/slli.cgs
rename to sim/testsuite/m32r/slli.cgs

diff --git a/sim/testsuite/sim/m32r/sra.cgs b/sim/testsuite/m32r/sra.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/sra.cgs
rename to sim/testsuite/m32r/sra.cgs

diff --git a/sim/testsuite/sim/m32r/sra3.cgs b/sim/testsuite/m32r/sra3.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/sra3.cgs
rename to sim/testsuite/m32r/sra3.cgs

diff --git a/sim/testsuite/sim/m32r/srai.cgs b/sim/testsuite/m32r/srai.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/srai.cgs
rename to sim/testsuite/m32r/srai.cgs

diff --git a/sim/testsuite/sim/m32r/srl.cgs b/sim/testsuite/m32r/srl.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/srl.cgs
rename to sim/testsuite/m32r/srl.cgs

diff --git a/sim/testsuite/sim/m32r/srl3.cgs b/sim/testsuite/m32r/srl3.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/srl3.cgs
rename to sim/testsuite/m32r/srl3.cgs

diff --git a/sim/testsuite/sim/m32r/srli.cgs b/sim/testsuite/m32r/srli.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/srli.cgs
rename to sim/testsuite/m32r/srli.cgs

diff --git a/sim/testsuite/sim/m32r/st-d.cgs b/sim/testsuite/m32r/st-d.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/st-d.cgs
rename to sim/testsuite/m32r/st-d.cgs

diff --git a/sim/testsuite/sim/m32r/st-minus.cgs b/sim/testsuite/m32r/st-minus.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/st-minus.cgs
rename to sim/testsuite/m32r/st-minus.cgs

diff --git a/sim/testsuite/sim/m32r/st-plus.cgs b/sim/testsuite/m32r/st-plus.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/st-plus.cgs
rename to sim/testsuite/m32r/st-plus.cgs

diff --git a/sim/testsuite/sim/m32r/st.cgs b/sim/testsuite/m32r/st.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/st.cgs
rename to sim/testsuite/m32r/st.cgs

diff --git a/sim/testsuite/sim/m32r/stb-d.cgs b/sim/testsuite/m32r/stb-d.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/stb-d.cgs
rename to sim/testsuite/m32r/stb-d.cgs

diff --git a/sim/testsuite/sim/m32r/stb.cgs b/sim/testsuite/m32r/stb.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/stb.cgs
rename to sim/testsuite/m32r/stb.cgs

diff --git a/sim/testsuite/sim/m32r/sth-d.cgs b/sim/testsuite/m32r/sth-d.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/sth-d.cgs
rename to sim/testsuite/m32r/sth-d.cgs

diff --git a/sim/testsuite/sim/m32r/sth.cgs b/sim/testsuite/m32r/sth.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/sth.cgs
rename to sim/testsuite/m32r/sth.cgs

diff --git a/sim/testsuite/sim/m32r/sub.cgs b/sim/testsuite/m32r/sub.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/sub.cgs
rename to sim/testsuite/m32r/sub.cgs

diff --git a/sim/testsuite/sim/m32r/subv.cgs b/sim/testsuite/m32r/subv.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/subv.cgs
rename to sim/testsuite/m32r/subv.cgs

diff --git a/sim/testsuite/sim/m32r/subx.cgs b/sim/testsuite/m32r/subx.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/subx.cgs
rename to sim/testsuite/m32r/subx.cgs

diff --git a/sim/testsuite/sim/m32r/testutils.inc b/sim/testsuite/m32r/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/m32r/testutils.inc
rename to sim/testsuite/m32r/testutils.inc

diff --git a/sim/testsuite/sim/m32r/trap.cgs b/sim/testsuite/m32r/trap.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/trap.cgs
rename to sim/testsuite/m32r/trap.cgs

diff --git a/sim/testsuite/sim/m32r/unlock.cgs b/sim/testsuite/m32r/unlock.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/unlock.cgs
rename to sim/testsuite/m32r/unlock.cgs

diff --git a/sim/testsuite/sim/m32r/uread16.ms b/sim/testsuite/m32r/uread16.ms
similarity index 100%
rename from sim/testsuite/sim/m32r/uread16.ms
rename to sim/testsuite/m32r/uread16.ms

diff --git a/sim/testsuite/sim/m32r/uread32.ms b/sim/testsuite/m32r/uread32.ms
similarity index 100%
rename from sim/testsuite/sim/m32r/uread32.ms
rename to sim/testsuite/m32r/uread32.ms

diff --git a/sim/testsuite/sim/m32r/uwrite16.ms b/sim/testsuite/m32r/uwrite16.ms
similarity index 100%
rename from sim/testsuite/sim/m32r/uwrite16.ms
rename to sim/testsuite/m32r/uwrite16.ms

diff --git a/sim/testsuite/sim/m32r/uwrite32.ms b/sim/testsuite/m32r/uwrite32.ms
similarity index 100%
rename from sim/testsuite/sim/m32r/uwrite32.ms
rename to sim/testsuite/m32r/uwrite32.ms

diff --git a/sim/testsuite/sim/m32r/xor.cgs b/sim/testsuite/m32r/xor.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/xor.cgs
rename to sim/testsuite/m32r/xor.cgs

diff --git a/sim/testsuite/sim/m32r/xor3.cgs b/sim/testsuite/m32r/xor3.cgs
similarity index 100%
rename from sim/testsuite/sim/m32r/xor3.cgs
rename to sim/testsuite/m32r/xor3.cgs

diff --git a/sim/testsuite/sim/m68hc11/ChangeLog b/sim/testsuite/m68hc11/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/m68hc11/ChangeLog
rename to sim/testsuite/m68hc11/ChangeLog

diff --git a/sim/testsuite/sim/m68hc11/allinsn.exp b/sim/testsuite/m68hc11/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/m68hc11/allinsn.exp
rename to sim/testsuite/m68hc11/allinsn.exp

diff --git a/sim/testsuite/sim/m68hc11/pass.s b/sim/testsuite/m68hc11/pass.s
similarity index 100%
rename from sim/testsuite/sim/m68hc11/pass.s
rename to sim/testsuite/m68hc11/pass.s

diff --git a/sim/testsuite/sim/m68hc11/testutils.inc b/sim/testsuite/m68hc11/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/m68hc11/testutils.inc
rename to sim/testsuite/m68hc11/testutils.inc

diff --git a/sim/testsuite/sim/mcore/ChangeLog b/sim/testsuite/mcore/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/mcore/ChangeLog
rename to sim/testsuite/mcore/ChangeLog

diff --git a/sim/testsuite/sim/mcore/allinsn.exp b/sim/testsuite/mcore/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/mcore/allinsn.exp
rename to sim/testsuite/mcore/allinsn.exp

diff --git a/sim/testsuite/sim/mcore/fail.s b/sim/testsuite/mcore/fail.s
similarity index 100%
rename from sim/testsuite/sim/mcore/fail.s
rename to sim/testsuite/mcore/fail.s

diff --git a/sim/testsuite/sim/mcore/pass.s b/sim/testsuite/mcore/pass.s
similarity index 100%
rename from sim/testsuite/sim/mcore/pass.s
rename to sim/testsuite/mcore/pass.s

diff --git a/sim/testsuite/sim/mcore/testutils.inc b/sim/testsuite/mcore/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/mcore/testutils.inc
rename to sim/testsuite/mcore/testutils.inc

diff --git a/sim/testsuite/sim/microblaze/ChangeLog b/sim/testsuite/microblaze/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/microblaze/ChangeLog
rename to sim/testsuite/microblaze/ChangeLog

diff --git a/sim/testsuite/sim/microblaze/allinsn.exp b/sim/testsuite/microblaze/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/microblaze/allinsn.exp
rename to sim/testsuite/microblaze/allinsn.exp

diff --git a/sim/testsuite/sim/microblaze/pass.s b/sim/testsuite/microblaze/pass.s
similarity index 100%
rename from sim/testsuite/sim/microblaze/pass.s
rename to sim/testsuite/microblaze/pass.s

diff --git a/sim/testsuite/sim/microblaze/testutils.inc b/sim/testsuite/microblaze/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/microblaze/testutils.inc
rename to sim/testsuite/microblaze/testutils.inc

diff --git a/sim/testsuite/sim/mips/ChangeLog b/sim/testsuite/mips/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/mips/ChangeLog
rename to sim/testsuite/mips/ChangeLog

diff --git a/sim/testsuite/sim/mips/basic.exp b/sim/testsuite/mips/basic.exp
similarity index 100%
rename from sim/testsuite/sim/mips/basic.exp
rename to sim/testsuite/mips/basic.exp

diff --git a/sim/testsuite/sim/mips/fpu64-ps-sb1.s b/sim/testsuite/mips/fpu64-ps-sb1.s
similarity index 100%
rename from sim/testsuite/sim/mips/fpu64-ps-sb1.s
rename to sim/testsuite/mips/fpu64-ps-sb1.s

diff --git a/sim/testsuite/sim/mips/fpu64-ps.s b/sim/testsuite/mips/fpu64-ps.s
similarity index 100%
rename from sim/testsuite/sim/mips/fpu64-ps.s
rename to sim/testsuite/mips/fpu64-ps.s

diff --git a/sim/testsuite/sim/mips/hilo-hazard-1.s b/sim/testsuite/mips/hilo-hazard-1.s
similarity index 100%
rename from sim/testsuite/sim/mips/hilo-hazard-1.s
rename to sim/testsuite/mips/hilo-hazard-1.s

diff --git a/sim/testsuite/sim/mips/hilo-hazard-2.s b/sim/testsuite/mips/hilo-hazard-2.s
similarity index 100%
rename from sim/testsuite/sim/mips/hilo-hazard-2.s
rename to sim/testsuite/mips/hilo-hazard-2.s

diff --git a/sim/testsuite/sim/mips/hilo-hazard-3.s b/sim/testsuite/mips/hilo-hazard-3.s
similarity index 100%
rename from sim/testsuite/sim/mips/hilo-hazard-3.s
rename to sim/testsuite/mips/hilo-hazard-3.s

diff --git a/sim/testsuite/sim/mips/hilo-hazard-4.s b/sim/testsuite/mips/hilo-hazard-4.s
similarity index 100%
rename from sim/testsuite/sim/mips/hilo-hazard-4.s
rename to sim/testsuite/mips/hilo-hazard-4.s

diff --git a/sim/testsuite/sim/mips/mdmx-ob-sb1.s b/sim/testsuite/mips/mdmx-ob-sb1.s
similarity index 100%
rename from sim/testsuite/sim/mips/mdmx-ob-sb1.s
rename to sim/testsuite/mips/mdmx-ob-sb1.s

diff --git a/sim/testsuite/sim/mips/mdmx-ob.s b/sim/testsuite/mips/mdmx-ob.s
similarity index 100%
rename from sim/testsuite/sim/mips/mdmx-ob.s
rename to sim/testsuite/mips/mdmx-ob.s

diff --git a/sim/testsuite/sim/mips/mips32-dsp.s b/sim/testsuite/mips/mips32-dsp.s
similarity index 100%
rename from sim/testsuite/sim/mips/mips32-dsp.s
rename to sim/testsuite/mips/mips32-dsp.s

diff --git a/sim/testsuite/sim/mips/mips32-dsp2.s b/sim/testsuite/mips/mips32-dsp2.s
similarity index 100%
rename from sim/testsuite/sim/mips/mips32-dsp2.s
rename to sim/testsuite/mips/mips32-dsp2.s

diff --git a/sim/testsuite/sim/mips/sanity.s b/sim/testsuite/mips/sanity.s
similarity index 100%
rename from sim/testsuite/sim/mips/sanity.s
rename to sim/testsuite/mips/sanity.s

diff --git a/sim/testsuite/sim/mips/testutils.inc b/sim/testsuite/mips/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/mips/testutils.inc
rename to sim/testsuite/mips/testutils.inc

diff --git a/sim/testsuite/sim/mips/utils-dsp.inc b/sim/testsuite/mips/utils-dsp.inc
similarity index 100%
rename from sim/testsuite/sim/mips/utils-dsp.inc
rename to sim/testsuite/mips/utils-dsp.inc

diff --git a/sim/testsuite/sim/mips/utils-fpu.inc b/sim/testsuite/mips/utils-fpu.inc
similarity index 100%
rename from sim/testsuite/sim/mips/utils-fpu.inc
rename to sim/testsuite/mips/utils-fpu.inc

diff --git a/sim/testsuite/sim/mips/utils-mdmx.inc b/sim/testsuite/mips/utils-mdmx.inc
similarity index 100%
rename from sim/testsuite/sim/mips/utils-mdmx.inc
rename to sim/testsuite/mips/utils-mdmx.inc

diff --git a/sim/testsuite/sim/mn10300/ChangeLog b/sim/testsuite/mn10300/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/mn10300/ChangeLog
rename to sim/testsuite/mn10300/ChangeLog

diff --git a/sim/testsuite/sim/mn10300/allinsn.exp b/sim/testsuite/mn10300/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/mn10300/allinsn.exp
rename to sim/testsuite/mn10300/allinsn.exp

diff --git a/sim/testsuite/sim/mn10300/pass.s b/sim/testsuite/mn10300/pass.s
similarity index 100%
rename from sim/testsuite/sim/mn10300/pass.s
rename to sim/testsuite/mn10300/pass.s

diff --git a/sim/testsuite/sim/mn10300/testutils.inc b/sim/testsuite/mn10300/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/mn10300/testutils.inc
rename to sim/testsuite/mn10300/testutils.inc

diff --git a/sim/testsuite/sim/moxie/ChangeLog b/sim/testsuite/moxie/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/moxie/ChangeLog
rename to sim/testsuite/moxie/ChangeLog

diff --git a/sim/testsuite/sim/moxie/allinsn.exp b/sim/testsuite/moxie/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/moxie/allinsn.exp
rename to sim/testsuite/moxie/allinsn.exp

diff --git a/sim/testsuite/sim/moxie/pass.s b/sim/testsuite/moxie/pass.s
similarity index 100%
rename from sim/testsuite/sim/moxie/pass.s
rename to sim/testsuite/moxie/pass.s

diff --git a/sim/testsuite/sim/moxie/testutils.inc b/sim/testsuite/moxie/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/moxie/testutils.inc
rename to sim/testsuite/moxie/testutils.inc

diff --git a/sim/testsuite/sim/msp430/ChangeLog b/sim/testsuite/msp430/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/msp430/ChangeLog
rename to sim/testsuite/msp430/ChangeLog

diff --git a/sim/testsuite/sim/msp430/add.s b/sim/testsuite/msp430/add.s
similarity index 100%
rename from sim/testsuite/sim/msp430/add.s
rename to sim/testsuite/msp430/add.s

diff --git a/sim/testsuite/sim/msp430/allinsn.exp b/sim/testsuite/msp430/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/msp430/allinsn.exp
rename to sim/testsuite/msp430/allinsn.exp

diff --git a/sim/testsuite/sim/msp430/mpyull_hwmult.s b/sim/testsuite/msp430/mpyull_hwmult.s
similarity index 100%
rename from sim/testsuite/sim/msp430/mpyull_hwmult.s
rename to sim/testsuite/msp430/mpyull_hwmult.s

diff --git a/sim/testsuite/sim/msp430/rrux.s b/sim/testsuite/msp430/rrux.s
similarity index 100%
rename from sim/testsuite/sim/msp430/rrux.s
rename to sim/testsuite/msp430/rrux.s

diff --git a/sim/testsuite/sim/msp430/testutils.inc b/sim/testsuite/msp430/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/msp430/testutils.inc
rename to sim/testsuite/msp430/testutils.inc

diff --git a/sim/testsuite/sim/or1k/ChangeLog b/sim/testsuite/or1k/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/or1k/ChangeLog
rename to sim/testsuite/or1k/ChangeLog

diff --git a/sim/testsuite/sim/or1k/add.S b/sim/testsuite/or1k/add.S
similarity index 100%
rename from sim/testsuite/sim/or1k/add.S
rename to sim/testsuite/or1k/add.S

diff --git a/sim/testsuite/sim/or1k/adrp.S b/sim/testsuite/or1k/adrp.S
similarity index 100%
rename from sim/testsuite/sim/or1k/adrp.S
rename to sim/testsuite/or1k/adrp.S

diff --git a/sim/testsuite/sim/or1k/alltests.exp b/sim/testsuite/or1k/alltests.exp
similarity index 100%
rename from sim/testsuite/sim/or1k/alltests.exp
rename to sim/testsuite/or1k/alltests.exp

diff --git a/sim/testsuite/sim/or1k/and.S b/sim/testsuite/or1k/and.S
similarity index 100%
rename from sim/testsuite/sim/or1k/and.S
rename to sim/testsuite/or1k/and.S

diff --git a/sim/testsuite/sim/or1k/basic.S b/sim/testsuite/or1k/basic.S
similarity index 100%
rename from sim/testsuite/sim/or1k/basic.S
rename to sim/testsuite/or1k/basic.S

diff --git a/sim/testsuite/sim/or1k/div.S b/sim/testsuite/or1k/div.S
similarity index 100%
rename from sim/testsuite/sim/or1k/div.S
rename to sim/testsuite/or1k/div.S

diff --git a/sim/testsuite/sim/or1k/ext.S b/sim/testsuite/or1k/ext.S
similarity index 100%
rename from sim/testsuite/sim/or1k/ext.S
rename to sim/testsuite/or1k/ext.S

diff --git a/sim/testsuite/sim/or1k/find.S b/sim/testsuite/or1k/find.S
similarity index 100%
rename from sim/testsuite/sim/or1k/find.S
rename to sim/testsuite/or1k/find.S

diff --git a/sim/testsuite/sim/or1k/flag.S b/sim/testsuite/or1k/flag.S
similarity index 100%
rename from sim/testsuite/sim/or1k/flag.S
rename to sim/testsuite/or1k/flag.S

diff --git a/sim/testsuite/sim/or1k/fpu-unordered.S b/sim/testsuite/or1k/fpu-unordered.S
similarity index 100%
rename from sim/testsuite/sim/or1k/fpu-unordered.S
rename to sim/testsuite/or1k/fpu-unordered.S

diff --git a/sim/testsuite/sim/or1k/fpu.S b/sim/testsuite/or1k/fpu.S
similarity index 100%
rename from sim/testsuite/sim/or1k/fpu.S
rename to sim/testsuite/or1k/fpu.S

diff --git a/sim/testsuite/sim/or1k/fpu64a32-unordered.S b/sim/testsuite/or1k/fpu64a32-unordered.S
similarity index 100%
rename from sim/testsuite/sim/or1k/fpu64a32-unordered.S
rename to sim/testsuite/or1k/fpu64a32-unordered.S

diff --git a/sim/testsuite/sim/or1k/fpu64a32.S b/sim/testsuite/or1k/fpu64a32.S
similarity index 100%
rename from sim/testsuite/sim/or1k/fpu64a32.S
rename to sim/testsuite/or1k/fpu64a32.S

diff --git a/sim/testsuite/sim/or1k/jump.S b/sim/testsuite/or1k/jump.S
similarity index 100%
rename from sim/testsuite/sim/or1k/jump.S
rename to sim/testsuite/or1k/jump.S

diff --git a/sim/testsuite/sim/or1k/load.S b/sim/testsuite/or1k/load.S
similarity index 100%
rename from sim/testsuite/sim/or1k/load.S
rename to sim/testsuite/or1k/load.S

diff --git a/sim/testsuite/sim/or1k/mac.S b/sim/testsuite/or1k/mac.S
similarity index 100%
rename from sim/testsuite/sim/or1k/mac.S
rename to sim/testsuite/or1k/mac.S

diff --git a/sim/testsuite/sim/or1k/mfspr.S b/sim/testsuite/or1k/mfspr.S
similarity index 100%
rename from sim/testsuite/sim/or1k/mfspr.S
rename to sim/testsuite/or1k/mfspr.S

diff --git a/sim/testsuite/sim/or1k/mul.S b/sim/testsuite/or1k/mul.S
similarity index 100%
rename from sim/testsuite/sim/or1k/mul.S
rename to sim/testsuite/or1k/mul.S

diff --git a/sim/testsuite/sim/or1k/or.S b/sim/testsuite/or1k/or.S
similarity index 100%
rename from sim/testsuite/sim/or1k/or.S
rename to sim/testsuite/or1k/or.S

diff --git a/sim/testsuite/sim/or1k/or1k-asm-test-env.h b/sim/testsuite/or1k/or1k-asm-test-env.h
similarity index 100%
rename from sim/testsuite/sim/or1k/or1k-asm-test-env.h
rename to sim/testsuite/or1k/or1k-asm-test-env.h

diff --git a/sim/testsuite/sim/or1k/or1k-asm-test-helpers.h b/sim/testsuite/or1k/or1k-asm-test-helpers.h
similarity index 100%
rename from sim/testsuite/sim/or1k/or1k-asm-test-helpers.h
rename to sim/testsuite/or1k/or1k-asm-test-helpers.h

diff --git a/sim/testsuite/sim/or1k/or1k-asm-test.h b/sim/testsuite/or1k/or1k-asm-test.h
similarity index 100%
rename from sim/testsuite/sim/or1k/or1k-asm-test.h
rename to sim/testsuite/or1k/or1k-asm-test.h

diff --git a/sim/testsuite/sim/or1k/or1k-asm.h b/sim/testsuite/or1k/or1k-asm.h
similarity index 100%
rename from sim/testsuite/sim/or1k/or1k-asm.h
rename to sim/testsuite/or1k/or1k-asm.h

diff --git a/sim/testsuite/sim/or1k/or1k-test.ld b/sim/testsuite/or1k/or1k-test.ld
similarity index 100%
rename from sim/testsuite/sim/or1k/or1k-test.ld
rename to sim/testsuite/or1k/or1k-test.ld

diff --git a/sim/testsuite/sim/or1k/ror.S b/sim/testsuite/or1k/ror.S
similarity index 100%
rename from sim/testsuite/sim/or1k/ror.S
rename to sim/testsuite/or1k/ror.S

diff --git a/sim/testsuite/sim/or1k/shift.S b/sim/testsuite/or1k/shift.S
similarity index 100%
rename from sim/testsuite/sim/or1k/shift.S
rename to sim/testsuite/or1k/shift.S

diff --git a/sim/testsuite/sim/or1k/spr-defs.h b/sim/testsuite/or1k/spr-defs.h
similarity index 100%
rename from sim/testsuite/sim/or1k/spr-defs.h
rename to sim/testsuite/or1k/spr-defs.h

diff --git a/sim/testsuite/sim/or1k/sub.S b/sim/testsuite/or1k/sub.S
similarity index 100%
rename from sim/testsuite/sim/or1k/sub.S
rename to sim/testsuite/or1k/sub.S

diff --git a/sim/testsuite/sim/or1k/xor.S b/sim/testsuite/or1k/xor.S
similarity index 100%
rename from sim/testsuite/sim/or1k/xor.S
rename to sim/testsuite/or1k/xor.S

diff --git a/sim/testsuite/sim/pru/ChangeLog b/sim/testsuite/pru/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/pru/ChangeLog
rename to sim/testsuite/pru/ChangeLog

diff --git a/sim/testsuite/sim/pru/add.s b/sim/testsuite/pru/add.s
similarity index 100%
rename from sim/testsuite/sim/pru/add.s
rename to sim/testsuite/pru/add.s

diff --git a/sim/testsuite/sim/pru/allinsn.exp b/sim/testsuite/pru/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/pru/allinsn.exp
rename to sim/testsuite/pru/allinsn.exp

diff --git a/sim/testsuite/sim/pru/dmem-zero-pass.s b/sim/testsuite/pru/dmem-zero-pass.s
similarity index 100%
rename from sim/testsuite/sim/pru/dmem-zero-pass.s
rename to sim/testsuite/pru/dmem-zero-pass.s

diff --git a/sim/testsuite/sim/pru/dmem-zero-trap.s b/sim/testsuite/pru/dmem-zero-trap.s
similarity index 100%
rename from sim/testsuite/sim/pru/dmem-zero-trap.s
rename to sim/testsuite/pru/dmem-zero-trap.s

diff --git a/sim/testsuite/sim/pru/dram.s b/sim/testsuite/pru/dram.s
similarity index 100%
rename from sim/testsuite/sim/pru/dram.s
rename to sim/testsuite/pru/dram.s

diff --git a/sim/testsuite/sim/pru/jmp.s b/sim/testsuite/pru/jmp.s
similarity index 100%
rename from sim/testsuite/sim/pru/jmp.s
rename to sim/testsuite/pru/jmp.s

diff --git a/sim/testsuite/sim/pru/lmbd.s b/sim/testsuite/pru/lmbd.s
similarity index 100%
rename from sim/testsuite/sim/pru/lmbd.s
rename to sim/testsuite/pru/lmbd.s

diff --git a/sim/testsuite/sim/pru/loop-imm.s b/sim/testsuite/pru/loop-imm.s
similarity index 100%
rename from sim/testsuite/sim/pru/loop-imm.s
rename to sim/testsuite/pru/loop-imm.s

diff --git a/sim/testsuite/sim/pru/loop-reg.s b/sim/testsuite/pru/loop-reg.s
similarity index 100%
rename from sim/testsuite/sim/pru/loop-reg.s
rename to sim/testsuite/pru/loop-reg.s

diff --git a/sim/testsuite/sim/pru/mul.s b/sim/testsuite/pru/mul.s
similarity index 100%
rename from sim/testsuite/sim/pru/mul.s
rename to sim/testsuite/pru/mul.s

diff --git a/sim/testsuite/sim/pru/subreg.s b/sim/testsuite/pru/subreg.s
similarity index 100%
rename from sim/testsuite/sim/pru/subreg.s
rename to sim/testsuite/pru/subreg.s

diff --git a/sim/testsuite/sim/pru/testutils.inc b/sim/testsuite/pru/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/pru/testutils.inc
rename to sim/testsuite/pru/testutils.inc

diff --git a/sim/testsuite/sim/sh/ChangeLog b/sim/testsuite/sh/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/sh/ChangeLog
rename to sim/testsuite/sh/ChangeLog

diff --git a/sim/testsuite/sim/sh/add.s b/sim/testsuite/sh/add.s
similarity index 100%
rename from sim/testsuite/sim/sh/add.s
rename to sim/testsuite/sh/add.s

diff --git a/sim/testsuite/sim/sh/allinsn.exp b/sim/testsuite/sh/allinsn.exp
similarity index 100%
rename from sim/testsuite/sim/sh/allinsn.exp
rename to sim/testsuite/sh/allinsn.exp

diff --git a/sim/testsuite/sim/sh/and.s b/sim/testsuite/sh/and.s
similarity index 100%
rename from sim/testsuite/sim/sh/and.s
rename to sim/testsuite/sh/and.s

diff --git a/sim/testsuite/sim/sh/bandor.s b/sim/testsuite/sh/bandor.s
similarity index 100%
rename from sim/testsuite/sim/sh/bandor.s
rename to sim/testsuite/sh/bandor.s

diff --git a/sim/testsuite/sim/sh/bandornot.s b/sim/testsuite/sh/bandornot.s
similarity index 100%
rename from sim/testsuite/sim/sh/bandornot.s
rename to sim/testsuite/sh/bandornot.s

diff --git a/sim/testsuite/sim/sh/bclr.s b/sim/testsuite/sh/bclr.s
similarity index 100%
rename from sim/testsuite/sim/sh/bclr.s
rename to sim/testsuite/sh/bclr.s

diff --git a/sim/testsuite/sim/sh/bld.s b/sim/testsuite/sh/bld.s
similarity index 100%
rename from sim/testsuite/sim/sh/bld.s
rename to sim/testsuite/sh/bld.s

diff --git a/sim/testsuite/sim/sh/bldnot.s b/sim/testsuite/sh/bldnot.s
similarity index 100%
rename from sim/testsuite/sim/sh/bldnot.s
rename to sim/testsuite/sh/bldnot.s

diff --git a/sim/testsuite/sim/sh/bset.s b/sim/testsuite/sh/bset.s
similarity index 100%
rename from sim/testsuite/sim/sh/bset.s
rename to sim/testsuite/sh/bset.s

diff --git a/sim/testsuite/sim/sh/bst.s b/sim/testsuite/sh/bst.s
similarity index 100%
rename from sim/testsuite/sim/sh/bst.s
rename to sim/testsuite/sh/bst.s

diff --git a/sim/testsuite/sim/sh/bxor.s b/sim/testsuite/sh/bxor.s
similarity index 100%
rename from sim/testsuite/sim/sh/bxor.s
rename to sim/testsuite/sh/bxor.s

diff --git a/sim/testsuite/sim/sh/clip.s b/sim/testsuite/sh/clip.s
similarity index 100%
rename from sim/testsuite/sim/sh/clip.s
rename to sim/testsuite/sh/clip.s

diff --git a/sim/testsuite/sim/sh/div.s b/sim/testsuite/sh/div.s
similarity index 100%
rename from sim/testsuite/sim/sh/div.s
rename to sim/testsuite/sh/div.s

diff --git a/sim/testsuite/sim/sh/dmxy.s b/sim/testsuite/sh/dmxy.s
similarity index 100%
rename from sim/testsuite/sim/sh/dmxy.s
rename to sim/testsuite/sh/dmxy.s

diff --git a/sim/testsuite/sim/sh/fabs.s b/sim/testsuite/sh/fabs.s
similarity index 100%
rename from sim/testsuite/sim/sh/fabs.s
rename to sim/testsuite/sh/fabs.s

diff --git a/sim/testsuite/sim/sh/fadd.s b/sim/testsuite/sh/fadd.s
similarity index 100%
rename from sim/testsuite/sim/sh/fadd.s
rename to sim/testsuite/sh/fadd.s

diff --git a/sim/testsuite/sim/sh/fail.s b/sim/testsuite/sh/fail.s
similarity index 100%
rename from sim/testsuite/sim/sh/fail.s
rename to sim/testsuite/sh/fail.s

diff --git a/sim/testsuite/sim/sh/fcmpeq.s b/sim/testsuite/sh/fcmpeq.s
similarity index 100%
rename from sim/testsuite/sim/sh/fcmpeq.s
rename to sim/testsuite/sh/fcmpeq.s

diff --git a/sim/testsuite/sim/sh/fcmpgt.s b/sim/testsuite/sh/fcmpgt.s
similarity index 100%
rename from sim/testsuite/sim/sh/fcmpgt.s
rename to sim/testsuite/sh/fcmpgt.s

diff --git a/sim/testsuite/sim/sh/fcnvds.s b/sim/testsuite/sh/fcnvds.s
similarity index 100%
rename from sim/testsuite/sim/sh/fcnvds.s
rename to sim/testsuite/sh/fcnvds.s

diff --git a/sim/testsuite/sim/sh/fcnvsd.s b/sim/testsuite/sh/fcnvsd.s
similarity index 100%
rename from sim/testsuite/sim/sh/fcnvsd.s
rename to sim/testsuite/sh/fcnvsd.s

diff --git a/sim/testsuite/sim/sh/fdiv.s b/sim/testsuite/sh/fdiv.s
similarity index 100%
rename from sim/testsuite/sim/sh/fdiv.s
rename to sim/testsuite/sh/fdiv.s

diff --git a/sim/testsuite/sim/sh/fipr.s b/sim/testsuite/sh/fipr.s
similarity index 100%
rename from sim/testsuite/sim/sh/fipr.s
rename to sim/testsuite/sh/fipr.s

diff --git a/sim/testsuite/sim/sh/fldi0.s b/sim/testsuite/sh/fldi0.s
similarity index 100%
rename from sim/testsuite/sim/sh/fldi0.s
rename to sim/testsuite/sh/fldi0.s

diff --git a/sim/testsuite/sim/sh/fldi1.s b/sim/testsuite/sh/fldi1.s
similarity index 100%
rename from sim/testsuite/sim/sh/fldi1.s
rename to sim/testsuite/sh/fldi1.s

diff --git a/sim/testsuite/sim/sh/flds.s b/sim/testsuite/sh/flds.s
similarity index 100%
rename from sim/testsuite/sim/sh/flds.s
rename to sim/testsuite/sh/flds.s

diff --git a/sim/testsuite/sim/sh/float.s b/sim/testsuite/sh/float.s
similarity index 100%
rename from sim/testsuite/sim/sh/float.s
rename to sim/testsuite/sh/float.s

diff --git a/sim/testsuite/sim/sh/fmac.s b/sim/testsuite/sh/fmac.s
similarity index 100%
rename from sim/testsuite/sim/sh/fmac.s
rename to sim/testsuite/sh/fmac.s

diff --git a/sim/testsuite/sim/sh/fmov.s b/sim/testsuite/sh/fmov.s
similarity index 100%
rename from sim/testsuite/sim/sh/fmov.s
rename to sim/testsuite/sh/fmov.s

diff --git a/sim/testsuite/sim/sh/fmul.s b/sim/testsuite/sh/fmul.s
similarity index 100%
rename from sim/testsuite/sim/sh/fmul.s
rename to sim/testsuite/sh/fmul.s

diff --git a/sim/testsuite/sim/sh/fneg.s b/sim/testsuite/sh/fneg.s
similarity index 100%
rename from sim/testsuite/sim/sh/fneg.s
rename to sim/testsuite/sh/fneg.s

diff --git a/sim/testsuite/sim/sh/fpchg.s b/sim/testsuite/sh/fpchg.s
similarity index 100%
rename from sim/testsuite/sim/sh/fpchg.s
rename to sim/testsuite/sh/fpchg.s

diff --git a/sim/testsuite/sim/sh/frchg.s b/sim/testsuite/sh/frchg.s
similarity index 100%
rename from sim/testsuite/sim/sh/frchg.s
rename to sim/testsuite/sh/frchg.s

diff --git a/sim/testsuite/sim/sh/fsca.s b/sim/testsuite/sh/fsca.s
similarity index 100%
rename from sim/testsuite/sim/sh/fsca.s
rename to sim/testsuite/sh/fsca.s

diff --git a/sim/testsuite/sim/sh/fschg.s b/sim/testsuite/sh/fschg.s
similarity index 100%
rename from sim/testsuite/sim/sh/fschg.s
rename to sim/testsuite/sh/fschg.s

diff --git a/sim/testsuite/sim/sh/fsqrt.s b/sim/testsuite/sh/fsqrt.s
similarity index 100%
rename from sim/testsuite/sim/sh/fsqrt.s
rename to sim/testsuite/sh/fsqrt.s

diff --git a/sim/testsuite/sim/sh/fsrra.s b/sim/testsuite/sh/fsrra.s
similarity index 100%
rename from sim/testsuite/sim/sh/fsrra.s
rename to sim/testsuite/sh/fsrra.s

diff --git a/sim/testsuite/sim/sh/fsub.s b/sim/testsuite/sh/fsub.s
similarity index 100%
rename from sim/testsuite/sim/sh/fsub.s
rename to sim/testsuite/sh/fsub.s

diff --git a/sim/testsuite/sim/sh/ftrc.s b/sim/testsuite/sh/ftrc.s
similarity index 100%
rename from sim/testsuite/sim/sh/ftrc.s
rename to sim/testsuite/sh/ftrc.s

diff --git a/sim/testsuite/sim/sh/ldrc.s b/sim/testsuite/sh/ldrc.s
similarity index 100%
rename from sim/testsuite/sim/sh/ldrc.s
rename to sim/testsuite/sh/ldrc.s

diff --git a/sim/testsuite/sim/sh/loop.s b/sim/testsuite/sh/loop.s
similarity index 100%
rename from sim/testsuite/sim/sh/loop.s
rename to sim/testsuite/sh/loop.s

diff --git a/sim/testsuite/sim/sh/macl.s b/sim/testsuite/sh/macl.s
similarity index 100%
rename from sim/testsuite/sim/sh/macl.s
rename to sim/testsuite/sh/macl.s

diff --git a/sim/testsuite/sim/sh/macw.s b/sim/testsuite/sh/macw.s
similarity index 100%
rename from sim/testsuite/sim/sh/macw.s
rename to sim/testsuite/sh/macw.s

diff --git a/sim/testsuite/sim/sh/mov.s b/sim/testsuite/sh/mov.s
similarity index 100%
rename from sim/testsuite/sim/sh/mov.s
rename to sim/testsuite/sh/mov.s

diff --git a/sim/testsuite/sim/sh/movi.s b/sim/testsuite/sh/movi.s
similarity index 100%
rename from sim/testsuite/sim/sh/movi.s
rename to sim/testsuite/sh/movi.s

diff --git a/sim/testsuite/sim/sh/movli.s b/sim/testsuite/sh/movli.s
similarity index 100%
rename from sim/testsuite/sim/sh/movli.s
rename to sim/testsuite/sh/movli.s

diff --git a/sim/testsuite/sim/sh/movua.s b/sim/testsuite/sh/movua.s
similarity index 100%
rename from sim/testsuite/sim/sh/movua.s
rename to sim/testsuite/sh/movua.s

diff --git a/sim/testsuite/sim/sh/movxy.s b/sim/testsuite/sh/movxy.s
similarity index 100%
rename from sim/testsuite/sim/sh/movxy.s
rename to sim/testsuite/sh/movxy.s

diff --git a/sim/testsuite/sim/sh/mulr.s b/sim/testsuite/sh/mulr.s
similarity index 100%
rename from sim/testsuite/sim/sh/mulr.s
rename to sim/testsuite/sh/mulr.s

diff --git a/sim/testsuite/sim/sh/pabs.s b/sim/testsuite/sh/pabs.s
similarity index 100%
rename from sim/testsuite/sim/sh/pabs.s
rename to sim/testsuite/sh/pabs.s

diff --git a/sim/testsuite/sim/sh/padd.s b/sim/testsuite/sh/padd.s
similarity index 100%
rename from sim/testsuite/sim/sh/padd.s
rename to sim/testsuite/sh/padd.s

diff --git a/sim/testsuite/sim/sh/paddc.s b/sim/testsuite/sh/paddc.s
similarity index 100%
rename from sim/testsuite/sim/sh/paddc.s
rename to sim/testsuite/sh/paddc.s

diff --git a/sim/testsuite/sim/sh/pand.s b/sim/testsuite/sh/pand.s
similarity index 100%
rename from sim/testsuite/sim/sh/pand.s
rename to sim/testsuite/sh/pand.s

diff --git a/sim/testsuite/sim/sh/pass.s b/sim/testsuite/sh/pass.s
similarity index 100%
rename from sim/testsuite/sim/sh/pass.s
rename to sim/testsuite/sh/pass.s

diff --git a/sim/testsuite/sim/sh/pclr.s b/sim/testsuite/sh/pclr.s
similarity index 100%
rename from sim/testsuite/sim/sh/pclr.s
rename to sim/testsuite/sh/pclr.s

diff --git a/sim/testsuite/sim/sh/pdec.s b/sim/testsuite/sh/pdec.s
similarity index 100%
rename from sim/testsuite/sim/sh/pdec.s
rename to sim/testsuite/sh/pdec.s

diff --git a/sim/testsuite/sim/sh/pdmsb.s b/sim/testsuite/sh/pdmsb.s
similarity index 100%
rename from sim/testsuite/sim/sh/pdmsb.s
rename to sim/testsuite/sh/pdmsb.s

diff --git a/sim/testsuite/sim/sh/pinc.s b/sim/testsuite/sh/pinc.s
similarity index 100%
rename from sim/testsuite/sim/sh/pinc.s
rename to sim/testsuite/sh/pinc.s

diff --git a/sim/testsuite/sim/sh/pmuls.s b/sim/testsuite/sh/pmuls.s
similarity index 100%
rename from sim/testsuite/sim/sh/pmuls.s
rename to sim/testsuite/sh/pmuls.s

diff --git a/sim/testsuite/sim/sh/prnd.s b/sim/testsuite/sh/prnd.s
similarity index 100%
rename from sim/testsuite/sim/sh/prnd.s
rename to sim/testsuite/sh/prnd.s

diff --git a/sim/testsuite/sim/sh/pshai.s b/sim/testsuite/sh/pshai.s
similarity index 100%
rename from sim/testsuite/sim/sh/pshai.s
rename to sim/testsuite/sh/pshai.s

diff --git a/sim/testsuite/sim/sh/pshar.s b/sim/testsuite/sh/pshar.s
similarity index 100%
rename from sim/testsuite/sim/sh/pshar.s
rename to sim/testsuite/sh/pshar.s

diff --git a/sim/testsuite/sim/sh/pshli.s b/sim/testsuite/sh/pshli.s
similarity index 100%
rename from sim/testsuite/sim/sh/pshli.s
rename to sim/testsuite/sh/pshli.s

diff --git a/sim/testsuite/sim/sh/pshlr.s b/sim/testsuite/sh/pshlr.s
similarity index 100%
rename from sim/testsuite/sim/sh/pshlr.s
rename to sim/testsuite/sh/pshlr.s

diff --git a/sim/testsuite/sim/sh/psub.s b/sim/testsuite/sh/psub.s
similarity index 100%
rename from sim/testsuite/sim/sh/psub.s
rename to sim/testsuite/sh/psub.s

diff --git a/sim/testsuite/sim/sh/pswap.s b/sim/testsuite/sh/pswap.s
similarity index 100%
rename from sim/testsuite/sim/sh/pswap.s
rename to sim/testsuite/sh/pswap.s

diff --git a/sim/testsuite/sim/sh/pushpop.s b/sim/testsuite/sh/pushpop.s
similarity index 100%
rename from sim/testsuite/sim/sh/pushpop.s
rename to sim/testsuite/sh/pushpop.s

diff --git a/sim/testsuite/sim/sh/resbank.s b/sim/testsuite/sh/resbank.s
similarity index 100%
rename from sim/testsuite/sim/sh/resbank.s
rename to sim/testsuite/sh/resbank.s

diff --git a/sim/testsuite/sim/sh/sett.s b/sim/testsuite/sh/sett.s
similarity index 100%
rename from sim/testsuite/sim/sh/sett.s
rename to sim/testsuite/sh/sett.s

diff --git a/sim/testsuite/sim/sh/shll.s b/sim/testsuite/sh/shll.s
similarity index 100%
rename from sim/testsuite/sim/sh/shll.s
rename to sim/testsuite/sh/shll.s

diff --git a/sim/testsuite/sim/sh/shll16.s b/sim/testsuite/sh/shll16.s
similarity index 100%
rename from sim/testsuite/sim/sh/shll16.s
rename to sim/testsuite/sh/shll16.s

diff --git a/sim/testsuite/sim/sh/shll2.s b/sim/testsuite/sh/shll2.s
similarity index 100%
rename from sim/testsuite/sim/sh/shll2.s
rename to sim/testsuite/sh/shll2.s

diff --git a/sim/testsuite/sim/sh/shll8.s b/sim/testsuite/sh/shll8.s
similarity index 100%
rename from sim/testsuite/sim/sh/shll8.s
rename to sim/testsuite/sh/shll8.s

diff --git a/sim/testsuite/sim/sh/shlr.s b/sim/testsuite/sh/shlr.s
similarity index 100%
rename from sim/testsuite/sim/sh/shlr.s
rename to sim/testsuite/sh/shlr.s

diff --git a/sim/testsuite/sim/sh/shlr16.s b/sim/testsuite/sh/shlr16.s
similarity index 100%
rename from sim/testsuite/sim/sh/shlr16.s
rename to sim/testsuite/sh/shlr16.s

diff --git a/sim/testsuite/sim/sh/shlr2.s b/sim/testsuite/sh/shlr2.s
similarity index 100%
rename from sim/testsuite/sim/sh/shlr2.s
rename to sim/testsuite/sh/shlr2.s

diff --git a/sim/testsuite/sim/sh/shlr8.s b/sim/testsuite/sh/shlr8.s
similarity index 100%
rename from sim/testsuite/sim/sh/shlr8.s
rename to sim/testsuite/sh/shlr8.s

diff --git a/sim/testsuite/sim/sh/swap.s b/sim/testsuite/sh/swap.s
similarity index 100%
rename from sim/testsuite/sim/sh/swap.s
rename to sim/testsuite/sh/swap.s

diff --git a/sim/testsuite/sim/sh/testutils.inc b/sim/testsuite/sh/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/sh/testutils.inc
rename to sim/testsuite/sh/testutils.inc

diff --git a/sim/testsuite/sim/v850/ChangeLog b/sim/testsuite/v850/ChangeLog
similarity index 100%
rename from sim/testsuite/sim/v850/ChangeLog
rename to sim/testsuite/v850/ChangeLog

diff --git a/sim/testsuite/sim/v850/allinsns.exp b/sim/testsuite/v850/allinsns.exp
similarity index 100%
rename from sim/testsuite/sim/v850/allinsns.exp
rename to sim/testsuite/v850/allinsns.exp

diff --git a/sim/testsuite/sim/v850/bsh.cgs b/sim/testsuite/v850/bsh.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/bsh.cgs
rename to sim/testsuite/v850/bsh.cgs

diff --git a/sim/testsuite/sim/v850/div.cgs b/sim/testsuite/v850/div.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/div.cgs
rename to sim/testsuite/v850/div.cgs

diff --git a/sim/testsuite/sim/v850/divh.cgs b/sim/testsuite/v850/divh.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/divh.cgs
rename to sim/testsuite/v850/divh.cgs

diff --git a/sim/testsuite/sim/v850/divh_3.cgs b/sim/testsuite/v850/divh_3.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/divh_3.cgs
rename to sim/testsuite/v850/divh_3.cgs

diff --git a/sim/testsuite/sim/v850/divhu.cgs b/sim/testsuite/v850/divhu.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/divhu.cgs
rename to sim/testsuite/v850/divhu.cgs

diff --git a/sim/testsuite/sim/v850/divu.cgs b/sim/testsuite/v850/divu.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/divu.cgs
rename to sim/testsuite/v850/divu.cgs

diff --git a/sim/testsuite/sim/v850/sar.cgs b/sim/testsuite/v850/sar.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/sar.cgs
rename to sim/testsuite/v850/sar.cgs

diff --git a/sim/testsuite/sim/v850/satadd.cgs b/sim/testsuite/v850/satadd.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/satadd.cgs
rename to sim/testsuite/v850/satadd.cgs

diff --git a/sim/testsuite/sim/v850/satsub.cgs b/sim/testsuite/v850/satsub.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/satsub.cgs
rename to sim/testsuite/v850/satsub.cgs

diff --git a/sim/testsuite/sim/v850/satsubi.cgs b/sim/testsuite/v850/satsubi.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/satsubi.cgs
rename to sim/testsuite/v850/satsubi.cgs

diff --git a/sim/testsuite/sim/v850/satsubr.cgs b/sim/testsuite/v850/satsubr.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/satsubr.cgs
rename to sim/testsuite/v850/satsubr.cgs

diff --git a/sim/testsuite/sim/v850/shl.cgs b/sim/testsuite/v850/shl.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/shl.cgs
rename to sim/testsuite/v850/shl.cgs

diff --git a/sim/testsuite/sim/v850/shr.cgs b/sim/testsuite/v850/shr.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/shr.cgs
rename to sim/testsuite/v850/shr.cgs

diff --git a/sim/testsuite/sim/v850/testutils.cgs b/sim/testsuite/v850/testutils.cgs
similarity index 100%
rename from sim/testsuite/sim/v850/testutils.cgs
rename to sim/testsuite/v850/testutils.cgs

diff --git a/sim/testsuite/sim/v850/testutils.inc b/sim/testsuite/v850/testutils.inc
similarity index 100%
rename from sim/testsuite/sim/v850/testutils.inc
rename to sim/testsuite/v850/testutils.inc