Subversion Repositories openrisc

/cpu/or32/insnset.c

/configure.ac

/doc/or1ksim.info

/doc/version.texi

/NEWS

/ChangeLog

/testsuite/test-code-or1k/configure

/testsuite/test-code-or1k/Makefile.in

/testsuite/test-code-or1k/configure.ac

/testsuite/test-code-or1k/inst-set-test/inst-set-test-old.c

testsuite/test-code-or1k/inst-set-test/inst-set-test-old.c Property changes : Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: testsuite/test-code-or1k/inst-set-test/inst-set-test.ld =================================================================== --- testsuite/test-code-or1k/inst-set-test/inst-set-test.ld (nonexistent) +++ testsuite/test-code-or1k/inst-set-test/inst-set-test.ld (revision 107) @@ -0,0 +1,68 @@ +/* inst-set.ld. Linker script for Or1ksim instruction set test programs + + Copyright (C) 1999-2006 OpenCores + Copyright (C) 2010 Embecosm Limited + + Contributors various OpenCores participants + Contributor Jeremy Bennett + + This file is part of OpenRISC 1000 Architectural Simulator. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see . */ + +/* ---------------------------------------------------------------------------- + This code is commented throughout for use with Doxygen. + --------------------------------------------------------------------------*/ + +/* ---------------------------------------------------------------------------- + This is a much simplified linker script for use with instruction set test + programs. In particular they do not use the memory controller. + --------------------------------------------------------------------------*/ + +MEMORY + { + ram : ORIGIN = 0x00000000, LENGTH = 0x00200000 + } + +/* Force _reset to be linked in wherever it is (library or source) */ +EXTERN(_reset) + +SECTIONS +{ + /* Section .boot-text guarantees that the code for exception + handling is placed first. */ + .text : + { + *(.boot-text) + *(.text) + *(.rodata) + } > ram + + .data : + { + *(.data) + } > ram + + .bss : + { + *(.bss) + } > ram + + .stack ALIGN (0x10) (NOLOAD) : + { + *(.stack) + } > ram +} + +ENTRY (_reset) Index: testsuite/test-code-or1k/inst-set-test/Makefile.in =================================================================== --- testsuite/test-code-or1k/inst-set-test/Makefile.in (revision 106) +++ testsuite/test-code-or1k/inst-set-test/Makefile.in (revision 107) @@ -15,7 +15,7 @@ @SET_MAKE@ -# Makefile.am for or1ksim testsuite CPU test program: inst-set-test +# Makefile.am for or1ksim instruction set test programs: # Copyright (C) Embecosm Limited, 2010 @@ -58,7 +58,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@BUILD_ALL_TESTS_TRUE@check_PROGRAMS = inst-set-test$(EXEEXT) +check_PROGRAMS = is-div-test$(EXEEXT) is-lws-test$(EXEEXT) \ + $(am__EXEEXT_1) subdir = inst-set-test DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -72,17 +73,38 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am_inst_set_test_OBJECTS = inst-set-test.$(OBJEXT) -inst_set_test_OBJECTS = $(am_inst_set_test_OBJECTS) -inst_set_test_DEPENDENCIES = ../except/except.lo \ +libinst_set_test_la_LIBADD = +am_libinst_set_test_la_OBJECTS = inst-set-test.lo +libinst_set_test_la_OBJECTS = $(am_libinst_set_test_la_OBJECTS) +@BUILD_ALL_TESTS_TRUE@am__EXEEXT_1 = inst-set-test-old$(EXEEXT) +am_inst_set_test_old_OBJECTS = inst-set-test-old.$(OBJEXT) +inst_set_test_old_OBJECTS = $(am_inst_set_test_old_OBJECTS) +inst_set_test_old_DEPENDENCIES = ../except/except.lo \ ../support/libsupport.la -inst_set_test_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +inst_set_test_old_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(inst_set_test_LDFLAGS) $(LDFLAGS) -o $@ + $(inst_set_test_old_LDFLAGS) $(LDFLAGS) -o $@ +am_is_div_test_OBJECTS = is-div-test.$(OBJEXT) +is_div_test_OBJECTS = $(am_is_div_test_OBJECTS) +is_div_test_DEPENDENCIES = inst-set-test.lo +is_div_test_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(is_div_test_LDFLAGS) $(LDFLAGS) -o $@ +am_is_lws_test_OBJECTS = is-lws-test.$(OBJEXT) +is_lws_test_OBJECTS = $(am_is_lws_test_OBJECTS) +is_lws_test_DEPENDENCIES = inst-set-test.lo +is_lws_test_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(is_lws_test_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../depcomp am__depfiles_maybe = depfiles am__mv = mv -f +CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) +LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -92,8 +114,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(inst_set_test_SOURCES) -DIST_SOURCES = $(inst_set_test_SOURCES) +SOURCES = $(libinst_set_test_la_SOURCES) $(inst_set_test_old_SOURCES) \ + $(is_div_test_SOURCES) $(is_lws_test_SOURCES) +DIST_SOURCES = $(libinst_set_test_la_SOURCES) \ + $(inst_set_test_old_SOURCES) $(is_div_test_SOURCES) \ + $(is_lws_test_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -211,15 +236,36 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -inst_set_test_SOURCES = inst-set-test.c -inst_set_test_LDFLAGS = -T$(srcdir)/../default.ld -inst_set_test_LDADD = ../except/except.lo \ - ../support/libsupport.la +# Tests of the instruction set. Broken out into separate tests, to avoid them +# getting too large. The original instruction set test is still here, but not +# built by default. +EXTRA_DIST = inst-set.ld +@BUILD_ALL_TESTS_FALSE@INST_SET_TEST_OLD = +@BUILD_ALL_TESTS_TRUE@INST_SET_TEST_OLD = inst-set-test-old + +# Support library for use when testing the instruction set. +check_LTLIBRARIES = libinst-set-test.la +libinst_set_test_la_SOURCES = inst-set-test.S + +# The new instruction set tests. +is_div_test_SOURCES = is-div-test.S +is_div_test_LDFLAGS = -T$(srcdir)/inst-set-test.ld +is_div_test_LDADD = inst-set-test.lo +is_lws_test_SOURCES = is-lws-test.S +is_lws_test_LDFLAGS = -T$(srcdir)/inst-set-test.ld +is_lws_test_LDADD = inst-set-test.lo + +# The old test which builds with warnings and runs with errors +inst_set_test_old_SOURCES = inst-set-test-old.c +inst_set_test_old_LDFLAGS = -T$(srcdir)/../default.ld +inst_set_test_old_LDADD = ../except/except.lo \ + ../support/libsupport.la + all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .S .c .lo .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -251,6 +297,17 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-checkLTLIBRARIES: + -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES) + @list='$(check_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libinst-set-test.la: $(libinst_set_test_la_OBJECTS) $(libinst_set_test_la_DEPENDENCIES) + $(LINK) $(libinst_set_test_la_OBJECTS) $(libinst_set_test_la_LIBADD) $(LIBS) + clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ @@ -259,9 +316,15 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -inst-set-test$(EXEEXT): $(inst_set_test_OBJECTS) $(inst_set_test_DEPENDENCIES) - @rm -f inst-set-test$(EXEEXT) - $(inst_set_test_LINK) $(inst_set_test_OBJECTS) $(inst_set_test_LDADD) $(LIBS) +inst-set-test-old$(EXEEXT): $(inst_set_test_old_OBJECTS) $(inst_set_test_old_DEPENDENCIES) + @rm -f inst-set-test-old$(EXEEXT) + $(inst_set_test_old_LINK) $(inst_set_test_old_OBJECTS) $(inst_set_test_old_LDADD) $(LIBS) +is-div-test$(EXEEXT): $(is_div_test_OBJECTS) $(is_div_test_DEPENDENCIES) + @rm -f is-div-test$(EXEEXT) + $(is_div_test_LINK) $(is_div_test_OBJECTS) $(is_div_test_LDADD) $(LIBS) +is-lws-test$(EXEEXT): $(is_lws_test_OBJECTS) $(is_lws_test_DEPENDENCIES) + @rm -f is-lws-test$(EXEEXT) + $(is_lws_test_LINK) $(is_lws_test_OBJECTS) $(is_lws_test_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -269,8 +332,32 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inst-set-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inst-set-test-old.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inst-set-test.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/is-div-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/is-lws-test.Po@am__quote@ +.S.o: +@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ $< + +.S.obj: +@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.S.lo: +@am__fastdepCCAS_TRUE@ $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCCAS_FALSE@ $(LTCPPASCOMPILE) -c -o $@ $< + .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @@ -381,7 +468,7 @@ fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) check: check-am all-am: Makefile installdirs: @@ -412,8 +499,8 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - mostlyclean-am +clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \ + clean-libtool mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -484,15 +571,15 @@ .MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \ + clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am

