diff options
| -rw-r--r-- | Makefile.in | 30 | ||||
| -rwxr-xr-x | bootstrap | 5 | ||||
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 7 | ||||
| -rw-r--r-- | tools/kconf/.gitignore | 3 | ||||
| -rw-r--r-- | tools/kconf/Makefile | 9 | ||||
| -rwxr-xr-x | tools/kconf/build | 5 | ||||
| -rw-r--r-- | tools/kconf/grammer.y | 86 | ||||
| -rwxr-xr-x | tools/kconf/kconf | bin | 0 -> 31608 bytes | |||
| -rw-r--r-- | tools/kconf/scan.l | 60 |
10 files changed, 179 insertions, 49 deletions
diff --git a/Makefile.in b/Makefile.in index 331554d..37f1e98 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,40 +1,18 @@ .SILENT: - -############################### -# Feature stuff -############################### -override SPECTRE_MITIGATION = @SPECTRE_MITIGATION@ -override SERIAL_DEBUG = @SERIAL_DEBUG@ - -ifeq ($(SPECTRE_MITIGATION), 1) - override SPECTRE_FLAGS=-D__SPECTRE_MITIGATION -else - override SPECTRE_FLAGS= -endif - -ifeq ($(SERIAL_DEBUG), 1) - override SERIAL_DEBUG_FLAGS=-D__SERIAL_DEBUG -else - override SERIAL_DEBUG_FLAGS= -endif - - ############################### # CFLAGS, QEMU flags + misc ############################### override ARCH = @ARCH@ override HYRA_VERSION = @PACKAGE_VERSION@ override PROMPT := printf "%s\t\t%s\n" -override KERNEL_DEFINES = -DHYRA_VERSION="\"$(HYRA_VERSION)\""\ - -DHYRA_BUILDDATE="\"@HYRA_BUILDDATE@\""\ - -DHYRA_BUILDBRANCH="\"@HYRA_BUILDBRANCH@\""\ - -DHYRA_ARCH="\"@ARCH@\""\ - $(SPECTRE_FLAGS)\ - $(SERIAL_DEBUG_FLAGS) override KERNEL_CFLAGS = @KERNEL_CFLAGS@ $(KERNEL_DEFINES) override KERNEL_LDFLAGS = -nostdlib -znoexecstack -zmax-page-size=0x1000 -static -Tconf/link-$(ARCH).ld override QEMU_FLAGS = @QEMU_FLAGS@ +override KERNEL_DEFINES = $ -DHYRA_VERSION="\"$(HYRA_VERSION)\""\ + -DHYRA_BUILDDATE="\"@HYRA_BUILDDATE@\""\ + -DHYRA_BUILDBRANCH="\"@HYRA_BUILDBRANCH@\""\ + -DHYRA_ARCH="\"@ARCH@\"" $(shell cat sys/arch/$(ARCH)/conf/GENERIC | tools/kconf/kconf) ###################### # Binutils stuff @@ -22,8 +22,13 @@ build_limine() { make -C stand/limine/ } +build_kconf() { + make -C tools/kconf/ +} + build() { build_limine + build_kconf } echo "----------------------------------" diff --git a/configure.ac b/configure.ac index afe3e34..ec44f8c 100644 --- a/configure.ac +++ b/configure.ac @@ -16,29 +16,6 @@ QEMU_FLAGS_X86_64="--enable-kvm -monitor stdio \\ HYRA_BUILDDATE=`export LANG=en_US.UTF-8 ; date` HYRA_BUILDBRANCH="`basename $PWD`" -# Enable Spectre mitigation option -AC_ARG_ENABLE([spectre-mitigation], - [AS_HELP_STRING([--enable-spectre-mitigation], [Enable Spectre mitigation (IBRS or similar)])],, - [enable_spectre_mitigation=$enableval]) - -# Enable serial debug -AC_ARG_ENABLE([serial-debug], - [AS_HELP_STRING([--enable-serial-debug], [Allow serial debugging])],, - [enable_serial_debug=$enableval]) - - -if test "x$enable_spectre_mitigation" = "xyes"; then - AC_SUBST(SPECTRE_MITIGATION, [1]) -else - AC_SUBST(SPECTRE_MITIGATION, [0]) -fi - -if test "x$enable_serial_debug" = "xyes"; then - AC_SUBST(SERIAL_DEBUG, [1]) -else - AC_SUBST(SERIAL_DEBUG, [0]) -fi - AC_SUBST(HYRA_BUILDDATE, [$HYRA_BUILDDATE]) AC_SUBST(HYRA_BUILDBRANCH, [$HYRA_BUILDBRANCH]) diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC new file mode 100644 index 0000000..0baff12 --- /dev/null +++ b/sys/arch/amd64/conf/GENERIC @@ -0,0 +1,7 @@ +// Kernel options +option SPECTRE_MITIGATION no +option SERIAL_DEBUG yes +option PANIC_BEEP yes + +// Kernel constants +setval PANIC_BEEP_HZ 1050 diff --git a/tools/kconf/.gitignore b/tools/kconf/.gitignore new file mode 100644 index 0000000..ccb5c4c --- /dev/null +++ b/tools/kconf/.gitignore @@ -0,0 +1,3 @@ +*.tab.c +*.tab.h +*.yy.c diff --git a/tools/kconf/Makefile b/tools/kconf/Makefile new file mode 100644 index 0000000..c6df7ee --- /dev/null +++ b/tools/kconf/Makefile @@ -0,0 +1,9 @@ +kconf: + bison -d grammer.y + flex scan.l + gcc lex.yy.c grammer.tab.c -lfl -o kconf + +clean: + rm grammer.tab.* + rm lex.yy.c + rm kconf diff --git a/tools/kconf/build b/tools/kconf/build new file mode 100755 index 0000000..7544eac --- /dev/null +++ b/tools/kconf/build @@ -0,0 +1,5 @@ +#!/bin/bash + +bison -d grammer.y +flex scan.l +gcc lex.yy.c grammer.tab.c -lfl -o kconf diff --git a/tools/kconf/grammer.y b/tools/kconf/grammer.y new file mode 100644 index 0000000..2f131fc --- /dev/null +++ b/tools/kconf/grammer.y @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +%{ +#include <stdio.h> +#include <stdlib.h> + +int yylex(); +int yyerror(char *s); +%} + +%union { + char *str; + int num; +} + +%token OPTION SETVAL +%token <str> IDENTIFIER +%token YES NO +%token NUMBER STRING + +%type <str> str STRING +%type <num> yes_or_no YES NO +%type <num> num NUMBER + +%% + +input: + | line input + ; + +line: OPTION IDENTIFIER yes_or_no { + printf("-D__%s=%d ", $2, $3); + free($2); + } + | SETVAL IDENTIFIER num { + printf("-D__%s=%d " , $2, $3); + free($2); + } + | SETVAL IDENTIFIER str { + printf("-D__%s=%s ", $2, $3); + free($2); + free($3); + } + +yes_or_no: YES { $$ = 1; } + | NO { $$ = 0; } + ; + +num: NUMBER { $$ = $1; } +str: STRING { $$ = $1; } + +%% + +int +main(void) +{ + yyparse(); + printf("\n"); +} diff --git a/tools/kconf/kconf b/tools/kconf/kconf Binary files differnew file mode 100755 index 0000000..1c50c3a --- /dev/null +++ b/tools/kconf/kconf diff --git a/tools/kconf/scan.l b/tools/kconf/scan.l new file mode 100644 index 0000000..e416241 --- /dev/null +++ b/tools/kconf/scan.l @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +%{ + #include <stdio.h> + #include <stdlib.h> + #include "grammer.tab.h" + + int yyerror(char *e); +%} + +%% + +"option" { return OPTION; } +"setval" { return SETVAL; } +"yes" { return YES; } +"no" { return NO; } +\"([^\"])*\" { yylval.str = strdup(yytext); return STRING; } +[a-zA-Z_][a-zA-Z0-9_]+ { yylval.str = strdup(yytext); return IDENTIFIER; } +[0-9]+ { yylval.num = atoi(yytext); return NUMBER; } +[ \t] { /* Ignore */ } +[\/\/.*] { /* Ignore */ } +\n { /* IGnore */ } +"//".* { /* Ignore */ } +. { /* Ignore */ } + +%% + +int +yyerror(char *e) +{ + printf("\n** kconf: %s **", e); + return 0; +} |