OpenCores
URL https://opencores.org/ocsvn/openrisc/openrisc/trunk

Subversion Repositories openrisc

Compare Revisions

  • This comparison shows the changes necessary to convert path
    /openrisc/trunk/or1ksim/testsuite/test-code-or1k
    from Rev 90 to Rev 93
    Reverse comparison

Rev 90 → Rev 93

/m4/libtool.m4
2470,13 → 2470,10
# before this can be enabled.
hardcode_into_libs=yes
 
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
 
# We used to test for /lib/ld.so.1 and disable shared libraries on
2488,6 → 2485,18
dynamic_linker='GNU/Linux ld.so'
;;
 
netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='NetBSD ld.elf_so'
;;
 
netbsd*)
version_type=sunos
need_lib_prefix=no
3079,7 → 3088,7
lt_cv_deplibs_check_method=pass_all
;;
 
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
3760,7 → 3769,7
;;
esac
;;
netbsd*)
netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
4185,6 → 4194,9
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
linux* | k*bsd*-gnu)
_LT_TAGVAR(link_all_deplibs, $1)=no
;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
4249,6 → 4261,9
openbsd*)
with_gnu_ld=no
;;
linux* | k*bsd*-gnu)
_LT_TAGVAR(link_all_deplibs, $1)=no
;;
esac
 
_LT_TAGVAR(ld_shlibs, $1)=yes
4431,7 → 4446,7
fi
;;
 
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
4606,6 → 4621,7
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
_LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
4844,7 → 4860,7
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
 
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
/m4/ltversion.m4
9,15 → 9,15
 
# Generated from ltversion.in.
 
# serial 3017 ltversion.m4
# serial 3012 ltversion.m4
# This file is part of GNU Libtool
 
m4_define([LT_PACKAGE_VERSION], [2.2.6b])
m4_define([LT_PACKAGE_REVISION], [1.3017])
m4_define([LT_PACKAGE_VERSION], [2.2.6])
m4_define([LT_PACKAGE_REVISION], [1.3012])
 
AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.2.6b'
macro_revision='1.3017'
[macro_version='2.2.6'
macro_revision='1.3012'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
/configure
2045,8 → 2045,8
 
 
 
macro_version='2.2.6b'
macro_revision='1.3017'
macro_version='2.2.6'
macro_revision='1.3012'
 
 
 
4179,7 → 4179,7
lt_cv_deplibs_check_method=pass_all
;;
 
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
7390,6 → 7390,9
openbsd*)
with_gnu_ld=no
;;
linux* | k*bsd*-gnu)
link_all_deplibs=no
;;
esac
 
ld_shlibs=yes
7572,7 → 7575,7
fi
;;
 
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
7747,6 → 7750,7
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
8161,7 → 8165,7
link_all_deplibs=yes
;;
 
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
9123,13 → 9127,10
# before this can be enabled.
hardcode_into_libs=yes
 
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
 
# We used to test for /lib/ld.so.1 and disable shared libraries on
9141,6 → 9142,18
dynamic_linker='GNU/Linux ld.so'
;;
 
netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='NetBSD ld.elf_so'
;;
 
netbsd*)
version_type=sunos
need_lib_prefix=no
10074,7 → 10087,7
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 10077 "configure"
#line 10090 "configure"
#include "confdefs.h"
 
#if HAVE_DLFCN_H
10170,7 → 10183,7
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 10173 "configure"
#line 10186 "configure"
#include "confdefs.h"
 
