[Wisp-cvs] wisp/modules universal.wrti,1.24,1.25

[<di...@us...>]

Update of /cvsroot/wisp/wisp/modules
In directory usw-pr-cvs1:/tmp/cvs-serv25589/modules

Modified Files:
	universal.wrti 
Log Message:
Fixed Worth's handling of binary operators with constant arguments.

Index: universal.wrti
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/universal.wrti,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- universal.wrti	26 Sep 2002 18:22:46 -0000	1.24
+++ universal.wrti	30 Sep 2002 18:24:37 -0000	1.25
@@ -446,24 +446,22 @@
 
   ;; Operations on bit vectors
   (macro lshift
-    (binary lshift
-      (if-int-const 0
-        ((->ureg 1)
-         ,(shl ,1 ,0))
-        ((->reg 0 %ecx)
-         (->ureg 1)
-         ,(shl ,1 %cl)))
-      drop))
+    (if-int-const 0
+      ((->ureg 1)
+       ,(shl ,1 ,0))
+      ((->reg 0 %ecx)
+       (->ureg 1)
+       ,(shl ,1 %cl)))
+      drop)
 
   (macro rshift
-   (binary rshift
-     (if-int-const 0
-       ((->ureg 1)
-        ,(shr ,1 ,0))
-       ((->reg 0 %ecx)
-        (->ureg 1)
-        ,(shr ,1 %cl)))
-     drop))
+    (if-int-const 0
+      ((->ureg 1)
+       ,(shr ,1 ,0))
+      ((->reg 0 %ecx)
+       (->ureg 1)
+       ,(shr ,1 %cl)))
+    drop)
 
   (macro arshift
     (if-int-const 0