From 5d2132574865db820e28d8177937ada6b457cab1 Mon Sep 17 00:00:00 2001 From: oco Date: Thu, 31 May 2018 13:24:59 +0300 Subject: [PATCH] Code cleanup, version bump to 0.5.1 --- m3forth.spf | 6 +++--- src/cross.spf | 11 ----------- src/hex.spf | 2 +- src/interpreter.spf | 2 +- src/kernel.spf | 9 --------- 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/m3forth.spf b/m3forth.spf index 7cae65d..92b26a8 100644 --- a/m3forth.spf +++ b/m3forth.spf @@ -1,8 +1,8 @@ \ m3forth DECIMAL -C" 0.5" CONSTANT _VERSION -.( m3forth by Oleg Voronin, David Kuehling. Version ) +C" 0.5.1" CONSTANT _VERSION +.( m3forth by Oleg Voronin, David Kuehling 2013-2018. Version ) _VERSION COUNT TYPE CR S" lib/include/double.f" INCLUDED @@ -17,7 +17,7 @@ S" lib/include/place.f" INCLUDED S" src/hex.spf" INCLUDED CREATE FILENAME 255 ALLOT \ temp buffer -\ ================= контроллер +\ ================= device S" devices/devices.spf" INCLUDED \ device types FNAME 2@ FILENAME PLACE S" .elf" FILENAME +PLACE diff --git a/src/cross.spf b/src/cross.spf index 6323846..bbfcc58 100644 --- a/src/cross.spf +++ b/src/cross.spf @@ -1082,16 +1082,5 @@ INTERPRETER SWAP 0 REG: + ; -\ ~ COMPILER -\ ~ -\ ~ : BITS{ - \ ~ ( [ ) 0 TSTATE !H ; -\ ~ -\ ~ INTERPRETER -\ ~ -\ ~ : }BITS - \ ~ BIT [ ALSO COMPILING ] POSTPONE LITERAL POSTPONE ] ; -\ ~ - HOST diff --git a/src/hex.spf b/src/hex.spf index 1d30356..a6e0944 100644 --- a/src/hex.spf +++ b/src/hex.spf @@ -22,7 +22,7 @@ VARIABLE H-SUM 0 0 R> WRITE-LINE THROW ; -: HEX-SAVE ( taddr count a u -- ) \ в формате intel.hex +: HEX-SAVE ( taddr count a u -- ) \ intel.hex BASE @ >R HEX R/W CREATE-FILE THROW -ROT diff --git a/src/interpreter.spf b/src/interpreter.spf index 7f7e75d..31784f1 100644 --- a/src/interpreter.spf +++ b/src/interpreter.spf @@ -286,7 +286,7 @@ CDATA !SP !RP DECIMAL 0 STATE ! 0 TO SOURCE-ID (TIB) 0 SOURCE! - CR ." M3Forth (C) Oleg Voronin, David Kuehling 2013" + CR ." M3Forth (C) Oleg Voronin, David Kuehling 2013-2018" QUIT ; ' (ABORT) IS ABORT diff --git a/src/kernel.spf b/src/kernel.spf index d8b0f36..d6f4a55 100644 --- a/src/kernel.spf +++ b/src/kernel.spf @@ -290,15 +290,6 @@ COMPILER [END-ASM] ; -\ symmetric -\ ~ : / - \ ~ [ASM] - \ ~ poptmp - \ ~ tos tmp tos sdiv - \ ~ [END-ASM] -\ ~ ; - - : UNLOOP [ASM] 8 # sp sp add