From 3851401454c2c52851c34fd0a416290a592c900b Mon Sep 17 00:00:00 2001 From: "Daniel C. Sobral" Date: Mon, 9 Oct 2000 11:29:40 +0000 Subject: [PATCH] Now I see the error of my ways. Previous revision of this file changed the "boot" commands to take no arguments from the stack. This is only valid in the case where a kernel has not been loaded. In that case, load_kernel_and_modules will be called, which takes a list of arguments from the stack. When a kernel is presently loaded, though, the list of arguments must be passed to the boot command, which was the behaviour before the last revision. Fix things for both cases. Noticed by: S-Max and others on that chat room --- sys/boot/forth/loader.4th | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th index 51bfc92f9adc..f002c0774e82 100644 --- a/sys/boot/forth/loader.4th +++ b/sys/boot/forth/loader.4th @@ -65,17 +65,19 @@ only forth also support-functions also builtins definitions c@ [char] - <> if 0 1 unload drop else - s" kernelname" getenv? 0= if ( no kernel has been loaded ) - load_kernel_and_modules - ?dup if exit then + s" kernelname" getenv? if ( a kernel has been loaded ) + 1 boot exit then + load_kernel_and_modules + ?dup if exit then 0 1 boot exit then else - s" kernelname" getenv? 0= if ( no kernel has been loaded ) - load_kernel_and_modules - ?dup if exit then + s" kernelname" getenv? if ( a kernel has been loaded ) + 1 boot exit then + load_kernel_and_modules + ?dup if exit then 0 1 boot exit then load_kernel_and_modules