diff options
| author | dcs <dcs@FreeBSD.org> | 2000-09-16 20:20:44 +0000 |
|---|---|---|
| committer | dcs <dcs@FreeBSD.org> | 2000-09-16 20:20:44 +0000 |
| commit | d7b65e0dab2dbd99532c36cf5f054c2015299405 (patch) | |
| tree | e43a7ace997268b424148f17814d617a30c7066b /sys/boot | |
| parent | 30ccffb914d29bc393275ede72956c1730043dc6 (diff) | |
| download | FreeBSD-src-d7b65e0dab2dbd99532c36cf5f054c2015299405.zip FreeBSD-src-d7b65e0dab2dbd99532c36cf5f054c2015299405.tar.gz | |
Solve a name clash.
Add something to help debugging.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/forth/loader.4th | 8 | ||||
| -rw-r--r-- | sys/boot/forth/support.4th | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th index 69a1614..3ac4bf7 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 20f1873..a1c6f68 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 |