#if HAVE_DLFCN_H
12671,7 → 12684,7
_ACEOF
 
 
ac_config_files="$ac_config_files Makefile acv-gpio/Makefile acv-uart/Makefile basic/Makefile cache/Makefile cbasic/Makefile cfg/Makefile dhry/Makefile dmatest/Makefile eth/Makefile except/Makefile except-test/Makefile exit/Makefile ext/Makefile fbtest/Makefile functest/Makefile flag/Makefile int-test/Makefile inst-set-test/Makefile kbdtest/Makefile local-global/Makefile loop/Makefile mc-async/Makefile mc-dram/Makefile mc-ssram/Makefile mc-sync/Makefile mc-common/Makefile mem-test/Makefile mmu/Makefile mul/Makefile mycompress/Makefile support/Makefile tick/Makefile uos/Makefile"
ac_config_files="$ac_config_files Makefile acv-gpio/Makefile acv-uart/Makefile basic/Makefile cache/Makefile cbasic/Makefile cfg/Makefile dhry/Makefile dmatest/Makefile eth/Makefile except/Makefile except-test/Makefile exit/Makefile ext/Makefile fbtest/Makefile functest/Makefile flag/Makefile int-test/Makefile int-logger/Makefile inst-set-test/Makefile kbdtest/Makefile local-global/Makefile loop/Makefile mc-async/Makefile mc-dram/Makefile mc-ssram/Makefile mc-sync/Makefile mc-common/Makefile mem-test/Makefile mmu/Makefile mul/Makefile mycompress/Makefile support/Makefile tick/Makefile uos/Makefile upcalls/Makefile"
 
 
cat >confcache <<\_ACEOF
13591,6 → 13604,7
"functest/Makefile") CONFIG_FILES="$CONFIG_FILES functest/Makefile" ;;
"flag/Makefile") CONFIG_FILES="$CONFIG_FILES flag/Makefile" ;;
"int-test/Makefile") CONFIG_FILES="$CONFIG_FILES int-test/Makefile" ;;
"int-logger/Makefile") CONFIG_FILES="$CONFIG_FILES int-logger/Makefile" ;;
"inst-set-test/Makefile") CONFIG_FILES="$CONFIG_FILES inst-set-test/Makefile" ;;
"kbdtest/Makefile") CONFIG_FILES="$CONFIG_FILES kbdtest/Makefile" ;;
"local-global/Makefile") CONFIG_FILES="$CONFIG_FILES local-global/Makefile" ;;
13607,6 → 13621,7
"support/Makefile") CONFIG_FILES="$CONFIG_FILES support/Makefile" ;;
"tick/Makefile") CONFIG_FILES="$CONFIG_FILES tick/Makefile" ;;
"uos/Makefile") CONFIG_FILES="$CONFIG_FILES uos/Makefile" ;;
"upcalls/Makefile") CONFIG_FILES="$CONFIG_FILES upcalls/Makefile" ;;
 
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
/Makefile.in
278,6 → 278,7
functest \
flag \
inst-set-test \
int-logger \
int-test \
kbdtest \
local-global \
291,7 → 292,8
mul \
mycompress \
tick \
uos
uos \
upcalls
 
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
/kbdtest/kbdtest.c
69,6 → 69,44
 
 
/* --------------------------------------------------------------------------*/
/*!Print an escaped character
Non-printable characters use their name:
'\n' - ENTER
' ' - SPACE
'\t' - TAB
 
Any char > 127 (0x7f) is an error.
 
Any other char less than 0x20 appears as ^<char>. */
/* --------------------------------------------------------------------------*/
static void
print_escaped_char (unsigned char c)
{
switch (c)
{
case '\n': printf ("Received: ENTER.\n"); return;
case ' ': printf ("Received: SPACE.\n"); return;
case '\t': printf ("Received: TAB.\n"); return;
 
default:
if (c > 0x7f)
{
printf ("\nWarning: received erroneous character 0x%02x.\n",
(unsigned int) c);
}
else if (c < 0x20)
{
printf ("Received '^%c'.\n", '@' + c);
}
else
{
printf ("Received '%c'.\n", c);
}
}
} /* print_escaped_char () */
 
 
/* --------------------------------------------------------------------------*/
/*!Utility to read a 32 bit memory mapped register
 
@param[in] addr The address to read from
205,7 → 243,7
}
else
{
printf ("%c", c);
print_escaped_char (c);
char_scan_made = x;
}
}
225,7 → 263,7
}
else
{
printf ("%c", c);
print_escaped_char (c);
char_scan_made = x;
}
 
307,7 → 345,7
mtspr (SPR_SR, mfspr(SPR_SR) | SPR_SR_IEE);
mtspr (SPR_PICMR, mfspr(SPR_PICMR) | (0x00000001L << KBD_IRQ));
 
/* Wait until the interrupt handler is finished */
/* Wait until the interrupt handler is finished. */
while (num_chars_done < MAX_CHARS_TO_READ)
{
}
/upcalls/upcall-basic.c
0,0 → 1,199
/* upcall-basic.c. Test of Or1ksim basic handling of upcalls
 
Copyright (C) 2010 Embecosm Limited
 
Contributors various OpenCores participants
Contributor Jeremy Bennett <jeremy.bennett@embecosm.com>
 
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 <http: www.gnu.org/licenses/>. */
 
/* ----------------------------------------------------------------------------
This code is commented throughout for use with Doxygen.
--------------------------------------------------------------------------*/
 