/testsuite/test-code-or1k/inst-set-test/inst-set-test.S

testsuite/test-code-or1k/inst-set-test/inst-set-test.S Property changes : Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: testsuite/test-code-or1k/inst-set-test/Makefile.am =================================================================== --- testsuite/test-code-or1k/inst-set-test/Makefile.am (revision 106) +++ testsuite/test-code-or1k/inst-set-test/Makefile.am (revision 107) @@ -1,4 +1,4 @@ -# Makefile.am for or1ksim testsuite CPU test program: inst-set-test +# Makefile.am for or1ksim instruction set test programs: # Copyright (C) Embecosm Limited, 2010 @@ -24,15 +24,40 @@ # ----------------------------------------------------------------------------- -# A test of the instruction set. Currently not working. Builds with warnings -# and runs with errors. +# Tests of the instruction set. Broken out into separate tests, to avoid them +# getting too large. The original instruction set test is still here, but not +# built by default. +EXTRA_DIST = inst-set.ld + if BUILD_ALL_TESTS -check_PROGRAMS = inst-set-test +INST_SET_TEST_OLD = inst-set-test-old +else +INST_SET_TEST_OLD = endif -inst_set_test_SOURCES = inst-set-test.c +# Support library for use when testing the instruction set. +check_LTLIBRARIES = libinst-set-test.la -inst_set_test_LDFLAGS = -T$(srcdir)/../default.ld +libinst_set_test_la_SOURCES = inst-set-test.S -inst_set_test_LDADD = ../except/except.lo \ - ../support/libsupport.la +# The test programs +check_PROGRAMS = is-div-test \ + is-lws-test \ + $(INST_SET_TEST_OLD) + +# The new instruction set tests. +is_div_test_SOURCES = is-div-test.S +is_div_test_LDFLAGS = -T$(srcdir)/inst-set-test.ld +is_div_test_LDADD = inst-set-test.lo + +is_lws_test_SOURCES = is-lws-test.S +is_lws_test_LDFLAGS = -T$(srcdir)/inst-set-test.ld +is_lws_test_LDADD = inst-set-test.lo + +# The old test which builds with warnings and runs with errors +inst_set_test_old_SOURCES = inst-set-test-old.c + +inst_set_test_old_LDFLAGS = -T$(srcdir)/../default.ld + +inst_set_test_old_LDADD = ../except/except.lo \ + ../support/libsupport.la

