From 7f71ee15dfca8cd3e6ba4309ed768015ffbe8644 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Wed, 17 Sep 2025 01:44:55 -0400 Subject: kern: Make memmap dump configurable via kconf Use the OSMORA kernel configuration framework to add options for L5Lunos to parse during early startup. Signed-off-by: Ian Moffett --- src/Makefile | 3 +- src/sys/Makefile | 4 +-- src/sys/arch/amd64/Makefile | 2 +- src/sys/conf/GENERIC | 1 + src/sys/os/Makefile | 2 +- src/sys/vm/vm_seg.c | 13 ++++++- src/tools/bootstrap | 5 +++ src/tools/kconf/.gitignore | 4 +++ src/tools/kconf/Makefile | 9 +++++ src/tools/kconf/grammar.y | 86 +++++++++++++++++++++++++++++++++++++++++++++ src/tools/kconf/scan.l | 61 ++++++++++++++++++++++++++++++++ 11 files changed, 184 insertions(+), 6 deletions(-) create mode 100644 src/sys/conf/GENERIC create mode 100644 src/tools/kconf/.gitignore create mode 100644 src/tools/kconf/Makefile create mode 100644 src/tools/kconf/grammar.y create mode 100644 src/tools/kconf/scan.l (limited to 'src') diff --git a/src/Makefile b/src/Makefile index f33defe..c29402b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -11,6 +11,7 @@ BINUTILS_DIR := $(shell pwd)/cc/toolchain/build-binutils CC := $(shell pwd)/cc/gcc/bin/x86_64-pc-ethos-gcc LD := $(BINUTILS_DIR)/bin/x86_64-pc-ethos-ld AS := $(BINUTILS_DIR)/bin/x86_64-pc-ethos-as +CONF := $(shell cat sys/conf/GENERIC | tools/kconf/kconf) # QEMU emulator flags QEMU_FLAGS = --enable-kvm -serial stdio -cdrom $(ISO) \ @@ -21,7 +22,7 @@ all: root sys image .PHONY: sys sys: - cd sys/; make CC=$(CC) AS=$(AS) LD=$(LD) TARGET=$(TARGET) + cd sys/; make CC=$(CC) AS=$(AS) LD=$(LD) TARGET=$(TARGET) CONF=$(CONF) cp $(KBIN) root/boot/ root: diff --git a/src/sys/Makefile b/src/sys/Makefile index 561da50..78c3762 100644 --- a/src/sys/Makefile +++ b/src/sys/Makefile @@ -10,11 +10,11 @@ all: os lib md .PHONY: os os: - cd os; make CC=$(CC) LD=$(LD) AS=$(AS) TARGETDIR=$(TARGETDIR) + cd os; make CC=$(CC) LD=$(LD) AS=$(AS) TARGETDIR=$(TARGETDIR) CONF=$(CONF) .PHONY: md md: - cd $(TARGETDIR); make CC=$(CC) LD=$(LD) AS=$(AS) + cd $(TARGETDIR); make CC=$(CC) LD=$(LD) AS=$(AS) CONF=$(CONF) .PHONY: clean clean: diff --git a/src/sys/arch/amd64/Makefile b/src/sys/arch/amd64/Makefile index f4f4f48..1eae962 100644 --- a/src/sys/arch/amd64/Makefile +++ b/src/sys/arch/amd64/Makefile @@ -4,7 +4,7 @@ override PROMPT := printf "%s\t\t%s\n" TARGET_BIN = ../../l5 TARGET_INC = -I../../target/header/ -CFLAGS = -I../../include/ -I../../include/lib/ $(TARGET_INC) $(MI_CFLAGS) $(MD_CFLAGS) +CFLAGS = -I../../include/ -I../../include/lib/ $(TARGET_INC) $(MI_CFLAGS) $(MD_CFLAGS) $(CONF) CFILES = $(shell find . -name "*.c") ASMFILES = $(shell find . -name "*.S") diff --git a/src/sys/conf/GENERIC b/src/sys/conf/GENERIC new file mode 100644 index 0000000..816ece3 --- /dev/null +++ b/src/sys/conf/GENERIC @@ -0,0 +1 @@ +option DUMP_MEMMAP yes // Dump memory map on boot diff --git a/src/sys/os/Makefile b/src/sys/os/Makefile index 158eab4..693c008 100644 --- a/src/sys/os/Makefile +++ b/src/sys/os/Makefile @@ -4,7 +4,7 @@ include ../conf/sys.mk override PROMPT := printf "%s\t\t%s\n" TARGET_LIB = ../target/libkern.a -CFLAGS = -I../include/ -I../include/lib/ -I../target/header/ $(MI_CFLAGS) -O0 +CFLAGS = -I../include/ -I../include/lib/ -I../target/header/ $(MI_CFLAGS) -O0 $(CONF) CFILES = $(shell find . -name "*.c") CFILES += $(shell find ../vm -name "*.c") CFILES += $(shell find ../lib -name "*.c") diff --git a/src/sys/vm/vm_seg.c b/src/sys/vm/vm_seg.c index d4db468..682a61c 100644 --- a/src/sys/vm/vm_seg.c +++ b/src/sys/vm/vm_seg.c @@ -37,6 +37,13 @@ #include #include +/* From kconf */ +#if defined(__DUMP_MEMMAP) +#define DUMP_MEMMAP __DUMP_MEMMAP +#else +#define DUMP_MEMMAP 0 +#endif + #define BYTES_PER_MIB 8388608 static size_t pages_free = 0; @@ -147,7 +154,11 @@ physmem_init_bitmap(void) start = ent->base; end = ent->base + ent->length; - printf("sysmem: [%p -> %p]: %s\n", start, end, typestr); + + /* Should we dump the memory map? */ + if (DUMP_MEMMAP) { + printf("sysmem: [%p -> %p]: %s\n", start, end, typestr); + } if (ent->type != LIMINE_MEMMAP_USABLE) { continue; diff --git a/src/tools/bootstrap b/src/tools/bootstrap index 78c38ab..8e0708e 100755 --- a/src/tools/bootstrap +++ b/src/tools/bootstrap @@ -37,7 +37,12 @@ build_omar() { $MAKE -C tools/omar } +build_kconf() { + $MAKE -C tools/kconf/ +} + build() { + build_kconf build_limine build_omar } diff --git a/src/tools/kconf/.gitignore b/src/tools/kconf/.gitignore new file mode 100644 index 0000000..4b51a2a --- /dev/null +++ b/src/tools/kconf/.gitignore @@ -0,0 +1,4 @@ +*.tab.c +*.tab.h +*.yy.c +kconf diff --git a/src/tools/kconf/Makefile b/src/tools/kconf/Makefile new file mode 100644 index 0000000..533a6ac --- /dev/null +++ b/src/tools/kconf/Makefile @@ -0,0 +1,9 @@ +kconf: + bison -d grammar.y + flex scan.l + gcc lex.yy.c grammar.tab.c -lfl -o kconf + +clean: + rm grammar.tab.* + rm lex.yy.c + rm kconf diff --git a/src/tools/kconf/grammar.y b/src/tools/kconf/grammar.y new file mode 100644 index 0000000..3b445a4 --- /dev/null +++ b/src/tools/kconf/grammar.y @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2023-2025 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 +#include + +int yylex(); +int yyerror(char *s); +%} + +%union { + char *str; + int num; +} + +%token OPTION SETVAL +%token IDENTIFIER +%token YES NO +%token NUMBER STRING + +%type str STRING +%type yes_or_no YES NO +%type 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/src/tools/kconf/scan.l b/src/tools/kconf/scan.l new file mode 100644 index 0000000..38cb028 --- /dev/null +++ b/src/tools/kconf/scan.l @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2023-2025 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 + #include + #include "grammar.tab.h" + + int yyerror(char *e); +%} + +%% + +"option" { return OPTION; } +"setval" { return SETVAL; } +"yes" { return YES; } +"no" { return NO; } +\"([^\"])*\" { yylval.str = strdup(yytext); return STRING; } +0[xX][0-9a-fA-F]+ { 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; +} -- cgit v1.2.3