#include "support.h"
#include "spr-defs.h"
#include "board.h"
 
 
/*!Alignment exception handler defined here. */
unsigned long excpt_align;
 
 
/* --------------------------------------------------------------------------*/
/*!Write a memory mapped byte register
 
@param[in] addr Memory mapped address
@param[in] value Value to set */
/* --------------------------------------------------------------------------*/
static void
setreg8 (unsigned long int addr,
unsigned char value)
{
*((volatile unsigned char *) addr) = value;
printf ("Wrote byte at 0x%08lx = 0x%02x.\n", addr, value);
 
} /* setreg8 () */
 
 
/* --------------------------------------------------------------------------*/
/*!Write a memory mapped half word register
 
@param[in] addr Memory mapped address
@param[in] value Value to set */
/* --------------------------------------------------------------------------*/
static void
setreg16 (unsigned long int addr,
unsigned short int value)
{
*((volatile unsigned short int *) addr) = value;
printf ("Wrote half word at 0x%08lx = 0x%04x.\n", addr, value);
 
} /* setreg16 () */
 
 
/* --------------------------------------------------------------------------*/
/*!Write a memory mapped full word register
 
@param[in] addr Memory mapped address
@param[in] value Value to set */
/* --------------------------------------------------------------------------*/
static void
setreg32 (unsigned long int addr,
unsigned long int value)
{
*((volatile unsigned long int *) addr) = value;
printf ("Wrote full word at 0x%08lx = 0x%08lx.\n", addr, value);
 
} /* setreg32 () */
 
 
/* --------------------------------------------------------------------------*/
/*!Read a memory mapped byte register
 
@param[in] addr Memory mapped address
 
@return Value read */
/* --------------------------------------------------------------------------*/
unsigned char
getreg8 (unsigned long int addr)
{
unsigned char res = *((volatile unsigned char *) addr);
printf ("Read byte at 0x%08lx = 0x%02x.\n", addr, res);
return res;
 
} /* getreg8 () */
 
 
/* --------------------------------------------------------------------------*/
/*!Read a memory mapped half word register
 
@param[in] addr Memory mapped address
 
@return Value read */
/* --------------------------------------------------------------------------*/
unsigned short int
getreg16 (unsigned long int addr)
{
unsigned short int res = *((volatile unsigned short int *) addr);
printf ("Read half word at 0x%08lx = 0x%04x.\n", addr, res);
return res;
 
} /* getreg16 () */
 
 
/* --------------------------------------------------------------------------*/
/*!Read a memory mapped full word register
 
@param[in] addr Memory mapped address
 
@return Value read */
/* --------------------------------------------------------------------------*/
unsigned long int
getreg32 (unsigned long int addr)
{
unsigned long int res = *((volatile unsigned long int *) addr);
printf ("Read full word at 0x%08lx = 0x%08lx.\n", addr, res);
return res;
 
} /* getreg32 () */
 
 
/* --------------------------------------------------------------------------*/
/*! Exception handler for misalignment.
 
Notes what has happened. */
/* --------------------------------------------------------------------------*/
void align_handler (void)
{
printf ("Misaligned access.\n");
 
} /* align_handler () */
 
 
/* --------------------------------------------------------------------------*/
/*!Main program to read and write memory mapped registers
 
All these calls should be correctly aligned, but we set an handler, just in
case.
 
@return The return code from the program (always zero). */
/* --------------------------------------------------------------------------*/
int
main ()
{
/* Set the exception handler */
printf ("Setting alignment exception handler.\n");
excpt_align = (unsigned long)align_handler;
 
/* Write some registers */
printf ("Writing registers.\n");
 
/* Byte aligned */
setreg8 (GENERIC_BASE, 0xde);
setreg8 (GENERIC_BASE + 1, 0xad);
setreg8 (GENERIC_BASE + 2, 0xbe);
setreg8 (GENERIC_BASE + 3, 0xef);
 
/* Half word aligned */
setreg16 (GENERIC_BASE + 4, 0xbaad);
setreg16 (GENERIC_BASE + 6, 0xf00d);
 
/* Full word aligned */
setreg32 (GENERIC_BASE + 8, 0xcafebabe);
 
/* Read some registers, but mix up which size from where. */
printf ("Reading registers.\n");
 
/* Full word aligned */
(void)getreg32 (GENERIC_BASE + 0);
 
/* Byte aligned */
(void)getreg8 (GENERIC_BASE + 4);
(void)getreg8 (GENERIC_BASE + 5);
(void)getreg8 (GENERIC_BASE + 6);
(void)getreg8 (GENERIC_BASE + 7);
 
/* Half word aligned */
(void)getreg16 (GENERIC_BASE + 8);
(void)getreg16 (GENERIC_BASE + 10);
 
/* All done */
printf ("All done.\n");
report (0xdeaddead);
return 0;
 
} /* main () */
upcalls/upcall-basic.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: upcalls/Makefile.in =================================================================== --- upcalls/Makefile.in (nonexistent) +++ upcalls/Makefile.in (revision 93) @@ -0,0 +1,523 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Makefile.am for or1ksim OR1K test program: upcalls + +# Copyright (C) Embecosm Limited, 2010 + +# 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. +# ----------------------------------------------------------------------------- +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +check_PROGRAMS = upcall-basic$(EXEEXT) upcall-misaligned$(EXEEXT) +subdir = upcalls +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am_upcall_basic_OBJECTS = upcall-basic.$(OBJEXT) +upcall_basic_OBJECTS = $(am_upcall_basic_OBJECTS) +upcall_basic_DEPENDENCIES = ../except/except.lo \ + ../support/libsupport.la +upcall_basic_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(upcall_basic_LDFLAGS) $(LDFLAGS) -o $@ +am_upcall_misaligned_OBJECTS = upcall-misaligned.$(OBJEXT) +upcall_misaligned_OBJECTS = $(am_upcall_misaligned_OBJECTS) +upcall_misaligned_DEPENDENCIES = ../except/except.lo \ + ../support/libsupport.la +upcall_misaligned_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(upcall_misaligned_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/../../depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(upcall_basic_SOURCES) $(upcall_misaligned_SOURCES) +DIST_SOURCES = $(upcall_basic_SOURCES) $(upcall_misaligned_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SIM = @SIM@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Basic test +upcall_basic_SOURCES = upcall-basic.c +upcall_basic_LDFLAGS = -T$(srcdir)/../default.ld +upcall_basic_LDADD = ../except/except.lo \ + ../support/libsupport.la + + +# Test for misaligned calls +upcall_misaligned_SOURCES = upcall-misaligned.c +upcall_misaligned_LDFLAGS = -T$(srcdir)/../default.ld +upcall_misaligned_LDADD = ../except/except.lo \ + ../support/libsupport.la + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu upcalls/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu upcalls/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +upcall-basic$(EXEEXT): $(upcall_basic_OBJECTS) $(upcall_basic_DEPENDENCIES) + @rm -f upcall-basic$(EXEEXT) + $(upcall_basic_LINK) $(upcall_basic_OBJECTS) $(upcall_basic_LDADD) $(LIBS) +upcall-misaligned$(EXEEXT): $(upcall_misaligned_OBJECTS) $(upcall_misaligned_DEPENDENCIES) + @rm -f upcall-misaligned$(EXEEXT) + $(upcall_misaligned_LINK) $(upcall_misaligned_OBJECTS) $(upcall_misaligned_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upcall-basic.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upcall-misaligned.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.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 \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Index: upcalls/Makefile.am =================================================================== --- upcalls/Makefile.am (nonexistent) +++ upcalls/Makefile.am (revision 93) @@ -0,0 +1,45 @@ +# Makefile.am for or1ksim OR1K test program: upcalls + +# Copyright (C) Embecosm Limited, 2010 + +# 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. +# ----------------------------------------------------------------------------- + + +# Test programs for upcalls +check_PROGRAMS = upcall-basic \ + upcall-misaligned + +# Basic test +upcall_basic_SOURCES = upcall-basic.c + +upcall_basic_LDFLAGS = -T$(srcdir)/../default.ld + +upcall_basic_LDADD = ../except/except.lo \ + ../support/libsupport.la + +# Test for misaligned calls +upcall_misaligned_SOURCES = upcall-misaligned.c + +upcall_misaligned_LDFLAGS = -T$(srcdir)/../default.ld + +upcall_misaligned_LDADD = ../except/except.lo \ + ../support/libsupport.la
upcalls/Makefile.am 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: upcalls/upcall-misaligned.c =================================================================== --- upcalls/upcall-misaligned.c (nonexistent) +++ upcalls/upcall-misaligned.c (revision 93) @@ -0,0 +1,290 @@ +/* upcall-misaligned.c. Test of Or1ksim misaligned handling of upcalls + + 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. + --------------------------------------------------------------------------*/ + +#include "support.h" +#include "spr-defs.h" +#include "board.h" + + +/*!Alignment exception handler defined here. */ +unsigned long excpt_align; + +/*!Flag set if we get a misaligned access */ +static int misaligned_p; + +/* --------------------------------------------------------------------------*/ +/*!Write a memory mapped byte register + + Report the result, noting if we get a misalignment exception. + + @param[in] addr Memory mapped address + @param[in] value Value to set */ +/* --------------------------------------------------------------------------*/ +static void +setreg8 (unsigned long int addr, + unsigned char value) +{ + *((volatile unsigned char *) addr) = value; + + if (misaligned_p) + { + printf ("Writing byte at 0x%08lx: misalignment exception.\n", addr); + misaligned_p = 0; + } + else + { + printf ("Wrote byte at 0x%08lx = 0x%02x.\n", addr, value); + } +} /* setreg8 () */ + + +/* --------------------------------------------------------------------------*/ +/*!Write a memory mapped half word register + + Report the result, noting if we get a misalignment exception. + + @param[in] addr Memory mapped address + @param[in] value Value to set */ +/* --------------------------------------------------------------------------*/ +static void +setreg16 (unsigned long int addr, + unsigned short int value) +{ + *((volatile unsigned short int *) addr) = value; + + if (misaligned_p) + { + printf ("Writing half word at 0x%08lx: misalignment exception.\n", addr); + misaligned_p = 0; + } + else + { + printf ("Wrote half word at 0x%08lx = 0x%04x.\n", addr, value); + } +} /* setreg16 () */ + + +/* --------------------------------------------------------------------------*/ +/*!Write a memory mapped full word register + + Report the result, noting if we get a misalignment exception. + + @param[in] addr Memory mapped address + @param[in] value Value to set */ +/* --------------------------------------------------------------------------*/ +static void +setreg32 (unsigned long int addr, + unsigned long int value) +{ + *((volatile unsigned long int *) addr) = value; + + if (misaligned_p) + { + printf ("Writing full word at 0x%08lx: misalignment exception.\n", addr); + misaligned_p = 0; + } + else + { + printf ("Wrote full word at 0x%08lx = 0x%08lx.\n", addr, value); + } +} /* setreg32 () */ + + +/* --------------------------------------------------------------------------*/ +/*!Read a memory mapped byte register + + Report the result, noting if we get a misalignment exception. + + @param[in] addr Memory mapped address + + @return Value read */ +/* --------------------------------------------------------------------------*/ +unsigned char +getreg8 (unsigned long int addr) +{ + unsigned char res = *((volatile unsigned char *) addr); + + if (misaligned_p) + { + printf ("Reading byte at 0x%08lx: misalignment exception.\n", addr); + misaligned_p = 0; + } + else + { + printf ("Read byte at 0x%08lx = 0x%02x.\n", addr, res); + } + + return res; + +} /* getreg8 () */ + + +/* --------------------------------------------------------------------------*/ +/*!Read a memory mapped half word register + + Report the result, noting if we get a misalignment exception. + + @param[in] addr Memory mapped address + + @return Value read */ +/* --------------------------------------------------------------------------*/ +unsigned short int +getreg16 (unsigned long int addr) +{ + unsigned short int res = *((volatile unsigned short int *) addr); + + if (misaligned_p) + { + printf ("Reading half word at 0x%08lx: misalignment exception.\n", addr); + misaligned_p = 0; + } + else + { + printf ("Read half word at 0x%08lx = 0x%04x.\n", addr, res); + } + + return res; + +} /* getreg16 () */ + + +/* --------------------------------------------------------------------------*/ +/*!Read a memory mapped full word register + + Report the result, noting if we get a misalignment exception. + + @param[in] addr Memory mapped address + + @return Value read */ +/* --------------------------------------------------------------------------*/ +unsigned long int +getreg32 (unsigned long int addr) +{ + unsigned long int res = *((volatile unsigned long int *) addr); + + if (misaligned_p) + { + printf ("Reading full word at 0x%08lx: misalignment exception.\n", addr); + misaligned_p = 0; + } + else + { + printf ("Read full word at 0x%08lx = 0x%08lx.\n", addr, res); + } + + return res; + +} /* getreg32 () */ + + +/* --------------------------------------------------------------------------*/ +/*!Exception handler for misalignment. + + Set the flag to indicated we have hit an exception. + + We can't just return, since that will give us the instruction that caused + the problem in the first place. What we do instead is patch the EPCR SPR. + + This is fine, so long as we didn't trap in a delay slot. The crude response + to that then we just exit. */ +/* --------------------------------------------------------------------------*/ +void align_handler (void) +{ + misaligned_p = 1; + + unsigned long int iaddr = mfspr (SPR_EPCR_BASE); + unsigned long int instr = *(unsigned long int *) iaddr; + unsigned char opc = instr >> 26; + + switch (opc) + { + case 0x00: /* l.j */ + case 0x01: /* l.jal */ + case 0x03: /* l.bnf */ + case 0x04: /* l.bf */ + case 0x11: /* l.jr */ + case 0x12: /* l.jalr */ + + printf ("Misalignment exception unable to recover from delay slot.\n"); + exit (1); + break; + + default: + mtspr (SPR_EPCR_BASE, iaddr + 4); /* Step past */ + break; + } +} /* align_handler () */ + + +/* --------------------------------------------------------------------------*/ +/*!Main program to read and write memory mapped registers + + Some of these are misaligned and should cause the appropriate exception. + + @return The return code from the program (always zero). */ +/* --------------------------------------------------------------------------*/ +int +main () +{ + /* Set the exception handler, and note that no exceptions have yet + happened. */ + printf ("Setting alignment exception handler.\n"); + excpt_align = (unsigned long)align_handler; + misaligned_p = 0; + + /* Write some registers */ + printf ("Writing registers.\n"); + + setreg8 (GENERIC_BASE, 0xde); + + setreg16 (GENERIC_BASE + 2, 0xdead); /* Aligned */ + setreg16 (GENERIC_BASE + 5, 0xbeef); /* Unaligned */ + + setreg32 (GENERIC_BASE + 8, 0xdeadbeef); /* Aligned */ + setreg32 (GENERIC_BASE + 13, 0xcafebabe); /* Unaligned */ + setreg32 (GENERIC_BASE + 18, 0xbaadf00d); /* Unaligned */ + setreg32 (GENERIC_BASE + 23, 0xfee1babe); /* Unaligned */ + setreg32 (GENERIC_BASE + 28, 0xbaadbabe); /* Aligned */ + + /* Write some registers */ + printf ("Reading registers.\n"); + + (void)getreg8 (GENERIC_BASE); + + (void)getreg16 (GENERIC_BASE + 2); /* Aligned */ + (void)getreg16 (GENERIC_BASE + 5); /* Unaligned */ + + (void)getreg32 (GENERIC_BASE + 8); /* Aligned */ + (void)getreg32 (GENERIC_BASE + 13); /* Unaligned */ + (void)getreg32 (GENERIC_BASE + 18); /* Unaligned */ + (void)getreg32 (GENERIC_BASE + 23); /* Unaligned */ + (void)getreg32 (GENERIC_BASE + 28); /* Aligned */ + + /* We don't actually ever return */ + report (0xdeaddead); + return 0; + +} /* main () */
upcalls/upcall-misaligned.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: configure.ac =================================================================== --- configure.ac (revision 90) +++ configure.ac (revision 93) @@ -132,6 +132,7 @@ functest/Makefile \ flag/Makefile \ int-test/Makefile \ + int-logger/Makefile \ inst-set-test/Makefile \ kbdtest/Makefile \ local-global/Makefile \ @@ -147,6 +148,7 @@ mycompress/Makefile \ support/Makefile \ tick/Makefile \ - uos/Makefile]) + uos/Makefile \ + upcalls/Makefile]) AC_OUTPUT
/int-logger/Makefile.in
0,0 → 1,519
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
 
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
 
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
 