/testsuite/test-code-or1k/inst-set-test/inst-set-test.h

testsuite/test-code-or1k/inst-set-test/inst-set-test.h Property changes : Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: testsuite/test-code-or1k/inst-set-test/is-div-test.S =================================================================== --- testsuite/test-code-or1k/inst-set-test/is-div-test.S (nonexistent) +++ testsuite/test-code-or1k/inst-set-test/is-div-test.S (revision 107) @@ -0,0 +1,118 @@ +/* is-div-test.S. l.div and l.divu instruction test of Or1ksim + * + * Copyright (C) 1999-2006 OpenCores + * Copyright (C) 2010 Embecosm Limited + * + * Contributors various OpenCores participants + * Contributor Jeremy Bennett + * + * This file is part of OpenRISC 1000 Architectural Simulator. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +/* ---------------------------------------------------------------------------- + * Coding conventions + * + * A simple rising stack is provided starting at _stack and pointed to by + * r1. r1 points to the next free word. Only 32-bit registers may be pushed + * onto the stack. + * + * Local labels up to 49 are reserved for macros. Each is used only once in + * all macros. You can get in a serious mess if you get local label clashing + * in macros. + * + * Arguments to functions are passed in r3 through r8. + * r9 is the link (return address) + * r11 is for returning results + * + * Only r1 and r2 are preserved across function calls. It is up to the callee + * to save any other registers required. + * ------------------------------------------------------------------------- */ + +/* ---------------------------------------------------------------------------- + * Test coverage + * + * The l.div and l.divu instructions should set the carry flag as well as + * triggering an event when divide by zero occurs. + * + * Having fixed the problem, this is (in good software engineering style), a + * regresison test to go with the fix. + * + * This is not a comprehensive test of either instruction (yet). + * + * Of course what is really needed is a comprehensive instruction test... + * ------------------------------------------------------------------------- */ + + +#include "inst-set-test.h" + +/* ---------------------------------------------------------------------------- + * Test of divide l.div + * ------------------------------------------------------------------------- */ + + .section .text + .global _start +_start: + /* Signed divide by zero */ +_div: + LOAD_STR (r3, "l.div\n") + l.jal _puts + l.nop + + LOAD_CONST (r2, ~SPR_SR_CY) /* Clear the carry flag */ + l.mfspr r3,r0,SPR_SR + l.and r3,r3,r2 + l.mtspr r0,r3,SPR_SR + + LOAD_CONST (r5,1) /* Set up args for division */ + LOAD_CONST (r6,0) + l.div r4,r5,r6 + + l.mfspr r2,r0,SPR_SR /* So we can examine the carry flag */ + LOAD_CONST (r4, SPR_SR_CY) /* The carry bit */ + l.and r2,r2,r4 + l.sfeq r2,r4 + CHECK_FLAG ("1 / 0 (with error) carry flag set: ", TRUE) + + /* Signed divide by zero */ +_divu: + LOAD_STR (r3, "l.divu\n") + l.jal _puts + l.nop + + LOAD_CONST (r2, ~SPR_SR_CY) /* Clear the carry flag */ + l.mfspr r3,r0,SPR_SR + l.and r3,r3,r2 + l.mtspr r0,r3,SPR_SR + + LOAD_CONST (r5,1) /* Set up args for division */ + LOAD_CONST (r6,0) + l.divu r4,r5,r6 + + l.mfspr r2,r0,SPR_SR /* So we can examine the carry flag */ + LOAD_CONST (r4, SPR_SR_CY) /* The carry bit */ + l.and r2,r2,r4 + l.sfeq r2,r4 + CHECK_FLAG ("1 / 0 (with error) carry flag set: ", TRUE) + +/* ---------------------------------------------------------------------------- + * All done + * ------------------------------------------------------------------------- */ +_exit: + LOAD_STR (r3, "Test completed\n") + l.jal _puts + l.nop + + TEST_EXIT \ No newline at end of file

