From df3c7d3993ca92f32920e520a2d69ed75aa118b6 Mon Sep 17 00:00:00 2001 From: "Daniel C. Sobral" Date: Sat, 16 Sep 2000 20:20:44 +0000 Subject: Solve a name clash. Add something to help debugging. --- sys/boot/forth/loader.4th | 8 ++++---- sys/boot/forth/support.4th | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'sys/boot/forth') diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th index 69a16143c65b..3ac4bf7c853e 100644 --- a/sys/boot/forth/loader.4th +++ b/sys/boot/forth/loader.4th @@ -66,26 +66,26 @@ only forth also support-functions also builtins definitions 0 1 unload drop else s" kernelname" getenv? 0= if ( no kernel has been loaded ) - load_conf + load_kernel_and_modules ?dup if exit then then 1 boot exit then else s" kernelname" getenv? 0= if ( no kernel has been loaded ) - load_conf + load_kernel_and_modules ?dup if exit then then 1 boot exit then - load_conf + load_kernel_and_modules ?dup 0= if 0 1 boot then ; : boot-conf 0= if ( interpreted ) get-arguments then 0 1 unload drop - load_conf + load_kernel_and_modules ?dup 0= if 0 1 autoboot then ; diff --git a/sys/boot/forth/support.4th b/sys/boot/forth/support.4th index 20f18735caca..a1c6f68cb91e 100644 --- a/sys/boot/forth/support.4th +++ b/sys/boot/forth/support.4th @@ -1286,7 +1286,13 @@ also builtins begin parse-; 2>r 2over 2r> - r@ clip_args 1 load + r@ clip_args + s" DEBUG" getenv? if + s" echo Module_path: ${module_path}" evaluate + ." Kernel : " >r 2dup type r> cr + dup 2 = if ." Flags : " >r 2over type r> cr then + then + 1 load while dup 0= until @@ -1595,7 +1601,7 @@ also builtins drop ( empty string ) ; -: load_conf ( args -- flag ) +: load_kernel_and_modules ( args -- flag ) set-tempoptions argc >r s" temp_options" getenv dup -1 <> if -- cgit v1.3