Tidy up generate_query_config.pl in preparation for further work

Output is unchanged.

Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
This commit is contained in:
Tom Cosgrove 2022-07-25 11:42:38 +01:00
parent e579ece305
commit ef83b839d0

View File

@ -15,7 +15,7 @@
# function by using the template in scripts/data_files/query_config.fmt. # function by using the template in scripts/data_files/query_config.fmt.
# #
# Usage: scripts/generate_query_config.pl without arguments, or # Usage: scripts/generate_query_config.pl without arguments, or
# generate_query_config.pl config_file template_file output_file # generate_query_config.pl mbedtls_config_file template_file output_file
# #
# Copyright The Mbed TLS Contributors # Copyright The Mbed TLS Contributors
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
@ -34,22 +34,26 @@
use strict; use strict;
my ($config_file, $query_config_format_file, $query_config_file); my ($mbedtls_config_file, $query_config_format_file, $query_config_file);
my $default_mbedtls_config_file = "./include/mbedtls/mbedtls_config.h";
my $default_query_config_format_file = "./scripts/data_files/query_config.fmt";
my $default_query_config_file = "./programs/test/query_config.c";
if( @ARGV ) { if( @ARGV ) {
die "Invalid number of arguments - usage: $0 [CONFIG_FILE TEMPLATE_FILE OUTPUT_FILE]" if scalar @ARGV != 3; die "Invalid number of arguments - usage: $0 [CONFIG_FILE TEMPLATE_FILE OUTPUT_FILE]" if scalar @ARGV != 3;
($config_file, $query_config_format_file, $query_config_file) = @ARGV; ($mbedtls_config_file, $query_config_format_file, $query_config_file) = @ARGV;
-f $config_file or die "No such file: $config_file"; -f $mbedtls_config_file or die "No such file: $mbedtls_config_file";
-f $query_config_format_file or die "No such file: $query_config_format_file"; -f $query_config_format_file or die "No such file: $query_config_format_file";
} else { } else {
$config_file = "./include/mbedtls/mbedtls_config.h"; $mbedtls_config_file = $default_mbedtls_config_file;
$query_config_format_file = "./scripts/data_files/query_config.fmt"; $query_config_format_file = $default_query_config_format_file;
$query_config_file = "./programs/test/query_config.c"; $query_config_file = $default_query_config_file;
unless( -f $config_file && -f $query_config_format_file ) { unless( -f $mbedtls_config_file && -f $query_config_format_file ) {
chdir '..' or die; chdir '..' or die;
-f $config_file && -f $query_config_format_file -f $mbedtls_config_file && -f $query_config_format_file
or die "No arguments supplied, must be run from project root or a first-level subdirectory\n"; or die "No arguments supplied, must be run from project root or a first-level subdirectory\n";
} }
} }
@ -63,13 +67,13 @@ MBEDTLS_SSL_CIPHERSUITES
); );
my $excluded_re = join '|', @excluded; my $excluded_re = join '|', @excluded;
open(CONFIG_FILE, "$config_file") or die "Opening config file '$config_file': $!";
# This variable will contain the string to replace in the CHECK_CONFIG of the # This variable will contain the string to replace in the CHECK_CONFIG of the
# format file # format file
my $config_check = ""; my $config_check = "";
my $list_config = ""; my $list_config = "";
open(CONFIG_FILE, "<", $mbedtls_config_file) or die "Opening config file '$mbedtls_config_file': $!";
while (my $line = <CONFIG_FILE>) { while (my $line = <CONFIG_FILE>) {
if ($line =~ /^(\/\/)?\s*#\s*define\s+(MBEDTLS_\w+).*/) { if ($line =~ /^(\/\/)?\s*#\s*define\s+(MBEDTLS_\w+).*/) {
my $name = $2; my $name = $2;
@ -77,25 +81,31 @@ while (my $line = <CONFIG_FILE>) {
# Skip over the macro if it is in the ecluded list # Skip over the macro if it is in the ecluded list
next if $name =~ /$excluded_re/; next if $name =~ /$excluded_re/;
$config_check .= "#if defined($name)\n"; $config_check .= <<EOT;
$config_check .= " if( strcmp( \"$name\", config ) == 0 )\n"; #if defined($name)
$config_check .= " {\n"; if( strcmp( "$name", config ) == 0 )
$config_check .= " MACRO_EXPANSION_TO_STR( $name );\n"; {
$config_check .= " return( 0 );\n"; MACRO_EXPANSION_TO_STR( $name );
$config_check .= " }\n"; return( 0 );
$config_check .= "#endif /* $name */\n"; }
$config_check .= "\n"; #endif /* $name */
$list_config .= "#if defined($name)\n"; EOT
$list_config .= " OUTPUT_MACRO_NAME_VALUE($name);\n";
$list_config .= "#endif /* $name */\n"; $list_config .= <<EOT;
$list_config .= "\n"; #if defined($name)
OUTPUT_MACRO_NAME_VALUE($name);
#endif /* $name */
EOT
} }
} }
close(CONFIG_FILE);
# Read the full format file into a string # Read the full format file into a string
local $/; local $/;
open(FORMAT_FILE, "$query_config_format_file") or die "Opening query config format file '$query_config_format_file': $!"; open(FORMAT_FILE, "<", $query_config_format_file) or die "Opening query config format file '$query_config_format_file': $!";
my $query_config_format = <FORMAT_FILE>; my $query_config_format = <FORMAT_FILE>;
close(FORMAT_FILE); close(FORMAT_FILE);
@ -104,6 +114,6 @@ $query_config_format =~ s/CHECK_CONFIG/$config_check/g;
$query_config_format =~ s/LIST_CONFIG/$list_config/g; $query_config_format =~ s/LIST_CONFIG/$list_config/g;
# Rewrite the query_config.c file # Rewrite the query_config.c file
open(QUERY_CONFIG_FILE, ">$query_config_file") or die "Opening destination file '$query_config_file': $!"; open(QUERY_CONFIG_FILE, ">", $query_config_file) or die "Opening destination file '$query_config_file': $!";
print QUERY_CONFIG_FILE $query_config_format; print QUERY_CONFIG_FILE $query_config_format;
close(QUERY_CONFIG_FILE); close(QUERY_CONFIG_FILE);