modload/modunload

Author: braindigitalis

include/basic/peekpoke.h

@@ -64,3 +64,7 @@ void poked_statement(struct basic_ctx *ctx);
  * @param ctx BASIC context
  */
 void pokeq_statement(struct basic_ctx *ctx);
+
+void modload_statement(struct basic_ctx* ctx);
+
+void modunload_statement(struct basic_ctx* ctx);

include/basic/tokenizer.h

@@ -170,6 +170,8 @@
     T(OUTPORTW, STMT) 		/* 108 */ \
     T(OUTPORTD, STMT) 		/* 109 */ \
     T(KGET, STMT) 		/* 110 */ \
+    T(MODLOAD, STMT) 		/* 111 */ \
+    T(MODUNLOAD, STMT) 		/* 112 */ \
 
 
 GENERATE_ENUM_LIST(TOKEN, token_t)

src/basic/peekpoke.c

@@ -194,3 +194,24 @@ void pokeq_statement(struct basic_ctx* ctx) {
 	}
 	*(volatile uint64_t *)(uintptr_t)addr = (uint64_t)val;
 }
+
+void modload_statement(struct basic_ctx* ctx) {
+	accept_or_return(MODLOAD, ctx);
+	const char* name = str_expr(ctx);
+	accept_or_return(NEWLINE, ctx);
+	if (!load_module(name)) {
+		tokenizer_error_printf(ctx, "Unable to load module '%s'", name);
+		return;
+	}
+}
+
+void modunload_statement(struct basic_ctx* ctx) {
+	accept_or_return(MODUNLOAD, ctx);
+	const char* name = str_expr(ctx);
+	accept_or_return(NEWLINE, ctx);
+	if (!unload_module(name)) {
+		tokenizer_error_printf(ctx, "Unable to unload module '%s'", name);
+		return;
+	}
+}
+

src/basic/statement.c

@@ -178,6 +178,10 @@ void statement(struct basic_ctx* ctx)
 			return udpbind_statement(ctx);
 		case UDPUNBIND:
 			return udpunbind_statement(ctx);
+		case MODLOAD:
+			return modload_statement(ctx);
+		case MODUNLOAD:
+			return modunload_statement(ctx);
 		case NEWLINE:
 			/* Blank trailing line at end of program, ignore */
 			return;

src/kernel.c

@@ -23,8 +23,5 @@ void kmain()
 		preboot_fail("Failed to mount boot drive to VFS!");
 	}
 
-	// TODO: Don't hard code this, give BASIC facility to load it via /programs/init
-	load_module("e1000");
-
 	init_process();
 }