@SET_MAKE@
 
# Makefile.am for or1ksim OR1K test programs: int-logger-{edge,level}
 
# Copyright (C) Embecosm Limited, 2010
 
# Contributor Jeremy Bennett <jeremy.bennett@embecosm.com>
 
# 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 <http:#www.gnu.org/licenses/>. */
 
# -----------------------------------------------------------------------------
# This code is commented throughout for use with Doxygen.
# -----------------------------------------------------------------------------
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
check_PROGRAMS = int-logger-edge$(EXEEXT) int-logger-level$(EXEEXT)
subdir = int-logger
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am_int_logger_edge_OBJECTS = int-logger-edge.$(OBJEXT)
int_logger_edge_OBJECTS = $(am_int_logger_edge_OBJECTS)
int_logger_edge_DEPENDENCIES = ../except/except.lo \
../support/libsupport.la
int_logger_edge_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(int_logger_edge_LDFLAGS) $(LDFLAGS) -o $@
am_int_logger_level_OBJECTS = int-logger-level.$(OBJEXT)
int_logger_level_OBJECTS = $(am_int_logger_level_OBJECTS)
int_logger_level_DEPENDENCIES = ../except/except.lo \
../support/libsupport.la
int_logger_level_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(int_logger_level_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/../../depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(int_logger_edge_SOURCES) $(int_logger_level_SOURCES)
DIST_SOURCES = $(int_logger_edge_SOURCES) $(int_logger_level_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIM = @SIM@
STRIP = @STRIP@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
int_logger_edge_SOURCES = int-logger-edge.c
int_logger_edge_LDFLAGS = -T$(srcdir)/../default.ld
int_logger_edge_LDADD = ../except/except.lo \
../support/libsupport.la
 
int_logger_level_SOURCES = int-logger-level.c
int_logger_level_LDFLAGS = -T$(srcdir)/../default.ld
int_logger_level_LDADD = ../except/except.lo \
../support/libsupport.la
 
all: all-am
 
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
&& { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu int-logger/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu int-logger/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
 
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
 
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
int-logger-edge$(EXEEXT): $(int_logger_edge_OBJECTS) $(int_logger_edge_DEPENDENCIES)
@rm -f int-logger-edge$(EXEEXT)
$(int_logger_edge_LINK) $(int_logger_edge_OBJECTS) $(int_logger_edge_LDADD) $(LIBS)
int-logger-level$(EXEEXT): $(int_logger_level_OBJECTS) $(int_logger_level_DEPENDENCIES)
@rm -f int-logger-level$(EXEEXT)
$(int_logger_level_LINK) $(int_logger_level_OBJECTS) $(int_logger_level_LDADD) $(LIBS)
 
mostlyclean-compile:
-rm -f *.$(OBJEXT)
 
distclean-compile:
-rm -f *.tab.c
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/int-logger-edge.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/int-logger-level.Po@am__quote@
 
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
 
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
 
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
 
mostlyclean-libtool:
-rm -f *.lo
 
clean-libtool:
-rm -rf .libs _libs
 
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
 
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
if test $$# -gt 0; then \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
"$$@" $$unique; \
else \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$unique; \
fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
 
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
 
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d "$(distdir)/$$file"; then \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
test -f "$(distdir)/$$file" \
|| cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
check: check-am
all-am: Makefile
installdirs:
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
 
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
 
clean-generic:
 
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
 
clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
mostlyclean-am
 
distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
 
dvi: dvi-am
 
dvi-am:
 
html: html-am
 
html-am:
 
info: info-am
 
info-am:
 
install-data-am:
 
install-dvi: install-dvi-am
 
install-dvi-am:
 
install-exec-am:
 
install-html: install-html-am
 
install-html-am:
 
install-info: install-info-am
 
install-info-am:
 
install-man:
 
install-pdf: install-pdf-am
 
install-pdf-am:
 
install-ps: install-ps-am
 
install-ps-am:
 
installcheck-am:
 
maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
 
mostlyclean: mostlyclean-am
 
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
 
pdf: pdf-am
 
pdf-am:
 
ps: ps-am
 
ps-am:
 
uninstall-am:
 
.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 \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am
 
 
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
/int-logger/Makefile.am
0,0 → 1,44
# Makefile.am for or1ksim OR1K test programs: int-logger-{edge,level}
 
# Copyright (C) Embecosm Limited, 2010
 
# Contributor Jeremy Bennett <jeremy.bennett@embecosm.com>
 
# 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 <http:#www.gnu.org/licenses/>. */
 
# -----------------------------------------------------------------------------
# This code is commented throughout for use with Doxygen.
# -----------------------------------------------------------------------------
 
 
# Test programs which report on interrupts received. One for edge triggered,
# one for level triggered.
check_PROGRAMS = int-logger-edge \
int-logger-level
 
int_logger_edge_SOURCES = int-logger-edge.c
 
int_logger_edge_LDFLAGS = -T$(srcdir)/../default.ld
 
int_logger_edge_LDADD = ../except/except.lo \
../support/libsupport.la
 
int_logger_level_SOURCES = int-logger-level.c
 
int_logger_level_LDFLAGS = -T$(srcdir)/../default.ld
 
int_logger_level_LDADD = ../except/except.lo \
../support/libsupport.la
int-logger/Makefile.am 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: int-logger/int-logger-edge.c =================================================================== --- int-logger/int-logger-edge.c (nonexistent) +++ int-logger/int-logger-edge.c (revision 93) @@ -0,0 +1,132 @@ +/* int-logger-edge.c. Test of Or1ksim handling of edge triggered interrupts + + 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. + --------------------------------------------------------------------------*/ + +#include "support.h" +#include "spr-defs.h" +#include "board.h" + + +/* --------------------------------------------------------------------------*/ +/*!Write a memory mapped register + + @param[in] addr Memory mapped address + @param[in] value Value to set */ +/* --------------------------------------------------------------------------*/ +static void +setreg (unsigned long addr, + unsigned char value) +{ + *((volatile unsigned char *) addr) = value; + +} /* setreg () */ + + +/* --------------------------------------------------------------------------*/ +/*!Read a memory mapped register + + @param[in] addr Memory mapped address + + @return Value read */ +/* --------------------------------------------------------------------------*/ +unsigned long +getreg (unsigned long addr) +{ + return *((volatile unsigned char *) addr); + +} /* getreg () */ + + +/* --------------------------------------------------------------------------*/ +/*!Generic interrupt handler + + This should receive the interrupt exception. Report the value in PICSR, + then clear the interrupt and reporting it again */ +/* --------------------------------------------------------------------------*/ +static void +interrupt_handler () +{ + unsigned long int old_picsr = mfspr (SPR_PICSR); + mtspr (SPR_PICSR, 0); + unsigned long int new_picsr = mfspr (SPR_PICSR); + + printf ("PICSR 0x%08lx -> 0x%08lx\n", old_picsr, new_picsr); + +} /* interrupt_handler () */ + + +/* --------------------------------------------------------------------------*/ +/*!Main program to set up interrupt handler + + We make a series of upcalls, after 500 us and then every 1000us, which + prompt some interrupts. By doing this, our upcalls should always be well + clear of any calling function interrupt generation, which is on millisecond + boundaries. + + @return The return code from the program (always zero). */ +/* --------------------------------------------------------------------------*/ +int +main () +{ + printf ("Starting interrupt handler\n"); + excpt_int = (unsigned long)interrupt_handler; + + /* Enable interrupts */ + printf ("Enabling interrupts.\n"); + mtspr (SPR_SR, mfspr(SPR_SR) | SPR_SR_IEE); + mtspr (SPR_PICMR, 0xffffffff); + + /* Loop forever, upcalling at the desired intervals. */ + unsigned long int start = read_timer (); + + while (1) + { + static int do_read_p = 1; + static long int end_time = 500; + + while ((read_timer () - start) < end_time) + { + } + + /* Do our memory mapped upcall, alternating reads and writes. */ + if (do_read_p) + { + (void)getreg (GENERIC_BASE); + do_read_p = 0; + } + else + { + setreg (GENERIC_BASE, 0); + do_read_p = 1; + } + + /* Wait 1000us before next upcall. */ + end_time += 1000; + } + + /* We don't actually ever return */ + return 0; + +} /* main () */
int-logger/int-logger-edge.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: int-logger/int-logger-level.c =================================================================== --- int-logger/int-logger-level.c (nonexistent) +++ int-logger/int-logger-level.c (revision 93) @@ -0,0 +1,116 @@ +/* int-logger-level.c. Test of Or1ksim handling of level triggered interrupts + + 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. + --------------------------------------------------------------------------*/ + +#include "support.h" +#include "spr-defs.h" +#include "board.h" + + +/* --------------------------------------------------------------------------*/ +/*!Write a memory mapped register + + @param[in] addr Memory mapped address + @param[in] value Value to set */ +/* --------------------------------------------------------------------------*/ +static void +setreg (unsigned long addr, + unsigned char value) +{ + *((volatile unsigned char *) addr) = value; + +} /* setreg () */ + + +/* --------------------------------------------------------------------------*/ +/*!Read a memory mapped register + + @param[in] addr Memory mapped address + + @return Value read */ +/* --------------------------------------------------------------------------*/ +unsigned long +getreg (unsigned long addr) +{ + return *((volatile unsigned char *) addr); + +} /* getreg () */ + + +/* --------------------------------------------------------------------------*/ +/*!Generic interrupt handler + + This should receive the interrupt exception. Report the value in + PICSR. Clearing will be done externally. */ +/* --------------------------------------------------------------------------*/ +static void +interrupt_handler () +{ + unsigned long int picsr = mfspr (SPR_PICSR); + + /* Report the interrupt */ + printf ("PICSR = 0x%08lx\n", picsr); + + /* Request the interrupt be cleared with a write upcall. */ + setreg (GENERIC_BASE, 0); + +} /* interrupt_handler () */ + + +/* --------------------------------------------------------------------------*/ +/*!Main program to set up interrupt handler + + @return The return code from the program (always zero). */ +/* --------------------------------------------------------------------------*/ +int +main () +{ + printf ("Starting interrupt handler\n"); + excpt_int = (unsigned long)interrupt_handler; + + /* Enable interrupts */ + printf ("Enabling interrupts.\n"); + mtspr (SPR_SR, mfspr(SPR_SR) | SPR_SR_IEE); + mtspr (SPR_PICMR, 0xffffffff); + + /* Loop forever, upcalling reads every 500us to generate interrupts. */ + unsigned long int start = read_timer (); + + while (1) + { + static long int end_time = 500; + + while ((read_timer () - start) < end_time) + { + } + + /* Do our memory mapped upcall read to generate an interrupt. */ + (void)getreg (GENERIC_BASE); + } + + /* We don't actually ever return */ + return 0; + +} /* main () */
int-logger/int-logger-level.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: ChangeLog =================================================================== --- ChangeLog (revision 90) +++ ChangeLog (revision 93) @@ -1,3 +1,28 @@ +2010-04-28 Jeremy Bennett + * int-logger/int-logger-edge.c: Created. + * int-logger/Makefile.am: Added int-logger-edge. + * int-logger/Makefile.in: Regenerated. + * upcalls/upcall-basic.c: Created. + * upcalls/upcall-misaligned.c: Created. + * upcalls/Makefile.am: Created. + * upcalls/Makefile.in: Regenerated. + +2010-04-25 Jeremy Bennett + * kbdtest/kbdtest.c (print_escaped_char): Added function to print + chars more clearly. + +2010-04-23 Jeremy Bennett + * configure.ac: Added new interrupt test make files. + * configure: Regenerated. + * int-logger/int-logger-level.c: Created. + * int-logger/Makefile.am: Created. + * int-logger/Makefile.in: Regenerated. + +2010-04-22 Jeremy Bennett + * support/support.c (print_base, printf_unsigned_base): Value and + base made unsigned. + (print_decimal): cast value to unsigned for call to print_base. + 2010-04-21 Jeremy Bennett * AUTHORS: Moved from parent directory * configure: Regenerated. Index: int-test/int-test.S =================================================================== --- int-test/int-test.S (revision 90) +++ int-test/int-test.S (revision 93) @@ -1,4 +1,4 @@ -/* int-test.S. Test of Or1ksim interrupt controller +/* int-test.S. Test of Or1ksim interrupt handling Copyright (C) 1999-2006 OpenCores Copyright (C) 2010 Embecosm Limited @@ -25,7 +25,9 @@ This code is commented throughout for use with Doxygen. --------------------------------------------------------------------------*/ -/* Within the test we'll use following global variables: +/* NOTE. This is not a test of the Programmable Interrupt Controller. + + Within the test we'll use following global variables: r16 interrupt counter r17 current tick timer comparison counter @@ -38,10 +40,11 @@ r25-r31 used by int handler The test do the following: - We set up the tick timer to trigger once and then we trigger interrupts incrementally - on every cycle in the specified test program; on interrupt handler we check if data computed - so far exactly matches precalculated values. If interrupt has returned incorreclty, we can - detect this using assertion routine at the end. + We set up the tick timer to trigger once and then we trigger interrupts + incrementally on every cycle in the specified test program; on interrupt + handler we check if data computed so far exactly matches precalculated + values. If interrupt has returned incorreclty, we can detect this using + assertion routine at the end. */ #include "spr-defs.h"
/Makefile.am
56,6 → 56,7
functest \
flag \
inst-set-test \
int-logger \
int-test \
kbdtest \
local-global \
69,4 → 70,5
mul \
mycompress \
tick \
uos
uos \
upcalls
/support/board.h
43,6 → 43,7
#define KBD_BASE_ADD 0x94000000
#define KBD_IRQ 5
#define MC_BASE_ADDR 0x93000000
#define GENERIC_BASE 0x98000000
#define DMA_BASE 0xb8000000
 
#endif
/support/support.c
128,9 → 128,9
@return the length of the string created. */
/* --------------------------------------------------------------------------*/
static int
print_base (long int uval,
char buf[],
int base)
print_base (long unsigned int uval,
char buf[],
unsigned int base)
{
/* Initially print backwards. Always have at least a zero. */
int i = 0;
271,7 → 271,7
digits. Allow for end of string marker */
char num_array[11];
 
int num_width = print_base (val, num_array, 10);
int num_width = print_base ((unsigned long int) val, num_array, 10);
 
/* Now print out the number. */
num_width += is_signed_p ? 1 : 0;
326,10 → 326,10
@return The number of chars printed */
/* --------------------------------------------------------------------------*/
static int
printf_unsigned_base (long int val,
int width,
int leading_zeros_p,
int base)
printf_unsigned_base (unsigned long int val,
int width,
int leading_zeros_p,
unsigned int base)
{
int is_signed_p = 0;
 

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.