use a 3x3 mesh for installing

vygr · Feb 15, 2021 · 7adfd8f · 7adfd8f
1 parent 00c6a7a
commit 7adfd8f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 40 deletions.
diff --git a/Makefile b/Makefile
@@ -46,16 +46,15 @@ snapshot:
 
 inst:
 	@./stop.sh
-	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-009 -l 001-009 -l 002-009 -l 003-009 -l 004-009 -l 005-009 -l 006-009 -l 007-009 -l 008-009 &
-	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-008 -l 001-008 -l 002-008 -l 003-008 -l 004-008 -l 005-008 -l 006-008 -l 007-008 -l 008-009 &
-	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-007 -l 001-007 -l 002-007 -l 003-007 -l 004-007 -l 005-007 -l 006-007 -l 007-008 -l 007-009 &
-	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-006 -l 001-006 -l 002-006 -l 003-006 -l 004-006 -l 005-006 -l 006-007 -l 006-008 -l 006-009 &
-	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-005 -l 001-005 -l 002-005 -l 003-005 -l 004-005 -l 005-006 -l 005-007 -l 005-008 -l 005-009 &
-	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-004 -l 001-004 -l 002-004 -l 003-004 -l 004-005 -l 004-006 -l 004-007 -l 004-008 -l 004-009 &
-	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-003 -l 001-003 -l 002-003 -l 003-004 -l 003-005 -l 003-006 -l 003-007 -l 003-008 -l 003-009 &
-	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-002 -l 001-002 -l 002-003 -l 002-004 -l 002-005 -l 002-006 -l 002-007 -l 002-008 -l 002-009 &
-	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-001 -l 001-002 -l 001-003 -l 001-004 -l 001-005 -l 001-006 -l 001-007 -l 001-008 -l 001-009 &
-	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-001 -l 000-002 -l 000-003 -l 000-004 -l 000-005 -l 000-006 -l 000-007 -l 000-008 -l 000-009 -run apps/terminal/install.lisp
+	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 005-008 -l 002-008 -l 007-008 -l 006-008 &
+	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 004-007 -l 001-007 -l 006-007 -l 007-008 &
+	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 003-006 -l 000-006 -l 006-008 -l 006-007 &
+	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 002-005 -l 005-008 -l 004-005 -l 003-005 &
+	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 001-004 -l 004-007 -l 003-004 -l 004-005 &
+	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-003 -l 003-006 -l 003-005 -l 003-004 &
+	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 002-008 -l 002-005 -l 001-002 -l 000-002 &
+	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 001-007 -l 001-004 -l 000-001 -l 001-002 &
+	@./obj/$(CPU)/$(ABI)/$(OS)/main_tui -e obj\vp64\VP64\sys\boot_image -l 000-006 -l 000-003 -l 000-002 -l 000-001 -run apps/terminal/install.lisp
 
 obj/$(CPU)/$(ABI)/$(OS)/main_gui:	obj/$(CPU)/$(ABI)/$(OS)/main_gui.o obj/$(CPU)/$(ABI)/$(OS)/vp64.o
 ifeq ($(OS),Darwin)

diff --git a/apps/terminal/install.lisp b/apps/terminal/install.lisp
@@ -5,7 +5,7 @@
 (print "Building platform native boot image.")
 (print "Please wait...")
 (print)
-(while (< (length (mail-nodes)) 10) (task-sleep 100000))
+(while (< (length (mail-nodes)) 9) (task-sleep 100000))
 (pipe-run "make all boot" (lambda (_) (prin _) (stream-flush (io-stream "stdout"))))
 (print)
 (print "Install complete.")

diff --git a/class/lisp/boot.inc b/class/lisp/boot.inc
@@ -123,11 +123,6 @@
 (ffi pii-time "sys/pii/lisp_time" 0)
 (ffi pii-write-char "sys/pii/lisp_writechar" 0)
 
