picolisp

commit ef0f01b52bef33ed99e9d2e7214b80960799eb0c
parent 66427aebe00bb32d780122b07ac4e9724b8ab9c7
Author: Alexander Burger <abu@software-lab.de>
Date:   Sun,  7 Oct 2012 19:04:05 +0200

emu64 continued
Diffstat:
M
src64/arch/emu.l
 | 
48
++++++++++++++++++++++++++++++++----------------

1 file changed, 32 insertions(+), 16 deletions(-)
diff --git a/src64/arch/emu.l b/src64/arch/emu.l
@@ -411,28 +411,44 @@
          "   Carry = cfLsb,  Result = @1 = (Source = @1 >> @2-1) >> 1;" ) ) )
 
 (asm rol (Dst D Src S)
-   (genCode (Dst D Src S) (list 'rol Dst Src) ((op.n Dst D) (op.i Src S))
-      "i = @2,  @1 = @1 << i | @1 >> (64 - i);" ) )
+   (if (=0 S)
+      (genCode (Dst D Src) (list 'rol Dst Src) ((op.n Dst D) Src)
+         "@1 = @1 << @2 | @1 >> (64 - @2);" )
+      (genCode (Dst D Src S) (list 'rol Dst Src) ((op.n Dst D) (op.i Src S))
+         "i = @2,  @1 = @1 << i | @1 >> (64 - i);" ) ) )
 
 (asm ror (Dst D Src S)
-   (genCode (Dst D Src S) (list 'ror Dst Src) ((op.n Dst D) (op.i Src S))
-      "i = @2,  @1 = @1 >> i | @1 << (64 - i);" ) )
+   (if (=0 S)
+      (genCode (Dst D Src) (list 'ror Dst Src) ((op.n Dst D) Src)
+         "@1 = @1 >> @2 | @1 << (64 - @2);" )
+      (genCode (Dst D Src S) (list 'ror Dst Src) ((op.n Dst D) (op.i Src S))
+         "i = @2,  @1 = @1 >> i | @1 << (64 - i);" ) ) )
 
 (asm rcl (Dst D Src S)
-   (if (=0 S)
-      (genCode (Dst D Src) (list 'rcl Dst Src) ((op.n Dst D) Src)
-         "Carry = cfMsb,  i = @2-1,  Result = @1 = (Source = @1 << i | @1 >> (64 - i)) << 1;" )
-      (genCode (Dst D Src S) (list 'rcl Dst Src) ((op.n Dst D) (op.i Src S))
-         "if (@2)"
-         "   Carry = cfMsb,  i = @2-1,  Result = @1 = (Source = @1 << i | @1 >> (64 - i)) << 1;" ) ) )
+   (nond
+      ((=0 S)
+         (genCode (Dst D Src S) (list 'rcl Dst Src) ((op.n Dst D) (op.i Src S))
+            "if (@2)"
+            "   i = Carry(),  Carry = cfMsb,  Result = @1 = (Source = @1 << (@2 - 1) | @1 >> (64 - (@2 - 1))) << 1 | i;" ) )
+      ((= "1" Src)
+         (genCode (Dst D Src) (list 'rcl Dst Src) ((op.n Dst D) Src)
+            "i = Carry(),  Carry = cfMsb,  Result = @1 = (Source = @1 << (@2 - 1) | @1 >> (64 - (@2 - 1))) << 1 | i;" ) )
+      (NIL
+         (genCode (Dst D Src) (list 'rcl Dst Src) ((op.n Dst D))
+            "i = Carry(),  Carry = cfMsb,  Result = @1 = (Source = @1) << 1 | i;" ) ) ) )
 
 (asm rcr (Dst D Src S)
-   (if (=0 S)
-      (genCode (Dst D Src) (list 'rcr Dst Src) ((op.n Dst D) Src)
-         "Carry = cfLsb,  i = @2-1,  Result = @1 = (Source = @1 >> i | @1 << (64 - i)) >> 1;" )
-      (genCode (Dst D Src S) (list 'rcr Dst Src) ((op.n Dst D) (op.i Src S))
-         "if (@2)"
-         "   Carry = cfLsb,  i = @2-1,  Result = @1 = (Source = @1 >> i | @1 << (64 - i)) >> 1;" ) ) )
+   (nond
+      ((=0 S)
+         (genCode (Dst D Src S) (list 'rcr Dst Src) ((op.n Dst D) (op.i Src S))
+            "if (@2)"
+            "   i = Carry(),  Carry = cfLsb,  Result = @1 = (Source = @1 >> (@2 - 1) | @1 << (64 - (@2 - 1))) >> 1 | (uint64_t)i << 63;" ) )
+      ((= "1" Src)
+         (genCode (Dst D Src) (list 'rcr Dst Src) ((op.n Dst D) Src)
+            "i = Carry(),  Carry = cfLsb,  Result = @1 = (Source = @1 >> (@2 - 1) | @1 << (64 - (@2 - 1))) >> 1 | (uint64_t)i << 63;" ) )
+      (NIL
+         (genCode (Dst D Src) (list 'rcr Dst Src) ((op.n Dst D))
+            "i = Carry(),  Carry = cfLsb,  Result = @1 = (Source = @1) >> 1 | (uint64_t)i << 63;" ) ) ) )
 
 (asm mul (Src S)
    (genCode (Src S) (list 'mul Src) ((op.n Src S))