testsuite/test-code-or1k/inst-set-test/is-div-test.S Property changes : Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: testsuite/test-code-or1k/inst-set-test/is-lws-test.S =================================================================== --- testsuite/test-code-or1k/inst-set-test/is-lws-test.S (nonexistent) +++ testsuite/test-code-or1k/inst-set-test/is-lws-test.S (revision 107) @@ -0,0 +1,140 @@ +/* is-lws-test.S. l.lws instruction test of Or1ksim + * + * Copyright (C) 1999-2006 OpenCores + * Copyright (C) 2010 Embecosm Limited + * + * Contributors various OpenCores participants + * Contributor Jeremy Bennett + * + * This file is part of OpenRISC 1000 Architectural Simulator. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +/* ---------------------------------------------------------------------------- + * Coding conventions + * + * A simple rising stack is provided starting at _stack and pointed to by + * r1. r1 points to the next free word. Only 32-bit registers may be pushed + * onto the stack. + * + * Local labels up to 49 are reserved for macros. Each is used only once in + * all macros. You can get in a serious mess if you get local label clashing + * in macros. + * + * Arguments to functions are passed in r3 through r8. + * r9 is the link (return address) + * r11 is for returning results + * + * Only r1 and r2 are preserved across function calls. It is up to the callee + * to save any other registers required. + * ------------------------------------------------------------------------- */ + +/* ---------------------------------------------------------------------------- + * Test coverage + * + * The l.lws instruction was omitted from Or1ksim originally. It is specified + * for ORBIS32, even though it is functionally equivalent to l.lwz. + * + * Having fixed the problem, this is (in good software engineering style), a + * regresison test to go with the fix. + * + * Of course what is really needed is a comprehensive instruction test... + * ------------------------------------------------------------------------- */ + + +#include "inst-set-test.h" + +/* ---------------------------------------------------------------------------- + * Test of load single word and extend with sign: l.lws + * ------------------------------------------------------------------------- */ + .section .rodata + .balign 4 +50: .word 0xdeadbeef +51: .word 0x00000000 +52: .word 0x7fffffff +53: .word 0x80000000 +54: .word 0xffffffff + + .section .text + .global _start +_start: + LOAD_STR (r3, "l.lws\n") + l.jal _puts + l.nop + + /* Load with zero offset */ + LOAD_CONST (r5,50b) + l.lws r4,0(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0xdeadbeef: ", r4, 0xdeadbeef) + + LOAD_CONST (r5,51b) + l.lws r4,0(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0x00000000: ", r4, 0x00000000) + + LOAD_CONST (r5,52b) + l.lws r4,0(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0x7fffffff: ", r4, 0x7fffffff) + + LOAD_CONST (r5,53b) + l.lws r4,0(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0x80000000: ", r4, 0x80000000) + + LOAD_CONST (r5,54b) + l.lws r4,0(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0xffffffff: ", r4, 0xffffffff) + + /* Load with positive offset */ + LOAD_CONST (r5,50b) + l.lws r4,4(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0x00000000: ", r4, 0x00000000) + + LOAD_CONST (r5,50b) + l.lws r4,8(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0x7fffffff: ", r4, 0x7fffffff) + + LOAD_CONST (r5,50b) + l.lws r4,12(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0x80000000: ", r4, 0x80000000) + + LOAD_CONST (r5,50b) + l.lws r4,16(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0xffffffff: ", r4, 0xffffffff) + + /* Load with negative offset */ + LOAD_CONST (r5,54b) + l.lws r4,-16(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0xdeadbeef: ", r4, 0xdeadbeef) + + LOAD_CONST (r5,54b) + l.lws r4,-12(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0x00000000: ", r4, 0x00000000) + + LOAD_CONST (r5,54b) + l.lws r4,-8(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0x7fffffff: ", r4, 0x7fffffff) + + LOAD_CONST (r5,54b) + l.lws r4,-4(r5) + CHECK_RES (" l.lws r4,0(r5): r4=0x80000000: ", r4, 0x80000000) + +/* ---------------------------------------------------------------------------- + * All done + * ------------------------------------------------------------------------- */ +_exit: + LOAD_STR (r3, "Test completed\n") + l.jal _puts + l.nop + + TEST_EXIT \ No newline at end of file

