d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use the poxy vmGetString interface (who uses counted strings these

Browse Source 
days?), get the input buffer ourselves.  Add some debugging code.
This commit is contained in:
Mike Smith 1998-11-06 03:45:36 +00:00
parent ef80de33ad
commit 84924924e1
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/boot/common/interp_forth.c
View File

@ -23,13 +23,21 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: interp_forth.c,v 1.2 1998/11/04 03:41:09 msmith Exp $ * $Id: interp_forth.c,v 1.3 1998/11/05 08:39:38 jkh Exp $
*/ */
#include <stand.h> #include <stand.h>
#include "bootstrap.h" #include "bootstrap.h"
#include "ficl.h" #include "ficl.h"
#define BFORTH_DEBUG
#ifdef BFORTH_DEBUG
# define DEBUG(fmt, args...) printf("%s: " fmt "\n" , __FUNCTION__ , ## args)
#else
# define DEBUG(fmt, args...)
#endif
/* /*
* BootForth Interface to Ficl Forth interpreter. * BootForth Interface to Ficl Forth interpreter.
*/ */
@ -43,10 +51,10 @@ static FICL_VM *bf_vm;
static void static void
bf_command(FICL_VM *vm) bf_command(FICL_VM *vm)
{ {
char *name, *line, *tail, *cp;
int len;
struct bootblk_command **cmdp; struct bootblk_command **cmdp;
bootblk_cmd_t *cmd; bootblk_cmd_t *cmd;
char *name, *line;
FICL_STRING *tail = (FICL_STRING *)vm->pad;
int argc, result; int argc, result;
char **argv; char **argv;
@ -54,6 +62,7 @@ bf_command(FICL_VM *vm)
name = vm->runningWord->name; name = vm->runningWord->name;
/* Find our command structure */ /* Find our command structure */
cmd == NULL;
SET_FOREACH(cmdp, Xcommand_set) { SET_FOREACH(cmdp, Xcommand_set) {
if (((*cmdp)->c_name != NULL) && !strcmp(name, (*cmdp)->c_name)) if (((*cmdp)->c_name != NULL) && !strcmp(name, (*cmdp)->c_name))
cmd = (*cmdp)->c_fn; cmd = (*cmdp)->c_fn;
@ -62,11 +71,16 @@ bf_command(FICL_VM *vm)
panic("callout for unknown command '%s'", name); panic("callout for unknown command '%s'", name);
/* Get remainder of invocation */ /* Get remainder of invocation */
vmGetString(vm, tail, '\n'); tail = vmGetInBuf(vm);
for (cp = tail, len = 0; *cp != 0 && *cp != '\n'; cp++, len++)
;
line = malloc(strlen(name) + len + 2);
strcpy(line, name);
if (len > 0)
strncat(line, tail, len);
DEBUG("cmd '%s'", line);
/* XXX This is grostic */
line = malloc(strlen(name) + strlen(tail->text) + 2);
sprintf(line, "%s %s", name, tail->text);
command_errmsg = command_errbuf; command_errmsg = command_errbuf;
command_errbuf[0] = 0; command_errbuf[0] = 0;
if (!parse(&argc, &argv, line)) { if (!parse(&argc, &argv, line)) {
@ -109,6 +123,8 @@ bf_run(char *line)
int result; int result;
result = ficlExec(bf_vm, line); result = ficlExec(bf_vm, line);
DEBUG("ficlExec '%s' = %d", line, result);
if (result == VM_USEREXIT) if (result == VM_USEREXIT)
panic("interpreter exit"); panic("interpreter exit");
} }