Add BootForth hooks; if BOOT_FORTH is defined, pass every line read

to the Forth interpreter.  Instantiate all of our inbuilt commands
as Forth words, and handle them being called from there.

Add my copyright to the bcache module (oops).

4 files changed, 155 insertions, 5 deletions

diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index d8e6e6d..c29494b 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.6 1998/09/30 19:38:26 peter Exp $
+# $Id: Makefile.inc,v 1.7 1998/11/02 23:28:10 msmith Exp $
 
 SRCS+=	bcache.c boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c load_aout.c load_elf.c ls.c misc.c 
@@ -11,3 +11,8 @@ SRCS+=	isapnp.c
 .if HAVE_PNP
 SRCS+=	pnp.c
 .endif
+
+# Forth interpreter
+.if BOOT_FORTH
+SRCS+=	interp_forth.c
+.endif
diff --git a/sys/boot/common/bcache.c b/sys/boot/common/bcache.c
index aa85d5c..77b987a 100644
--- a/sys/boot/common/bcache.c
+++ b/sys/boot/common/bcache.c
@@ -1,5 +1,29 @@
-/*
- * mjs copyright
+/*-
+ * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ *	$Id$
  */
 
 /*
diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c
index fca044a..8ae6d03 100644
--- a/sys/boot/common/interp.c
+++ b/sys/boot/common/interp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: interp.c,v 1.6 1998/10/09 07:09:22 msmith Exp $
+ *	$Id: interp.c,v 1.7 1998/10/21 20:07:04 msmith Exp $
  */
 /*
  * Simple commandline interpreter, toplevel and misc.
@@ -42,7 +42,7 @@ static void	prompt(void);
 /*
  * Perform the command
  */
-static int
+int
 perform(int argc, char *argv[])
 {
     int				i, result;
@@ -81,6 +81,10 @@ interact(void)
     int		argc;
     char	**argv;
 
+#ifdef BOOT_FORTH
+    bf_init();
+#endif
+
     /*
      * Read our default configuration
      */
@@ -102,6 +106,9 @@ interact(void)
 	input[0] = '\0';
 	prompt();
 	ngets(input, sizeof(input));
+#ifdef BOOT_FORTH
+	bf_run(input);
+#else
 	if (!parse(&argc, &argv, input)) {
 	    if (perform(argc, argv))
 		printf("%s: %s\n", argv[0], command_errmsg);
@@ -109,6 +116,7 @@ interact(void)
 	} else {
 	    printf("parse error\n");
 	}
+#endif
     }
 }
 
diff --git a/sys/boot/common/interp_forth.c b/sys/boot/common/interp_forth.c
new file mode 100644
index 0000000..0e0c616
--- /dev/null
+++ b/sys/boot/common/interp_forth.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ *	$Id$
+ */
+
+#include <stand.h>
+#include "bootstrap.h"
+#include "ficl.h"
+
+/*
+ * BootForth   Interface to Ficl Forth interpreter.
+ */
+
+static FICL_VM	*bf_vm;
+
+/*
+ * Shim for taking commands from BF and passing them out to 'standard'
+ * argv/argc command functions.
+ */
+static void
+bf_command(FICL_VM *vm)
+{
+    struct bootblk_command	**cmdp;
+    bootblk_cmd_t		*cmd;
+    char			*name, *line;
+    FICL_STRING			*tail = (FICL_STRING *)vm->pad;
+    int				argc, result;
+    char			**argv;
+
+    /* Get the name of the current word */
+    name = vm->runningWord->name;
+    
+    /* Find our command structure */
+    SET_FOREACH(cmdp, Xcommand_set) {
+	if (((*cmdp)->c_name != NULL) && !strcmp(name, (*cmdp)->c_name))
+	    cmd = (*cmdp)->c_fn;
+    }
+    if (cmd == NULL)
+	panic("callout for unknown command '%s'", name);
+    
+    /* Get remainder of invocation */
+    vmGetString(vm, tail, '\n');
+    
+    /* XXX This is grostic */
+    line = malloc(strlen(name) + strlen(tail->text) + 2);
+    sprintf(line, "%s %s", name, tail->text);
+    command_errmsg = command_errbuf;
+    command_errbuf[0] = 0;
+    if (!parse(&argc, &argv, line)) {
+	result = (cmd)(argc, argv);
+	free(argv);
+	if (result != 0) {
+	    strcpy(command_errmsg, vm->pad);
+	    vmTextOut(vm, vm->pad, 1);
+	}
+    } else {
+	vmTextOut(vm, "parse error\n", 1);
+    }
+    free(line);
+}
+
+/*
+ * Initialise the Forth interpreter, create all our commands as words.
+ */
+void
+bf_init(void)
+{
+    struct bootblk_command	**cmdp;
+    
+    ficlInitSystem(10000);	/* XXX what's the argument here? */
+    bf_vm = ficlNewVM();
+
+    /* make all commands appear as Forth words */
+    SET_FOREACH(cmdp, Xcommand_set)
+	ficlBuild((*cmdp)->c_name, bf_command, FW_DEFAULT);
+    
+}
+
+/*
+ * Feed a line of user input to the Forth interpreter
+ */
+void
+bf_run(char *line)
+{
+    int		result;
+    
+    result = ficlExec(bf_vm, line);
+    if (result == VM_USEREXIT)
+	panic("interpreter exit");
+}