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

Subversion Repositories openmsp430

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 148 to Rev 149
    ↔ Reverse comparison
  •

Rev 148 → Rev 149

/openmsp430/trunk/core/rtl/verilog/omsp_dbg.v
420,8 → 420,8
 
wire mem_cnt_wr = reg_wr[MEM_CNT];
 
wire [15:0] mem_cnt_dec = (mem_cnt==16'h0000) ? 16'h0000 :
(dbg_mem_acc | dbg_reg_acc) ? 16'hffff : 16'h0000;
wire [15:0] mem_cnt_dec = (mem_cnt==16'h0000) ? 16'h0000 :
(mem_burst & (dbg_mem_acc | dbg_reg_acc)) ? 16'hffff : 16'h0000;
always @ (posedge dbg_clk or posedge dbg_rst)
if (dbg_rst) mem_cnt <= 16'h0000;
/openmsp430/trunk/core/sim/rtl_sim/run/run_all
125,20 → 125,6
../bin/msp430sim mpy_basic | tee ./log/mpy_basic.log
 
 
grep SKIPPED ./log/*.log
grep FAILED ./log/*.log
echo ""
echo " ================================"
echo -n "| Number of passed patterns : "
cat ./log/*.log | grep -c PASSED
echo -n "| Number of failed patterns : "
cat ./log/*.log | grep -c FAILED
echo -n "| Number of skipped patterns: "
cat ./log/*.log | grep -c SKIPPED
echo "|--------------------------------"
echo -n "| Number of patterns: "
ls -1 ./log/*.log | wc -l
echo " ================================"
echo " Make sure passed == total"
echo ""
echo ""
# Report regression results
../bin/parse_results
 
/openmsp430/trunk/core/sim/rtl_sim/src/sfr.s43
123,7 → 123,7
mov &CPU_ID_HI, r11
mov #0x5001, r15
 
mov 0x5555, &CPU_ID_LO
mov 0x5554, &CPU_ID_LO
mov 0xAAAA, &CPU_ID_HI
mov &CPU_ID_LO, r10
mov &CPU_ID_HI, r11
130,7 → 130,7
mov #0x5002, r15
mov 0xAAAA, &CPU_ID_LO
mov 0x5555, &CPU_ID_HI
mov 0x5554, &CPU_ID_HI
mov &CPU_ID_LO, r10
mov &CPU_ID_HI, r11
mov #0x5003, r15
/openmsp430/trunk/core/sim/rtl_sim/bin/parse_results
0,0 → 1,134
#!/bin/bash
#------------------------------------------------------------------------------
# Copyright (C) 2001 Authors
#
# This source file may be used and distributed without restriction provided
# that this copyright statement is not removed from the file and that any
# derivative work contains the original copyright notice and the associated
# disclaimer.
#
# This source file is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published
# by the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# This source 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 Lesser General Public
# License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this source; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
#------------------------------------------------------------------------------
#
# File Name: parse_results
#
# Author(s):
# - Olivier Girard, olgirard@gmail.com
#
#------------------------------------------------------------------------------
# $Rev: 138 $
# $LastChangedBy: olivier.girard $
# $LastChangedDate: 2012-04-23 13:10:00 +0200 (Mon, 23 Apr 2012) $
#------------------------------------------------------------------------------
###############################################################################
# #
# PARSE REGRESSION RESULTS IN THE LOG DIRECTORY #
# #
###############################################################################
 
#----------------------------------------------------#
# Get numbers of PASSED/SKIPPED/FAILED/ABORDED tests #
#----------------------------------------------------#
 
passed_nr="0"
skipped_nr="0"
failed_nr="0"
aborded_nr="0"
 
for file in ./log/*.log ; do
passed_ok=`grep -c PASSED $file`
skipped_ok=`grep -c SKIPPED $file`
failed_ok=`grep -c FAILED $file`
if [ $passed_ok == 1 ]; then
passed_nr=`expr $passed_nr + 1`
elif [ $skipped_ok == 1 ]; then
skipped_nr=`expr $skipped_nr + 1`
elif [ $failed_ok == 1 ]; then
failed_nr=`expr $failed_nr + 1`
else
aborded_nr=`expr $aborded_nr + 1`
fi
done
 
#----------------------------------------------------#
# Display detailed report #
#----------------------------------------------------#
echo ""
echo "#----------------------------------------------------#"
echo "# DETAILED REPORT #"
echo "#----------------------------------------------------#"
echo ""
if [ $skipped_nr != 0 ]; then
echo " SKIPPED TESTS:"
for file in ./log/*.log ; do
skipped_ok=`grep -c SKIPPED $file`
if [ $skipped_ok == 1 ]; then
echo " - $file"
fi
done
fi
echo ""
if [ $failed_nr != 0 ]; then
echo -e "\e[01;31m FAILED TESTS:\e[00m"
for file in ./log/*.log ; do
failed_ok=`grep -c FAILED $file`
if [ $failed_ok == 1 ]; then
echo -e "\e[01;31m - $file \e[00m"
fi
done
fi
echo ""
if [ $aborded_nr != 0 ]; then
echo -e "\e[01;31m ABORDED TESTS:\e[00m"
for file in ./log/*.log ; do
passed_ok=`grep -c PASSED $file`
if [ $passed_ok == 0 ]; then
failed_ok=`grep -c FAILED $file`
if [ $failed_ok == 0 ]; then
skipped_ok=`grep -c SKIPPED $file`
if [ $skipped_ok == 0 ]; then
echo -e "\e[01;31m - $file \e[00m"
fi
fi
fi
done
fi
echo ""
 
#----------------------------------------------------#
# Display summary report #
#----------------------------------------------------#
echo ""
echo "#----------------------------------------------------#"
echo "# SUMMARY REPORT #"
echo "#----------------------------------------------------#"
echo ""
 
# Generate final report
echo " +-----------------------------------"
echo -e " | Number of PASSED tests :\e[01;32m $passed_nr \e[00m"
echo -e " | Number of SKIPPED tests :\e[01;32m $skipped_nr \e[00m"
echo -e " | Number of FAILED tests :\e[01;31m $failed_nr \e[00m"
echo -e " | Number of ABORDED tests :\e[01;31m $aborded_nr \e[00m"
echo " |----------------------------------"
echo -n " | Number of tests : "
ls -1 ./log/*.log | wc -l
echo " +----------------------------------"
echo ""
echo " Make sure passed+skipped == total"
echo ""
echo ""
openmsp430/trunk/core/sim/rtl_sim/bin/parse_results Property changes : Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: openmsp430/trunk/fpga/xilinx_diligent_s3board/rtl/verilog/openmsp430/omsp_dbg.v =================================================================== --- openmsp430/trunk/fpga/xilinx_diligent_s3board/rtl/verilog/openmsp430/omsp_dbg.v (revision 148) +++ openmsp430/trunk/fpga/xilinx_diligent_s3board/rtl/verilog/openmsp430/omsp_dbg.v (revision 149) @@ -420,8 +420,8 @@ wire mem_cnt_wr = reg_wr[MEM_CNT]; -wire [15:0] mem_cnt_dec = (mem_cnt==16'h0000) ? 16'h0000 : - (dbg_mem_acc | dbg_reg_acc) ? 16'hffff : 16'h0000; +wire [15:0] mem_cnt_dec = (mem_cnt==16'h0000) ? 16'h0000 : + (mem_burst & (dbg_mem_acc | dbg_reg_acc)) ? 16'hffff : 16'h0000; always @ (posedge dbg_clk or posedge dbg_rst) if (dbg_rst) mem_cnt <= 16'h0000;
/openmsp430/trunk/fpga/altera_de1_board/rtl/verilog/openmsp430/omsp_dbg.v
420,8 → 420,8
 
wire mem_cnt_wr = reg_wr[MEM_CNT];
 
wire [15:0] mem_cnt_dec = (mem_cnt==16'h0000) ? 16'h0000 :
(dbg_mem_acc | dbg_reg_acc) ? 16'hffff : 16'h0000;
wire [15:0] mem_cnt_dec = (mem_cnt==16'h0000) ? 16'h0000 :
(mem_burst & (dbg_mem_acc | dbg_reg_acc)) ? 16'hffff : 16'h0000;
always @ (posedge dbg_clk or posedge dbg_rst)
if (dbg_rst) mem_cnt <= 16'h0000;
/openmsp430/trunk/fpga/actel_m1a3pl_dev_kit/rtl/verilog/openmsp430/omsp_dbg.v
36,9 → 36,9
// - Olivier Girard, olgirard@gmail.com
//
//----------------------------------------------------------------------------
// $Rev: 103 $
// $Rev: 134 $
// $LastChangedBy: olivier.girard $
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $
// $LastChangedDate: 2012-03-22 21:31:06 +0100 (Thu, 22 Mar 2012) $
//----------------------------------------------------------------------------
`ifdef OMSP_NO_INCLUDE
`else
420,8 → 420,8
 
wire mem_cnt_wr = reg_wr[MEM_CNT];
 
wire [15:0] mem_cnt_dec = (mem_cnt==16'h0000) ? 16'h0000 :
(dbg_mem_acc | dbg_reg_acc) ? 16'hffff : 16'h0000;
wire [15:0] mem_cnt_dec = (mem_cnt==16'h0000) ? 16'h0000 :
(mem_burst & (dbg_mem_acc | dbg_reg_acc)) ? 16'hffff : 16'h0000;
always @ (posedge dbg_clk or posedge dbg_rst)
if (dbg_rst) mem_cnt <= 16'h0000;

powered by: WebSVN 2.1.0

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