Refactor.

ueforth/Makefile

@@ -156,36 +156,36 @@ save_restore_test: $(POSIX)/ueforth
 $(GEN):
 	mkdir -p $@
 
-COMMON_PREPLATFORM = common/boot.fs common/conditionals.fs common/vocabulary.fs \
+COMMON_PHASE1 = common/boot.fs common/conditionals.fs common/vocabulary.fs \
                      common/floats.fs
 
 COMMON_DESKTOP = common/hide_calls.fs common/ansi.fs common/desktop.fs
 
-COMMON_POSTPLATFORM = common/utils.fs common/locals.fs \
+COMMON_PHASE2 = common/tasks.fs common/utils.fs common/locals.fs \
                 common/filetools.fs common/highlevel.fs \
                 common/streams.fs common/blocks.fs
 
-POSIX_BOOT =  $(COMMON_PREPLATFORM) \
+POSIX_BOOT =  $(COMMON_PHASE1) \
               posix/posix.fs posix/posix_highlevel.fs posix/termios.fs \
-              common/tasks.fs $(COMMON_POSTPLATFORM) $(COMMON_DESKTOP) \
+              $(COMMON_PHASE2) $(COMMON_DESKTOP) \
               posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \
               posix/autoboot.fs \
               common/fini.fs
 $(GEN)/posix_boot.h: common/source_to_string.js $(POSIX_BOOT) | $(GEN)
 	$< boot $(VERSION) $(REVISION) $(POSIX_BOOT) >$@
 
-WINDOWS_BOOT = $(COMMON_PREPLATFORM) \
+WINDOWS_BOOT = $(COMMON_PHASE1) \
                windows/windows.fs windows/windows_highlevel.fs \
-               common/tasks.fs $(COMMON_POSTPLATFORM) $(COMMON_DESKTOP) \
+               $(COMMON_PHASE2) $(COMMON_DESKTOP) \
                posix/autoboot.fs \
                common/fini.fs
 $(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN)
 	$< -win boot $(VERSION) $(REVISION) $(WINDOWS_BOOT) >$@
 
-ESP32_BOOT = $(COMMON_PREPLATFORM) \
+ESP32_BOOT = $(COMMON_PHASE1) \
-             common/tasks.fs esp32/platform.fs esp32/highlevel.fs \
+             esp32/highlevel.fs esp32/bindings.fs \
-             esp32/bindings.fs \
+             $(COMMON_PHASE2) \
-             $(COMMON_POSTPLATFORM) \
+             esp32/platform.fs \
              posix/httpd.fs posix/web_interface.fs esp32/web_interface.fs \
              esp32/registers.fs esp32/timers.fs \
              esp32/bterm.fs posix/telnetd.fs \

ueforth/common/forth_namespace_tests.fs

@@ -377,6 +377,27 @@ e: check-highlevel
   out: included 
 ;e
 
+e: check-phase1
+  check-highlevel-floats
+  check-vocabulary
+  check-[]conds
+  check-boot
+  check-builtin
+;e
+
+e: check-phase2
+  check-args
+  check-ansi
+  check-blocks
+  out: streams 
+  check-highlevel
+  check-snapshots
+  check-locals
+  check-utils
+  out: ms 
+  check-tasks
+;e
+
 DEFINED? windows [IF]
 
 e: test-forth-namespace
@@ -393,15 +414,7 @@ e: test-forth-namespace
 e: test-forth-namespace
   ' forth list-from
   out: FORTH 
-  check-args
+  check-phase2
-  check-ansi
-  check-blocks
-  out: streams 
-  check-highlevel
-  check-snapshots
-  check-locals
-  check-utils
-  check-tasks
   out: resize 
   out: free 
   out: allocate 
@@ -413,15 +426,12 @@ e: test-forth-namespace
   out: ok 
   out: ms 
   check-files
+  out: ms-ticks 
   out: default-key? 
   out: default-key 
   out: default-type 
   out: windows 
-  check-highlevel-floats
+  check-phase1
-  check-vocabulary
-  check-[]conds
-  check-boot
-  check-builtin
   out: LOADLIBRARYA 
   out: GETPROCADDRESS 
 ;e
@@ -451,16 +461,7 @@ e: test-forth-namespace
   out: httpd 
   out: telnetd 
   out: sockets 
-  check-args
+  check-phase2
-  check-ansi
-  check-blocks
-  out: streams 
-  check-highlevel
-  check-snapshots
-  check-locals
-  check-utils
-  out: ms 
-  check-tasks
   out: form 
   out: termios 
   out: resize 
@@ -475,11 +476,7 @@ e: test-forth-namespace
   out: default-key 
   out: default-type 
   out: posix 
-  check-highlevel-floats
+  check-phase1
-  check-vocabulary
-  check-[]conds
-  check-boot
-  check-builtin
   out: DLSYM 
 ;e 
 

ueforth/windows/windows.fs

@@ -80,6 +80,7 @@ z" MoveFileA" 2 Kernel32 MoveFileA
 z" SetFilePointer" 4 Kernel32 SetFilePointer
 z" SetEndOfFile" 1 Kernel32 SetEndOfFile
 z" GetFileSize" 2 Kernel32 GetFileSize
+z" GetTickCount" 0 Kernel32 GetTickCount
 
 z" GetCommandLineW" 0 Kernel32 GetCommandLineW
 
@@ -120,6 +121,7 @@ also forth definitions
 : default-type win-type ;
 : default-key win-key ;
 : default-key? win-key? ;
+: ms-ticks ( -- n ) GetTickCount ;
 only windows definitions
 ' default-type is type
 ' default-key is key