testsuite/test-code-or1k/inst-set-test/is-lws-test.S Property changes : Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Index: testsuite/test-code-or1k/ChangeLog =================================================================== --- testsuite/test-code-or1k/ChangeLog (revision 106) +++ testsuite/test-code-or1k/ChangeLog (revision 107) @@ -1,3 +1,22 @@ +2010-06-06 Jeremy Bennett + * configure: Regenerated. + * configure.ac: Removed creation of lws-test makefile. + * fp/fp.S (_puts): Fixed register usage. + * inst-set-test/inst-set-test.ld: Created. + * inst-set-test/inst-set-test.S: Created using functions + lws-test/lws-test.S + * inst-set-test/is-div-test.S: Created. + * inst-set-test/inst-set-test.h: Created using macros from + lws-test/lws-test.S. + * inst-set-test/Makefile.am: Updated for new tests + * inst-set-test/is-lws-test.S: Created from lws-test/lws-test.S + * lws-test: Directory deleted. + * lws-test/lws-test.S: Deleted. + * lws-test/Makefile.am: Deleted. + * lws-test/Makefile.in: Deleted. + * Makefile.am: Removed lws-test directory + * Makefile.in: Regenerated. + 2010-06-04 Jeremy Bennett * configure: Regenerated. * configure.ac: Added creation of lws-test makefile Index: testsuite/test-code-or1k/Makefile.am =================================================================== --- testsuite/test-code-or1k/Makefile.am (revision 106) +++ testsuite/test-code-or1k/Makefile.am (revision 107) @@ -62,7 +62,6 @@ kbdtest \ local-global \ loop \ - lws-test \ mc-async \ mc-dram \ mc-ssram \ Index: testsuite/or1ksim.tests/inst-set-test.cfg =================================================================== --- testsuite/or1ksim.tests/inst-set-test.cfg (nonexistent) +++ testsuite/or1ksim.tests/inst-set-test.cfg (revision 107) @@ -0,0 +1,103 @@ +/* inst-set.cfg -- Or1ksim instruction set configuration script file + + Copyright (C) 2001, Marko Mlinar + Copyright (C) 2010 Embecosm Limited + + Contributor Marko Mlinar + Contributor Jeremy Bennett + + This file is part of OpenRISC 1000 Architectural Simulator. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see . */ + +/* This configuration file is particularly intended for intruction set tests + which have a single block of RAM and make no use of the memory controller + or flash memory. */ + +section memory + type = unknown /* Fastest */ + name = "RAM" + baseaddr = 0x00000000 + size = 0x00200000 + delayr = 2 + delayw = 4 +end + +section immu + enabled = 0 +end + +section dmmu + enabled = 0 +end + +section ic + enabled = 0 +end + +section dc + enabled = 0 +end + +section cpu + ver = 0x12 + rev = 0x0001 + superscalar = 0 + hazards = 0 + dependstats = 0 +end + +section bpb + enabled = 0 +end + +section debug +/* enabled = 1 + rsp_enabled = 1 + rsp_port = 51000*/ +end + +section sim + debug = 0 + profile = 0 + prof_fn = "sim.profile" + + exe_log = 0 + exe_log_type = software + exe_log_fn = "executed.log" +end + +section mc + enabled = 0 +end + +section dma + enabled = 0 +end + +section ethernet + enabled = 0 +end + +section VAPI + enabled = 0 +end + +section fb + enabled = 0 +end + +section kbd + enabled = 0 +end Index: testsuite/or1ksim.tests/Makefile.in =================================================================== --- testsuite/or1ksim.tests/Makefile.in (revision 106) +++ testsuite/or1ksim.tests/Makefile.in (revision 107) @@ -211,37 +211,38 @@ top_srcdir = @top_srcdir@ # Just distribute this stuff -EXTRA_DIST = acv-gpio.cfg \ - acv-uart.cfg \ - basic.exp \ - cache.exp \ - cbasic.exp \ - cfg.exp \ - default.cfg \ - dhry.exp \ - dmatest.exp \ - eth0.rx \ - eth.cfg \ - eth.exp \ - except-test.exp \ - exit.exp \ - ext.exp \ - fbtest.exp \ - flag.exp \ - fp.cfg \ - fp.exp \ - functest.exp \ - int-test.exp \ - kbdtest.cfg \ - kbdtest.exp \ - kbdtest.rx \ - local-global.exp \ - lws-test.exp \ - mem-test.exp \ - mmu.cfg \ - mmu.exp \ - mul.exp \ - mycompress.exp \ +EXTRA_DIST = acv-gpio.cfg \ + acv-uart.cfg \ + basic.exp \ + cache.exp \ + cbasic.exp \ + cfg.exp \ + default.cfg \ + dhry.exp \ + dmatest.exp \ + eth0.rx \ + eth.cfg \ + eth.exp \ + except-test.exp \ + exit.exp \ + ext.exp \ + fbtest.exp \ + flag.exp \ + fp.cfg \ + fp.exp \ + functest.exp \ + int-test.exp \ + inst-set-test.cfg \ + inst-set-test.exp \ + kbdtest.cfg \ + kbdtest.exp \ + kbdtest.rx \ + local-global.exp \ + mem-test.exp \ + mmu.cfg \ + mmu.exp \ + mul.exp \ + mycompress.exp \ tick.exp all: all-am

/testsuite/or1ksim.tests/inst-set-test.exp

/testsuite/or1ksim.tests/Makefile.am

/testsuite/ChangeLog

/testsuite/README

/configure