yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add crypto includes when generating errors in generate_errors.pl

Browse source 
Adjusted generate_errors to have a configuration option of including crypto files.
Turned on by default
This commit is contained in:
Andrzej Kurek 2019-03-12 10:48:18 -04:00
parent a96f4fe94e
commit b0fc484188
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
scripts/generate_errors.pl
View file

@ -3,23 +3,28 @@
# Generate error.c # Generate error.c
# #
# Usage: ./generate_errors.pl or scripts/generate_errors.pl without arguments, # Usage: ./generate_errors.pl or scripts/generate_errors.pl without arguments,
# or generate_errors.pl include_dir data_dir error_file # or generate_errors.pl include_dir data_dir error_file include_crypto
use strict; use strict;
my ($include_dir, $data_dir, $error_file); my ($include_dir, $data_dir, $error_file, $include_crypto);
my $crypto_dir = "crypto";
if( @ARGV ) { if( @ARGV ) {
die "Invalid number of arguments" if scalar @ARGV != 3; die "Invalid number of arguments" if scalar @ARGV != 4;
($include_dir, $data_dir, $error_file) = @ARGV; ($include_dir, $data_dir, $error_file, $include_crypto) = @ARGV;
-d $include_dir or die "No such directory: $include_dir\n"; -d $include_dir or die "No such directory: $include_dir\n";
-d $data_dir or die "No such directory: $data_dir\n"; -d $data_dir or die "No such directory: $data_dir\n";
if( $include_crypto ) {
-d $crypto_dir or die "Crypto submodule not present\n";
}
} else { } else {
$include_dir = 'include/mbedtls'; $include_dir = 'include/mbedtls';
$data_dir = 'scripts/data_files'; $data_dir = 'scripts/data_files';
$error_file = 'library/error.c'; $error_file = 'library/error.c';
$include_crypto = 1;
-d $crypto_dir or die "Crypto submodule not present\n";
unless( -d $include_dir && -d $data_dir ) { unless( -d $include_dir && -d $data_dir ) {
chdir '..' or die; chdir '..' or die;
-d $include_dir && -d $data_dir -d $include_dir && -d $data_dir
@ -48,6 +53,11 @@ close(FORMAT_FILE);
$/ = $line_separator; $/ = $line_separator;
my @files = <$include_dir/*.h>; my @files = <$include_dir/*.h>;
if( $include_crypto ) {
@files = (<$include_dir/*.h>,<$crypto_dir/$include_dir/*.h>);
}
my @matches; my @matches;
foreach my $file (@files) { foreach my $file (@files) {
open(FILE, "$file"); open(FILE, "$file");
@ -73,8 +83,15 @@ foreach my $line (@matches)
my ($error_name, $error_code) = $line =~ /(MBEDTLS_ERR_\w+)\s+\-(0x\w+)/; my ($error_name, $error_code) = $line =~ /(MBEDTLS_ERR_\w+)\s+\-(0x\w+)/;
my ($description) = $line =~ /\/\*\*< (.*?)\.? \*\//; my ($description) = $line =~ /\/\*\*< (.*?)\.? \*\//;
die "Duplicated error code: $error_code ($error_name)\n" if( $error_codes_seen{$error_code}++ ) {
if( $error_codes_seen{$error_code}++ ); if( $include_crypto ) {
print "Duplicated error code: $error_code ($error_name)\n";
next;
}
else {
die "Duplicated error code: $error_code ($error_name)\n" ;
}
}
$description =~ s/\\/\\\\/g; $description =~ s/\\/\\\\/g;
if ($description eq "") { if ($description eq "") {