-;C++ ChrysaLisp !
-(cond
-	((get 'nums))
-	((defq prebind (lambda (_) _))))
-
 (defq t 't nil 'nil
 	defmacro '(macro (n a &rest _) `(defq ,n (macro ,a ~_))))
 

diff --git a/cmd/make.lisp b/cmd/make.lisp
@@ -28,18 +28,17 @@
 	(defq *abi* (abi) *cpu* (cpu))
 	(print "Scanning source files...")
 	(defq _t_syms_ (list) _t_syms_vals_ (list) _syms_ '(
-		cap_butt cap_round cap_square cap_tri view_id ev_msg_action_source_id
-		ev_msg_key_key ev_msg_key_keycode ev_msg_mouse_buttons ev_msg_mouse_rx
-		ev_msg_mouse_ry ev_msg_target_id ev_msg_type ev_type_gui ev_type_key
-		ev_type_mouse file_open_append file_open_read file_open_write in_mbox_id
-		in_state int_size join_bevel join_miter join_round kn_call_child kn_call_open
-		long_size out_state ptr_size byte_size short_size stdio_args
-		stream_mail_state_started stream_mail_state_stopped stream_mail_state_stopping
-		vdu_char_height vdu_char_width view_flags view_h view_w view_x view_y
-		canvas_flags canvas_color cap_arrow canvas_scale canvas_pixmap pixmap_width pixmap_height
-		ev_msg_mouse_x ev_msg_mouse_y ev_type_action view_target_ids canvas_texture
-		texture_handle texture_width texture_height net_id_size node_id_size
-		)
+			cap_butt cap_round cap_square cap_tri view_id ev_msg_action_source_id
+			ev_msg_key_key ev_msg_key_keycode ev_msg_mouse_buttons ev_msg_mouse_rx
+			ev_msg_mouse_ry ev_msg_target_id ev_msg_type ev_type_gui ev_type_key
+			ev_type_mouse file_open_append file_open_read file_open_write in_mbox_id
+			in_state int_size join_bevel join_miter join_round kn_call_child kn_call_open
+			long_size ptr_size byte_size short_size stdio_args stream_mail_state_started
+			stream_mail_state_stopped stream_mail_state_stopping vdu_char_height
+			vdu_char_width view_flags view_h view_w view_x view_y canvas_flags
+			canvas_color cap_arrow canvas_scale canvas_pixmap pixmap_width pixmap_height
+			ev_msg_mouse_x ev_msg_mouse_y ev_type_action view_target_ids canvas_texture
+			texture_handle texture_width texture_height net_id_size node_id_size)
 		_vals_ (within-compile-env (lambda ()
 	        (include "sys/func.inc")
 			(each include (all-class-files))

diff --git a/install.bat b/install.bat
@@ -4,13 +4,12 @@
 @echo WIN64 > abi
 @call stop.bat
 @tar -xf snapshot.zip
-@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe -e .obj\vp64\VP64\sys\boot_image -l 000-009 -l 001-009 -l 002-009 -l 003-009 -l 004-009 -l 005-009 -l 006-009 -l 007-009 -l 008-009
-@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe -e .obj\vp64\VP64\sys\boot_image -l 000-008 -l 001-008 -l 002-008 -l 003-008 -l 004-008 -l 005-008 -l 006-008 -l 007-008 -l 008-009
-@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe -e .obj\vp64\VP64\sys\boot_image -l 000-007 -l 001-007 -l 002-007 -l 003-007 -l 004-007 -l 005-007 -l 006-007 -l 007-008 -l 007-009
-@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe -e .obj\vp64\VP64\sys\boot_image -l 000-006 -l 001-006 -l 002-006 -l 003-006 -l 004-006 -l 005-006 -l 006-007 -l 006-008 -l 006-009
-@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe -e .obj\vp64\VP64\sys\boot_image -l 000-005 -l 001-005 -l 002-005 -l 003-005 -l 004-005 -l 005-006 -l 005-007 -l 005-008 -l 005-009
-@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe -e .obj\vp64\VP64\sys\boot_image -l 000-004 -l 001-004 -l 002-004 -l 003-004 -l 004-005 -l 004-006 -l 004-007 -l 004-008 -l 004-009
-@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe -e .obj\vp64\VP64\sys\boot_image -l 000-003 -l 001-003 -l 002-003 -l 003-004 -l 003-005 -l 003-006 -l 003-007 -l 003-008 -l 003-009
-@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe -e .obj\vp64\VP64\sys\boot_image -l 000-002 -l 001-002 -l 002-003 -l 002-004 -l 002-005 -l 002-006 -l 002-007 -l 002-008 -l 002-009
-@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe -e .obj\vp64\VP64\sys\boot_image -l 000-001 -l 001-002 -l 001-003 -l 001-004 -l 001-005 -l 001-006 -l 001-007 -l 001-008 -l 001-009
-@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe -e .obj\vp64\VP64\sys\boot_image -l 000-001 -l 000-002 -l 000-003 -l 000-004 -l 000-005 -l 000-006 -l 000-007 -l 000-008 -l 000-009 -run apps/terminal/install.lisp
+@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe .\obj\x86_64\WIN64\sys\boot_image -l 005-008 -l 002-008 -l 007-008 -l 006-008
+@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe .\obj\x86_64\WIN64\sys\boot_image -l 004-007 -l 001-007 -l 006-007 -l 007-008
+@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe .\obj\x86_64\WIN64\sys\boot_image -l 003-006 -l 000-006 -l 006-008 -l 006-007
+@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe .\obj\x86_64\WIN64\sys\boot_image -l 002-005 -l 005-008 -l 004-005 -l 003-005
+@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe .\obj\x86_64\WIN64\sys\boot_image -l 001-004 -l 004-007 -l 003-004 -l 004-005
+@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe .\obj\x86_64\WIN64\sys\boot_image -l 000-003 -l 003-006 -l 003-005 -l 003-004
+@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe .\obj\x86_64\WIN64\sys\boot_image -l 002-008 -l 002-005 -l 001-002 -l 000-002
+@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe .\obj\x86_64\WIN64\sys\boot_image -l 001-007 -l 001-004 -l 000-001 -l 001-002
+@start /b .\obj\x86_64\WIN64\Windows\main_tui.exe .\obj\x86_64\WIN64\sys\boot_image -l 000-006 -l 000-003 -l 000-002 -l 000-001 -run apps/terminal/install.lisp
diff --git a/sys/symbols.inc b/sys/symbols.inc
@@ -30,7 +30,6 @@ join_round 2
 kn_call_child 2
 kn_call_open 1
 long_size 8
-out_state 92
 ptr_size 8
 byte_size 1
 short_size 2
@@ -73,7 +72,6 @@ _t_ev_msg_target_id "L"
 _t_ev_msg_type "L"
 _t_in_mbox_id "I"
 _t_in_state "I"
-_t_out_state "I"
 _t_stdio_args "p"
 _t_vdu_char_height "S"
 _t_vdu_char_width "S"