Add "make coverage"

Signed-off-by: Clifford Wolf <clifford@clifford.at>

diff --git a/.gitignore b/.gitignore
index cd624f23332fdb1257c21eaaf80af2ff0b9f0d0f..4fce690eca9b81a9ce937c2bad0f621a69de85e3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 *.d
 .*.swp
 *.gch
+*.gcda
+*.gcno
 /.cproject
 /.project
 /.settings
@@ -10,6 +12,8 @@
 /qtcreator.config
 /qtcreator.creator
 /qtcreator.creator.user
+/coverage.info
+/coverage_html
 /Makefile.conf
 /abc
 /viz.js

diff --git a/Makefile b/Makefile
index 7eb3971f726b7c9b143772aafaddd52d7a39e37c..39a361a5f95ae52466d1917d47282c5a1746eac1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -650,6 +650,12 @@ clean-abc:
 mrproper: clean
        git clean -xdf
 
+coverage:
+       ./yosys -qp 'help; help -all'
+       rm -rf coverage.info coverage_html
+       lcov --capture -d . --no-external -o coverage.info
+       genhtml coverage.info --output-directory coverage_html
+
 qtcreator:
        { for file in $(basename $(OBJS)); do \
                for prefix in cc y l; do if [ -f $${file}.$${prefix} ]; then echo $$file.$${prefix}; fi; done \
@@ -740,6 +746,6 @@ echo-git-rev:
 -include kernel/*.d
 -include techlibs/*/*.d
 
-.PHONY: all top-all abc test install install-abc manual clean mrproper qtcreator
+.PHONY: all top-all abc test install install-abc manual clean mrproper qtcreator coverage vcxsrc mxebin
 .PHONY: config-clean config-clang config-gcc config-gcc-static config-gcc-4.8 config-gprof config-sudo
 

diff --git a/frontends/ilang/.gitignore b/frontends/ilang/.gitignore
index 43106a8148d17b686dc1de465d2cc9c028b5bec9..f586b33c76ac016b372e0812e800a1aabc5a683b 100644 (file)
--- a/frontends/ilang/.gitignore
+++ b/frontends/ilang/.gitignore
@@ -1,4 +1,4 @@
 ilang_lexer.cc
 ilang_parser.output
 ilang_parser.tab.cc
-ilang_parser.tab.h
+ilang_parser.tab.hh

diff --git a/frontends/ilang/Makefile.inc b/frontends/ilang/Makefile.inc
index e2a476c9340e81741001fca1ee759ab4727ac604..6f1f0e8fca9953818177aa0fc5f925d5a1bedea9 100644 (file)
--- a/frontends/ilang/Makefile.inc
+++ b/frontends/ilang/Makefile.inc
@@ -1,15 +1,14 @@
 
 GENFILES += frontends/ilang/ilang_parser.tab.cc
-GENFILES += frontends/ilang/ilang_parser.tab.h
+GENFILES += frontends/ilang/ilang_parser.tab.hh
 GENFILES += frontends/ilang/ilang_parser.output
 GENFILES += frontends/ilang/ilang_lexer.cc
 
 frontends/ilang/ilang_parser.tab.cc: frontends/ilang/ilang_parser.y
        $(Q) mkdir -p $(dir $@)
-       $(P) $(BISON) -d -r all -b frontends/ilang/ilang_parser $<
-       $(Q) mv frontends/ilang/ilang_parser.tab.c frontends/ilang/ilang_parser.tab.cc
+       $(P) $(BISON) -o $@ -d -r all -b frontends/ilang/ilang_parser $<
 
-frontends/ilang/ilang_parser.tab.h: frontends/ilang/ilang_parser.tab.cc
+frontends/ilang/ilang_parser.tab.hh: frontends/ilang/ilang_parser.tab.cc
 
 frontends/ilang/ilang_lexer.cc: frontends/ilang/ilang_lexer.l
        $(Q) mkdir -p $(dir $@)

diff --git a/frontends/ilang/ilang_lexer.l b/frontends/ilang/ilang_lexer.l
index 8423885480effb5420b1fc4805f507750d729d27..d8e01ae4de473be656ca81d23d49b3d7f54c65bb 100644 (file)
--- a/frontends/ilang/ilang_lexer.l
+++ b/frontends/ilang/ilang_lexer.l
@@ -30,7 +30,7 @@
 #endif
 
 #include "frontends/ilang/ilang_frontend.h"
-#include "ilang_parser.tab.h"
+#include "ilang_parser.tab.hh"
 
 USING_YOSYS_NAMESPACE
 

diff --git a/frontends/verilog/.gitignore b/frontends/verilog/.gitignore
index 1d4ae9e5c6e1fcde3773fd7240beae620bc4f1ab..aadbcdcdd51512e5917e74772f92ba667c81ac0f 100644 (file)
--- a/frontends/verilog/.gitignore
+++ b/frontends/verilog/.gitignore
@@ -1,4 +1,4 @@
 verilog_lexer.cc
 verilog_parser.output
 verilog_parser.tab.cc
-verilog_parser.tab.h
+verilog_parser.tab.hh

diff --git a/frontends/verilog/Makefile.inc b/frontends/verilog/Makefile.inc
index a06c1d5ab3ca4131c84958c7bd9d99eefb41b84c..dbaace5854c9762a5d673274e5a1db2c7b52fa71 100644 (file)
--- a/frontends/verilog/Makefile.inc
+++ b/frontends/verilog/Makefile.inc
@@ -1,15 +1,14 @@
 
 GENFILES += frontends/verilog/verilog_parser.tab.cc
-GENFILES += frontends/verilog/verilog_parser.tab.h
+GENFILES += frontends/verilog/verilog_parser.tab.hh
 GENFILES += frontends/verilog/verilog_parser.output
 GENFILES += frontends/verilog/verilog_lexer.cc
 
 frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y
        $(Q) mkdir -p $(dir $@)
-       $(P) $(BISON) -d -r all -b frontends/verilog/verilog_parser $<
-       $(Q) mv frontends/verilog/verilog_parser.tab.c frontends/verilog/verilog_parser.tab.cc
+       $(P) $(BISON) -o $@ -d -r all -b frontends/verilog/verilog_parser $<
 
-frontends/verilog/verilog_parser.tab.h: frontends/verilog/verilog_parser.tab.cc
+frontends/verilog/verilog_parser.tab.hh: frontends/verilog/verilog_parser.tab.cc
 
 frontends/verilog/verilog_lexer.cc: frontends/verilog/verilog_lexer.l
        $(Q) mkdir -p $(dir $@)

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 0134416c11e0f2d4d85ff75034b131b0686d68e1..83921bf0be893641d42afc3e3a2bc3fee5d4c1cd 100644 (file)
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -42,7 +42,7 @@
 #include "kernel/log.h"
 #include "frontends/verilog/verilog_frontend.h"
 #include "frontends/ast/ast.h"
-#include "verilog_parser.tab.h"
+#include "verilog_parser.tab.hh"
 
 USING_YOSYS_NAMESPACE
 using namespace AST;