Merge branch 'master' into build64

[pforth] / fth / misc2.fth

diff --git a/fth/misc2.fth b/fth/misc2.fth
index c943e82..c0791da 100644 (file)
--- a/fth/misc2.fth
+++ b/fth/misc2.fth
@@ -122,18 +122,18 @@ variable rand-seed here rand-seed !
 : B->S ( c -- c' , sign extend byte )
     dup $ 80 and
     IF
 : B->S ( c -- c' , sign extend byte )
     dup $ 80 and
     IF

-        $ FFFFFF00 or
+        [ $ 0FF invert ] literal or

     ELSE
     ELSE

-        $ 000000FF and
+        $ 0FF and

     THEN
 ;
     THEN
 ;

-: W->S ( 16bit-signed -- 32bit-signed )
+: W->S ( 16bit-signed -- cell-signed )

     dup $ 8000 and
     dup $ 8000 and

-    if
-        $ FFFF0000 or
+    IF
+        [ $ 0FFFF invert ] literal or

     ELSE
     ELSE

-        $ 0000FFFF and
-    then
+        $ 0FFFF and
+    THEN

 ;
 
 : WITHIN { n1 n2 n3 -- flag }
 ;
 
 : WITHIN { n1 n2 n3 -- flag }