Fix paging #PF, simplify init_tasks
Unsure what fixed the paging #PF in init_tasks, but allocating a page
now works as expected. Originally a #PF would occur if alloc_page was
called after a certain point in init_tasks.
diff --git a/share/jmk/jmk.tcl b/share/jmk/jmk.tcl
index 1a82ffb..13f3fca 100644
--- a/share/jmk/jmk.tcl
+++ b/share/jmk/jmk.tcl
@@ -13,7 +13,7 @@
variable asmflags {}
variable ldflags {}
-variable asm as
+variable asm nasm
variable cc gcc
variable ld ld
@@ -40,10 +40,6 @@
rule all $target {}
- rule Makefile Jmk2 {
- log JMK2 ""
- shell "cd $::jmk_build_dir && $::jmk_build_cmd"
- }
}
proc preset {p} {
@@ -265,10 +261,10 @@
variable dir [pwd]
if {![file exists $path]} {
- jmk_error "jmk_source: $dir/$path doesn't exist"
+ jmk_error "jmk_source: $path doesn't exist"
}
- lappend ::jmk_sourced "$dir/$path"
+ lappend ::jmk_sourced "$path"
cd [file dirname $path]
uplevel 1 source [file tail $path]
@@ -276,5 +272,8 @@
}
proc jmk_finalize {} {
- puts "Jmk2: $::jmk_sourced"
+ rule Makefile "Jmk2 $::jmk_sourced" {
+ log JMK2 ""
+ shell "cd $::jmk_build_dir && $::jmk_build_cmd"
+ }
}