Commit: f5c8fe4a3e505c0bcfa71748e1b86dc24a0cdfcc - xhilr_calendar (git)

Functions for working with the idealized calendar of Planet Xhilr

Commit MetaInfo

• Revision: f5c8fe4a3e505c0bcfa71748e1b86dc24a0cdfcc (tree)
• Time: 2017-06-13 18:07:37
• Author: Joel Matthew Rees <joel.rees@gmai...>
• Commiter: Joel Matthew Rees

Log Message

debugging the division

Change Summary

• modified: econmonths.fs

Incremental Difference

--- a/econmonths.fs
+++ b/econmonths.fs
@@ -348,30 +348,41 @@ CELLBITS CELLWIDTH /MOD CONSTANT BYTEBITS CONSTANT LEFTOVERBITS
     2ROT 2ROT ( Get the divisor out of the way, but accessible with pick. )
     CELLBITS SUM2* 1+ >R   ( Count )
     0 >R   ( Force flag )
-    BEGIN 
-      2DUP    ( high double of dividend )
-      6 DLC@ D< 0=   ( Greater or equal? )
+    BEGIN ( BL BH AL AML AMH AH ) ( [ count force ] )
+      2DUP    ( high double of dividend : BL BH AL AML AMH AH AMH AH )
+      6 DLC@ D< 0=   ( Greater or equal? : BL BH AL AML AMH AH f )
       R> OR    ( Force it? )
-      IF
-        D- 1 ( Mark the subtraction. )
+      IF   ( BL BH AL AML AMH AH ) ( [ count ] )
+        4 DLC@ D- 1 ( Mark the subtraction. )
       ELSE
-        DROP 0 ( Mark no subtraction. )
-      THEN
+        0 ( Mark no subtraction. )
+      THEN   ( BL BH AL AML AMH AH bit ) ( [ count ] )
       SWAP >R SWAP >R   ( Save top half of remainder and bury the subtraction flag. )
+      ( BL BH AL AML bit ) ( [ count AH AMH ] )
       OVER >R   ( Remember the carry from bottom to top half -- AML. )
+      ( BL BH AL AML bit ) ( [ count AH AMH AML ] )
       >R SUMD2*   ( Save subtraction flag and shift the bottom half: AL AML. )
-      SWAP R> OR SWAP   ( Record the subtraction in emptied bit of remainder. )
-      R> DUP 0< IF 1 ELSE 0 THEN ( Convert AML to bit to shift in to top half. )
-      R> R>   ( BL BH AL AML CARRY AMH AH )
+      ( BL BH sAL rsAML ) ( [ count AH AMH AML bit ] )
+      SWAP    ( BL BH rsAML sAL ) ( [ count AH AMH AML bit ] )
+      R> OR SWAP   ( Record the subtraction in emptied bit of remainder. )
+      ( BL BH rsAL rsAML ) ( [ count AH AMH AML ] )
+      R> 0< IF 1 ELSE 0 THEN ( Convert AML to bit to shift in to top half. )
+      ( BL BH rsAL rsAML carry ) ( [ count AH AMH ] )
+      R> R>   ( BL BH rsAL rsAML carry AMH AH ) ( [ count ] )
       R> 1 - DUP >R    ( Count down. )
-      WHILE   ( BL BH AL AML CARRY AMH AH )
+      ( BL BH rsAL rsAML carry AMH AH newcount ) ( [ newcount ] )
+      WHILE   ( BL BH rsAL rsAML carry AMH AH ) ( [ newcount ] )
         DUP 0< >R   ( Remember the high bit of the remainder, to force subtract. )
-        SUMD2* >R OR R>   ( Shift the remainder, with the bit from the low half. )
-    REPEAT   ( BL BH AL AML AMH AH )
-    R> DROP   ( the count )
-    ( BL BH QL QH RL RH )
-    2>R 2>R 2DROP 2R> 2R>   ( QL QH RL RH )
-    2SWAP
+        ( BL BH rsAL rsAML carry AMH AH ) ( [ newcount newforce ] )
+        SUMD2*   ( BL BH rsAL rsAML carry sAMH rsAH ) ( [ newcount newforce ] )
+        >R OR R>   ( Shift the remainder, with the bit from the low half. )
+        ( BL BH rsAL rsAML rsAMH rsAH ) ( [ newcount newforce ] )
+    REPEAT   ( BL BH rsAL rsAML rsAMH rsAH ) ( [ newcount newforce ] )
+    ( BL BH rsAL rsAML carry AMH AH ) ( [ newcount ] )
+    R> DROP   ( the count ) ( BL BH rsAL rsAML carry AMH AH )
+    ROT DROP   ( BL BH QL QH RL RH )
+    2ROT 2DROP   ( QL QH RL RH )
+    2SWAP    ( RL RH QL QH )
   THEN
 ;