diff options
author | Ian Moffett <ian@osmora.org> | 2025-09-30 20:45:13 -0400 |
---|---|---|
committer | Ian Moffett <ian@osmora.org> | 2025-09-30 20:54:02 -0400 |
commit | 9ae4315557c894b211e1d47e77a846066ebff5bb (patch) | |
tree | b2fea372da42f6bafa7f585c23dba177c7053324 /src | |
parent | d5884fab8d7f0556db4d1f0635107238be82c0dc (diff) |
kern: Add initial pirho compiler sources
The pirho compiler is a ring-0 compiler used to compile core parts of
the kernel during updates and installs from the initramfs.
Signed-off-by: Ian Moffett <ian@osmora.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile | 2 | ||||
-rw-r--r-- | src/sys/include/np/lex.h | 101 | ||||
-rw-r--r-- | src/sys/include/os/np.h | 78 | ||||
-rw-r--r-- | src/sys/include/sys/namei.h | 4 | ||||
-rw-r--r-- | src/sys/np/core/np_init.c | 75 | ||||
-rw-r--r-- | src/sys/np/core/np_lex.c | 203 | ||||
-rw-r--r-- | src/sys/np/sample/rev-0.np | 21 | ||||
-rw-r--r-- | src/sys/os/Makefile | 1 |
8 files changed, 483 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 9a2409c..5b6f727 100644 --- a/src/Makefile +++ b/src/Makefile @@ -39,10 +39,12 @@ lib: root: mkdir -p $(SYSROOT)/ mkdir -p $(SYSROOT)/boot/ + mkdir -p $(SYSROOT)/boot/np/ mkdir -p $(SYSROOT)/usr/include/ mkdir -p $(SYSROOT)/usr/bin/ mkdir -p sys/target/header/ rsync -av sys/include/arch/$(TARGET)/ sys/target/header/machine/ + rsync -av sys/np/sample/*.np $(SYSROOT)/boot/np/ .PHONY: sysroot image: diff --git a/src/sys/include/np/lex.h b/src/sys/include/np/lex.h new file mode 100644 index 0000000..0b56490 --- /dev/null +++ b/src/sys/include/np/lex.h @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * 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 the project 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. + */ + +#ifndef _NP_LEX_H_ +#define _NP_LEX_H_ 1 + +#include <sys/types.h> +#include <os/np.h> + +#define TOKEN_BEGIN "begin" +#define TOKEN_PROC "proc" +#define TOKEN_END "end" + +/* + * Represents the various token types that are + * possible + */ +typedef enum { + /* Symbols */ + TT_LPAREN, + TT_RPAREN, + + /* Keywords */ + TT_BEGIN, + TT_PROC, + TT_END, +} tt_t; + +/* + * Represents a lexer token + * + * @token: Token type + */ +struct lex_token { + tt_t token; +}; + +/* + * Represents the lexer state machine + * + * @work: Current compiler work unit + * @tok: Current token + * @source_idx: Byte index into source stream + */ +struct lexer_state { + struct np_work *work; + struct lex_token tok; + size_t source_idx; +}; + +/* + * Initialize the lexer state machine into + * a known state + * + * @state: Lexer state machine to initialize + * @work: Work to initialize state machine with + * + * Returns zero on success, otherwise a less than + * zero value on failure + */ +int lex_init(struct lexer_state *state, struct np_work *work); + +/* + * "Nom" a token from the source input and advance + * to the next. + * + * @work: Current work + * @res: Result is written here + * + * Returns zero on success, otherwise a less than + * zero value on failure + */ +int lex_nom(struct np_work *work, struct lex_token *res); + +#endif /* !_NP_LEX_H_ */ diff --git a/src/sys/include/os/np.h b/src/sys/include/os/np.h new file mode 100644 index 0000000..3083ee1 --- /dev/null +++ b/src/sys/include/os/np.h @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * 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 the project 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. + */ + +/* + * Description: Pirho compiler interface + * Author: Ian Marco Moffett + */ + +#ifndef _OS_NP_H_ +#define _OS_NP_H_ 1 + +#include <sys/types.h> +#include <os/vnode.h> +#include <np/lex.h> + +/* + * Compiler work + * + * @source: Source input file + * @source_size: Source size in bytes + * @line_no: Current line number + * @lex_st: Lexer state + */ +struct np_work { + char *source; + size_t source_size; + size_t line_no; + struct lexer_state lex_st; +}; + +/* + * Initializes the compiler state into known values + * + * @in_path: Input file path of sources to be compiled + * @workp: Resulting work data is written here + * + * Returns zero on success, otherwise a less than zero + * value on failure. + */ +int np_init(const char *in_path, struct np_work *workp); + +/* + * Complete work by compiling the input file + * + * @work: Work that will be compiled + * + * Returns zero on success, otherwise a less than + * zero value on failure + */ +int np_compile(struct np_work *work); + +#endif /* _OS_NP_H_ */ diff --git a/src/sys/include/sys/namei.h b/src/sys/include/sys/namei.h index 588dbd3..58307b1 100644 --- a/src/sys/include/sys/namei.h +++ b/src/sys/include/sys/namei.h @@ -38,12 +38,12 @@ * * @path: Full path to lookup * @flags: Flags to use - * @vp: Vnode result is written here + * @vp_res: Vnode result is written here */ struct nameidata { const char *path; uint32_t flags; - struct vnode *vp; + struct vnode **vp_res; }; #if defined(_KERNEL) diff --git a/src/sys/np/core/np_init.c b/src/sys/np/core/np_init.c new file mode 100644 index 0000000..6b50b8e --- /dev/null +++ b/src/sys/np/core/np_init.c @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * 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 the project 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 <sys/errno.h> +#include <sys/namei.h> +#include <sys/syslog.h> +#include <os/omar.h> +#include <os/np.h> + +#define pr_trace(fmt, ...) printf("pirho: " fmt, ##__VA_ARGS__) + +int +np_init(const char *in_path, struct np_work *workp) +{ + int error; + struct nameidata nd; + struct lex_token tok; + + if (in_path == NULL || workp == NULL) { + return -EINVAL; + } + + workp->line_no = 1; + workp->source_size = initrd_open(in_path, &workp->source); + + if (workp->source_size < 0) { + pr_trace("failed to open '%s'\n", in_path); + return workp->source_size; + } + + /* Initialize the lexer */ + error = lex_init(&workp->lex_st, workp); + if (error < 0) { + pr_trace("failed to initialize lexer\n"); + return error; + } + + return 0; +} + +int +np_compile(struct np_work *work) +{ + if (work == NULL) { + return -EINVAL; + } + + return 0; +} diff --git a/src/sys/np/core/np_lex.c b/src/sys/np/core/np_lex.c new file mode 100644 index 0000000..5a96443 --- /dev/null +++ b/src/sys/np/core/np_lex.c @@ -0,0 +1,203 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * 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 the project 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 <sys/types.h> +#include <sys/errno.h> +#include <sys/syslog.h> +#include <os/np.h> +#include <np/lex.h> +#include <string.h> + +#define pr_trace(fmt, ...) printf("pirho.lex: " fmt, ##__VA_ARGS__) + +/* Max identifier length */ +#define MAX_ID_LEN 32 + +/* Just some helpers */ +#define to_lower(c) ((c) | 0x20) +#define is_alpha(c) (to_lower(c) >= 'a' && to_lower(c) <= 'z') +#define is_num(c) ((c) >= '0' && (c) <= '9') +#define is_space(c) ((c) == ' ' || (c) == '\t' || (c) == '\f' || (c) == '\n') + +/* + * Pop a character from the input work + * + * @work: Input work to pop from + */ +static char +lex_pop(struct np_work *work) +{ + struct lexer_state *lex_st; + + if (work == NULL) { + return '\0'; + } + + /* Don't overflow the source file */ + lex_st = &work->lex_st; + if (lex_st->source_idx >= work->source_size) { + return '\0'; + } + + return work->source[lex_st->source_idx++]; +} + +/* + * Compare a token with existing tokens (used internally) + */ +static int +lex_cmptok(char *tokstr, struct lex_token *res) +{ + switch (*tokstr) { + case 'b': + if (strcmp(tokstr, TOKEN_BEGIN) == 0) { + res->token = TT_BEGIN; + } + return 0; + case 'e': + if (strcmp(tokstr, TOKEN_END) == 0) { + res->token = TT_END; + } + return 0; + case 'p': + if (strcmp(tokstr, TOKEN_PROC) == 0) { + res->token = TT_PROC; + } + return 0; + } + + return -1; +} + +/* + * Match a token with a set of known tokens + * + * @work: Input work + * @c: Current character + * @res: Token result + * + * Returns zero on success + */ +static int +lex_matchstr(struct np_work *work, char c, struct lex_token *res) +{ + char id[MAX_ID_LEN + 1]; + size_t id_idx = 0; + int error; + + if (work == NULL || res == NULL) { + return -EINVAL; + } + + /* Grab the identifier */ + do { + if (id_idx >= sizeof(id) - 1) { + pr_trace("error: identifier too long!\n"); + return -1; + } + if (!is_alpha(c) && !is_num(c)) { + break; + } + id[id_idx++] = c; + } while ((c = lex_pop(work)) != 0); + + id[id_idx] = '\0'; + + /* Match the tokens */ + error = lex_cmptok(id, res); + if (error < 0) { + pr_trace("error: invalid indentifier '%s'\n", id); + } + return error; +} + +/* + * Nom a token + */ +int +lex_nom(struct np_work *work, struct lex_token *res) +{ + struct lexer_state *lex_st; + int error = -1; + char c; + + if (work == NULL || res == NULL) { + return -EINVAL; + } + + lex_st = &work->lex_st; + + /* Skip all whitespace */ + while ((c = lex_pop(work)) != 0) { + if (is_space(c)) { + continue; + } + + break; + } + + /* Match the token type */ + switch (c) { + case '(': + res->token = TT_LPAREN; + break; + case ')': + res->token = TT_RPAREN; + break; + default: + /* Stuff like '1var_name' is invalid */ + if (!is_alpha(c)) { + pr_trace("error: unexpected token '%c'\n", c); + return -1; + } + + error = lex_matchstr(work, c, res); + if (error == 0 || error < 0) { + break; + } + + pr_trace("error: got bad token '%c'\n", c); + error = -1; + break; + } + + return error; +} + +int +lex_init(struct lexer_state *state, struct np_work *work) +{ + if (state == NULL) { + return -EINVAL; + } + + memset(state, 0, sizeof(*state)); + state->work = work; + return 0; +} diff --git a/src/sys/np/sample/rev-0.np b/src/sys/np/sample/rev-0.np new file mode 100644 index 0000000..c3f781f --- /dev/null +++ b/src/sys/np/sample/rev-0.np @@ -0,0 +1,21 @@ +;; +;; Program entrypoint +;; +proc +main(u8 argc, u8 **argv) -> i8 +begin + u8 *vga = ptr(0x8B000) + + if argc < 2 begin + return -1 + end + + ;; Draw '*' chars + for [i=0 : i<8 : i += 2] begin + vga[i + 0] = '*' ;; char '*' + vga[i + 1] = 0x07 ;; red + end + + return 0 +end + diff --git a/src/sys/os/Makefile b/src/sys/os/Makefile index 0cd7817..67965ec 100644 --- a/src/sys/os/Makefile +++ b/src/sys/os/Makefile @@ -13,6 +13,7 @@ CFILES += $(shell find ../io -name "*.c") CFILES += $(shell find ../acpi -name "*.c") CFILES += $(shell find ../compat -name "*.c") CFILES += $(shell find ../fs -name "*.c") +CFILES += $(shell find ../np -name "*.c") DEPS = $(CFILES:.c=.d) OBJECTS = $(CFILES:%.c=%.o) |