Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Fix cinlude check (#3907)

Browse Source
This commit is contained in:
Ilya Barkov 2023-01-26 14:35:59 +03:00 committed by GitHub
parent c2a8810eb1
commit d118a739dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/V3FunctionTraits.h
View File

@ -19,7 +19,7 @@
#include "verilatedos.h" #include "verilatedos.h"
#include <stddef.h> #include <cstddef>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>

61
test_regress/t/t_dist_cinclude.pl
View File

@ -9,49 +9,50 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
use IO::File; use IO::File;
use File::Spec::Functions 'catfile';
scenarios(dist => 1); scenarios(dist => 1);
my $root = ".."; my $root = "..";
my $Debug; my $Debug;
if (!-r "$root/.git") { if (!-r catfile($root, ".git")) {
skip("Not in a git repository"); skip("Not in a git repository");
} else { } else {
### Must trim output before and after our file list ### Must trim output before and after our file list
my $files = `cd $root && git ls-files --exclude-standard`; my $files = `cd $root && git ls-files --exclude-standard`;
print "ST $files\n" if $Debug; print "ST $files\n" if $Debug;
$files =~ s/\s+/ /g; foreach my $file (split /\n/, $files) {
my $cmd = "cd $root && fgrep -n include $files | sort"; next if $file =~ m!include/vltstd/vpi_user.h!; # IEEE Standard file - can't change it
my $grep = `$cmd`; next if $file =~ m!include/gtkwave/!; # Standard file - can't change it
foreach my $line (split /\n/, $grep) { my $filename = catfile($root, $file);
next if $line =~ m!include/vltstd/vpi_user.h!; # IEEE Standard file - can't change it @lines = split /\n/, file_contents($filename);
next if $line =~ m!include/gtkwave/!; # Standard file - can't change it @include_lines = grep(/include/, @lines);
my $hit; foreach my $line (@include_lines) {
$hit = 1 if $line =~ /\bassert\.h/; my $hit;
$hit = 1 if $line =~ /\bctype\.h/; $hit = 1 if $line =~ /\bassert\.h/;
$hit = 1 if $line =~ /\berrno\.h/; $hit = 1 if $line =~ /\bctype\.h/;
$hit = 1 if $line =~ /\bfloat\.h/; $hit = 1 if $line =~ /\berrno\.h/;
$hit = 1 if $line =~ /\blimits\.h/; $hit = 1 if $line =~ /\bfloat\.h/;
$hit = 1 if $line =~ /\blocale\.h/; $hit = 1 if $line =~ /\blimits\.h/;
$hit = 1 if $line =~ /\bmath\.h/; $hit = 1 if $line =~ /\blocale\.h/;
$hit = 1 if $line =~ /\bsetjmp\.h/; $hit = 1 if $line =~ /\bmath\.h/;
$hit = 1 if $line =~ /\bsignal\.h/; $hit = 1 if $line =~ /\bsetjmp\.h/;
$hit = 1 if $line =~ /\bstdarg\.h/; $hit = 1 if $line =~ /\bsignal\.h/;
$hit = 1 if $line =~ /\bstdbool\.h/; $hit = 1 if $line =~ /\bstdarg\.h/;
$hit = 1 if $line =~ /\bstddef\.h/; $hit = 1 if $line =~ /\bstdbool\.h/;
#Not yet: $hit = 1 if $line =~ /\bstdint\.h/; $hit = 1 if $line =~ /\bstddef\.h/;
$hit = 1 if $line =~ /\bstdio\.h/; #Not yet: $hit = 1 if $line =~ /\bstdint\.h/;
$hit = 1 if $line =~ /\bstdlib\.h/; $hit = 1 if $line =~ /\bstdio\.h/;
$hit = 1 if $line =~ /\bstring\.h/; $hit = 1 if $line =~ /\bstdlib\.h/;
$hit = 1 if $line =~ /\btime\.h/ && $line !~ m!sys/time.h!; $hit = 1 if $line =~ /\bstring\.h/;
next if !$hit; $hit = 1 if $line =~ /\btime\.h/ && $line !~ m!sys/time.h!;
print "$line\n"; next if !$hit;
$names{$1} = 1 if $line =~ /^([^:]+)/; $names{"$filename: $line"} = 1;
}
} }
if (keys %names) { if (keys %names) {
error("Files like stdint.h instead of cstdint: ", join(' ', sort keys %names)); error("Files like stdint.h instead of cstdint:\n ", join("\n ", sort keys %names));
} }
} }