URL
https://opencores.org/ocsvn/openrisc/openrisc/trunk
Subversion Repositories openrisc
Compare Revisions
- This comparison shows the changes necessary to convert path
/
- from Rev 98 to Rev 99
- ↔ Reverse comparison
Rev 98 → Rev 99
/openrisc/trunk/or1ksim/configure.ac
28,7 → 28,7
|
# Use a full version number (x.y.z, possibly with "rcn" as a suffix) when |
# preparing a release, otherwise use a the date version (yyyy-mm-dd). |
AC_INIT([or1ksim], [2010-05-19], [openrisc@opencores.org]) |
AC_INIT([or1ksim], [2010-05-20], [openrisc@opencores.org]) |
AC_CONFIG_MACRO_DIR([m4]) |
|
# Generically use extensions such as _GNU_SOURCE if available. |
/openrisc/trunk/or1ksim/doc/or1ksim.info
64,7 → 64,7
Unpack the software and create a _separate_ directory in which to build |
it: |
|
tar jxf or1ksim-2010-05-19.tar.bz2 |
tar jxf or1ksim-2010-05-20.tar.bz2 |
mkdir builddir_or1ksim |
cd builddir_or1ksim |
|
81,7 → 81,7
OpenRISC 1000 32-bit architecture. If this argument is omitted, it will |
default to OpenRISC 1000 32-bit with a warning |
|
../or1ksim-2010-05-19/configure --target=or32-uclinux ... |
../or1ksim-2010-05-20/configure --target=or32-uclinux ... |
|
There are several other options available, many of which are standard |
to GNU `configure' scripts. Use `configure --help' to see all the |
243,7 → 243,7
============================= |
|
The following problems and issues are known about with Or1ksim |
2010-05-19. The OpenRISC tracker may be used to see the current state |
2010-05-20. The OpenRISC tracker may be used to see the current state |
of these issues and to raise new problems and feature requests. It may |
be found at `http://www.opencores.org/ptracker.cgi/view/or1k/398'. |
|
/openrisc/trunk/or1ksim/doc/version.texi
1,4 → 1,4
@set UPDATED 19 May 2010 |
@set UPDATED-MONTH May 2010 |
@set EDITION 2010-05-19 |
@set VERSION 2010-05-19 |
@set EDITION 2010-05-20 |
@set VERSION 2010-05-20 |
/openrisc/trunk/or1ksim/ChangeLog
1,3 → 1,7
2010-05-20 Jeremy Bennett <jeremy.bennett@embecosm.com> |
configure.ac: Date of version updated. |
configure: Regenerated. |
|
2010-05-19 Jeremy Bennett <jeremy.bennett@embecosm.com> |
* debug/jtag.c (wishbone_write): Corrected writing when invalid |
address. |
/openrisc/trunk/or1ksim/testsuite/libsim.tests/jtag-write-command.exp
100,7 → 100,7
" time taken:" \ |
"Execution step completed OK." \ |
"Processing WRITE_COMMAND." \ |
" shifting in: 0x00000000018f4396f780000000100088" \ |
" shifting in: 0x0000000001933eb7e580010028000088" \ |
" shifted out: 0x164841bc600000000000000000000000" \ |
" status: 0x0" \ |
" time taken:" \ |
107,7 → 107,7
"Execution step completed OK." \ |
"Test completed successfully."] \ |
"lib-jtag/lib-jtag-full" "" "loop/loop" "RESET" "INSTRUCTION" "8" \ |
"SELECT_MODULE" "1" "WRITE_COMMAND" "2" "100000" "4" |
"SELECT_MODULE" "1" "WRITE_COMMAND" "2" "2801" "4" |
|
# WRITE_COMMAND for CPU1 |
run_libsim "JTAG WRITE_COMMAND module CPU1" \ |
1243,7 → 1243,7
|
# WRITE_COMMAND to write bytes for CPU0 (access type 0). This should fail |
# with an error message. |
run_libsim "JTAG WRITE_COMMAND CPU0 write bytes" \ |
run_libsim "JTAG WRITE_COMMAND CPU0 write bytes" \ |
[list "Initalization succeeded." \ |
"Execution step completed OK." \ |
"Resetting JTAG." \ |
1261,6 → 1261,7
"Execution step completed OK." \ |
"Processing WRITE_COMMAND." \ |
" shifting in: 0x00000000011b285d1780010028000008" \ |
"ERROR: JTAG 8-bit access for SPR not supported." \ |
" shifted out: 0x164841bc600000000000000000000000" \ |
" status: 0x0" \ |
" time taken:" \ |
1289,6 → 1290,7
"Execution step completed OK." \ |
"Processing WRITE_COMMAND." \ |
" shifting in: 0x00000000000b0588f380010028000108" \ |
"ERROR: JTAG 16-bit access for SPR not supported." \ |
" shifted out: 0x164841bc600000000000000000000000" \ |
" status: 0x0" \ |
" time taken:" \ |
1326,7 → 1328,7
|
# WRITE_COMMAND to write access type 3. This should fail with an error |
# message. |
run_libsim "JTAG WRITE_COMMAND CPU0 write access type 3" \ |
run_libsim "JTAG WRITE_COMMAND CPU0 access type 3" \ |
[list "Initalization succeeded." \ |
"Execution step completed OK." \ |
"Resetting JTAG." \ |
1344,6 → 1346,7
"Execution step completed OK." \ |
"Processing WRITE_COMMAND." \ |
" shifting in: 0x00000000008313620180010028000188" \ |
"ERROR: unknown JTAG SPR access type 3." \ |
" shifted out: 0x164841bc600000000000000000000000" \ |
" status: 0x0" \ |
" time taken:" \ |
1354,7 → 1357,7
|
# WRITE_COMMAND to read bytes for CPU0 (access type 4). This should fail |
# with an error message. |
run_libsim "JTAG WRITE_COMMAND CPU0 read bytes" \ |
run_libsim "JTAG WRITE_COMMAND CPU0 read bytes" \ |
[list "Initalization succeeded." \ |
"Execution step completed OK." \ |
"Resetting JTAG." \ |
1372,6 → 1375,7
"Execution step completed OK." \ |
"Processing WRITE_COMMAND." \ |
" shifting in: 0x000000000084522e2f80010028000048" \ |
"ERROR: JTAG 8-bit access for SPR not supported." \ |
" shifted out: 0x164841bc600000000000000000000000" \ |
" status: 0x0" \ |
" time taken:" \ |
1382,7 → 1386,7
|
# WRITE_COMMAND to read half words for CPU0 (access type 5). This should fail |
# with an error message. |
run_libsim "JTAG WRITE_COMMAND CPU0 read half words" \ |
run_libsim "JTAG WRITE_COMMAND CPU0 read half words" \ |
[list "Initalization succeeded." \ |
"Execution step completed OK." \ |
"Resetting JTAG." \ |
1400,6 → 1404,7
"Execution step completed OK." \ |
"Processing WRITE_COMMAND." \ |
" shifting in: 0x0000000001947ffbcb80010028000148" \ |
"ERROR: JTAG 16-bit access for SPR not supported." \ |
" shifted out: 0x164841bc600000000000000000000000" \ |
" status: 0x0" \ |
" time taken:" \ |
1436,7 → 1441,7
"8" "SELECT_MODULE" "1" "WRITE_COMMAND" "6" "2801" "4" |
|
# WRITE_COMMAND to read access type 7. This should fail with an error message. |
run_libsim "JTAG WRITE_COMMAND CPU0 read access type 7" \ |
run_libsim "JTAG WRITE_COMMAND CPU0 access type 7" \ |
[list "Initalization succeeded." \ |
"Execution step completed OK." \ |
"Resetting JTAG." \ |
1454,6 → 1459,7
"Execution step completed OK." \ |
"Processing WRITE_COMMAND." \ |
" shifting in: 0x00000000011c691139800100280001c8" \ |
"ERROR: unknown JTAG SPR access type 7." \ |
" shifted out: 0x164841bc600000000000000000000000" \ |
" status: 0x0" \ |
" time taken:" \ |
/openrisc/trunk/or1ksim/testsuite/lib/libsim.exp
68,23 → 68,46
send_user "matching |$matchstr|\n"; |
} |
|
# The matching is slightly tricky. In general we want to find warnings |
# or errors. However expect will look at the entire buffer, so if we |
# have the match string *after* an error or warning message, then the |
# match will still work OK. |
|
# The trick is to do some post-processing of the matched buffer to see |
# if there was a preceding Warning or ERROR message. |
|
expect { |
|
$matchstr { |
# String to match. Silently accept. Do first, so we can match |
# specific warnings or errors if desired |
} |
set matchlen [string length $matchstr] |
set buflen [string length $expect_out(buffer)] |
set lastch [expr {$buflen - $matchlen}] |
set prefix [string range $expect_out(buffer) 0 $lastch] |
|
-re "Warning" { |
fail "$testname: warning: $expect_out(buffer)"; |
return |
if { [string match *ERROR* $prefix] } { |
# We skipped an error |
fail "$testname: ERROR seeking match line $match_line"; |
return |
} elseif { [string match *Warning* $prefix] } { |
# We skipped a warning |
fail "$testname: Warning seeking match line $match_line"; |
return; |
} |
|
# Otherwise silently match |
} |
|
-re "ERROR" { |
fail "$testname: error: $expect_out(buffer)"; |
|
ERROR { |
# An error other than the one we seek |
fail "$testname: ERROR seeking match line $match_line"; |
return |
} |
|
|
Warning { |
# Any warning |
fail "$testname: Warning seeking match line $match_line"; |
return; |
} |
|
eof { |
fail "$testname: hit EOF seeking match line $match_line"; |
return |
/openrisc/trunk/or1ksim/testsuite/ChangeLog
1,3 → 1,15
2010-05-20 Jeremy Bennett <jeremy.bennett@embecosm.com> |
* lib/libsim.exp (run_libsim): Expect clause corrected to detect |
all unexpected warning/errors. |
* libsim.tests/jtag-go-command-read.exp |
<JTAG WRITE_COMMAND module CPU1>: Missing error added. |
<JTAG WRITE_COMMAND CPU0 write half words>: Missing error added. |
<JTAG WRITE_COMMAND CPU0 write words>: Missing error added. |
<JTAG WRITE_COMMAND CPU0 access type 3>: Missing error added. |
<JTAG WRITE_COMMAND CPU0 read half words>: Missing error added. |
<JTAG WRITE_COMMAND CPU0 read words>: Missing error added. |
<JTAG WRITE_COMMAND CPU0 access type 7>: Missing error added. |
|
2010-05-19 Jeremy Bennett <jeremy.bennett@embecosm.com> |
* libsim.tests/Makefile.am: upcalls.exp added to distribution. |
* libsim.tests/Makefile.in: Regenerated. |
/openrisc/trunk/or1ksim/configure
1,7 → 1,7
#! /bin/sh |
# From configure.ac Id: configure.ac 990 2010-05-19 14:49:50Z jeremy using automake version AC_ACVERSION. |
# Guess values for system-dependent variables and create Makefiles. |
# Generated by GNU Autoconf 2.65 for or1ksim 2010-05-19. |
# Generated by GNU Autoconf 2.65 for or1ksim 2010-05-20. |
# |
# Report bugs to <openrisc@opencores.org>. |
# |
722,8 → 722,8
# Identity of this package. |
PACKAGE_NAME='or1ksim' |
PACKAGE_TARNAME='or1ksim' |
PACKAGE_VERSION='2010-05-19' |
PACKAGE_STRING='or1ksim 2010-05-19' |
PACKAGE_VERSION='2010-05-20' |
PACKAGE_STRING='or1ksim 2010-05-20' |
PACKAGE_BUGREPORT='openrisc@opencores.org' |
PACKAGE_URL='' |
|
1477,7 → 1477,7
# Omit some internal or obsolete options to make the list less imposing. |
# This message is too long to be a string in the A/UX 3.1 sh. |
cat <<_ACEOF |
\`configure' configures or1ksim 2010-05-19 to adapt to many kinds of systems. |
\`configure' configures or1ksim 2010-05-20 to adapt to many kinds of systems. |
|
Usage: $0 [OPTION]... [VAR=VALUE]... |
|
1548,7 → 1548,7
|
if test -n "$ac_init_help"; then |
case $ac_init_help in |
short | recursive ) echo "Configuration of or1ksim 2010-05-19:";; |
short | recursive ) echo "Configuration of or1ksim 2010-05-20:";; |
esac |
cat <<\_ACEOF |
|
1656,7 → 1656,7
test -n "$ac_init_help" && exit $ac_status |
if $ac_init_version; then |
cat <<\_ACEOF |
or1ksim configure 2010-05-19 |
or1ksim configure 2010-05-20 |
generated by GNU Autoconf 2.65 |
|
Copyright (C) 2009 Free Software Foundation, Inc. |
2318,7 → 2318,7
This file contains any messages produced by compilers while |
running configure, to aid debugging if configure makes a mistake. |
|
It was created by or1ksim $as_me 2010-05-19, which was |
It was created by or1ksim $as_me 2010-05-20, which was |
generated by GNU Autoconf 2.65. Invocation command line was |
|
$ $0 $@ |
10719,7 → 10719,7
|
# Define the identity of the package. |
PACKAGE='or1ksim' |
VERSION='2010-05-19' |
VERSION='2010-05-20' |
|
|
cat >>confdefs.h <<_ACEOF |
13724,7 → 13724,7
# report actual input values of CONFIG_FILES etc. instead of their |
# values after options handling. |
ac_log=" |
This file was extended by or1ksim $as_me 2010-05-19, which was |
This file was extended by or1ksim $as_me 2010-05-20, which was |
generated by GNU Autoconf 2.65. Invocation command line was |
|
CONFIG_FILES = $CONFIG_FILES |
13790,7 → 13790,7
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
ac_cs_version="\\ |
or1ksim config.status 2010-05-19 |
or1ksim config.status 2010-05-20 |
configured by $0, generated by GNU Autoconf 2.65, |
with options \\"\$ac_cs_config\\" |
|