Change Value representer to use XOr more

compiler/src/l3/CPSOptimizer.scala

@@ -141,9 +141,8 @@ abstract class CPSOptimizer[T <: CPSTreeModule { type Name = Symbol }]
             case Seq(a1, AtomL(l2)) if rightAbsorbing((prim, l2)) =>
               shrink(body, s.withASubst(name, l2))
             case _ => {
-              // If the primitive is id
-              if (prim == identity) {
-                shrink(body, s.withASubst(name, s.aSubst(replacedArgs(0))))
+              if (false && prim == identity) {
+                shrink(body, s.withASubst(name, replacedArgs(0)))
               } else {
                 noOp
               }

compiler/src/l3/CPSValueRepresenter.scala

@@ -302,7 +302,7 @@ object CPSValueRepresenter extends (H.Tree => L.Tree) {
           tempLetP(op, Seq(Right(x1), Right(y1))) { truDiv =>
             // Retag the result
             tempLetP(CPS.ShiftLeft, Seq(Right(truDiv), lAtomOne)) { shiftedRes =>
-              L.LetP(n, CPS.Add, Seq(shiftedRes, L.AtomL(1)), transform(body))
+              L.LetP(n, CPS.XOr, Seq(shiftedRes, L.AtomL(1)), transform(body))
             }
           }
         }
@@ -311,12 +311,12 @@ object CPSValueRepresenter extends (H.Tree => L.Tree) {
 
     prim match {
       case L3.IntAdd => 
-        tempLetP(CPS.Sub, Seq(Left(x), lAtomOne)) { x1 => 
+        tempLetP(CPS.XOr, Seq(Left(x), lAtomOne)) { x1 => 
           L.LetP(n, CPS.Add, Seq(x1, rewrite(y)), transform(body))
         }
       case L3.IntSub =>
-        tempLetP(CPS.Add, Seq(Left(x), lAtomOne)) { x1 =>
-          L.LetP(n, CPS.Sub, Seq(x1, rewrite(y)), transform(body))
+        tempLetP(CPS.Sub, Seq(Left(x), Left(y))) { res =>
+          L.LetP(n, CPS.XOr, Seq(res, L.AtomL(1)), transform(body))
         }
       case L3.IntMul =>
         tempLetP(CPS.Sub, Seq(Left(x), lAtomOne)) { x1 =>
@@ -338,10 +338,10 @@ object CPSValueRepresenter extends (H.Tree => L.Tree) {
       }
 
       case L3.IntShiftLeft =>
-        tempLetP(CPS.Sub, Seq(Left(x), lAtomOne)) { x1 => 
+        tempLetP(CPS.XOr, Seq(Left(x), lAtomOne)) { x1 => 
           tempLetP(CPS.ShiftRight, Seq(Left(y), lAtomOne)) { y1 => 
             tempLetP(CPS.ShiftLeft, Seq(Right(x1), Right(y1))) { z => 
-              L.LetP(n, CPS.Add, Seq(z, L.AtomL(1)), transform(body))
+              L.LetP(n, CPS.XOr, Seq(z, L.AtomL(1)), transform(body))
             }
           }
         }
@@ -372,13 +372,13 @@ object CPSValueRepresenter extends (H.Tree => L.Tree) {
       case L3.BlockTag =>
         tempLetP(CPS.BlockTag, args map (Left(_))) { t1 =>
           tempLetP(CPS.ShiftLeft, Seq(Right(t1), lAtomOne)) { t2 =>
-            L.LetP(n, CPS.Add, Seq(t2, L.AtomL(1)), transform(body))
+            L.LetP(n, CPS.XOr, Seq(t2, L.AtomL(1)), transform(body))
           }
         }
       case L3.BlockLength => 
         tempLetP(CPS.BlockLength, args map (Left(_))) { t1 =>
           tempLetP(CPS.ShiftLeft, Seq(Right(t1), lAtomOne)) { t2 =>
-            L.LetP(n, CPS.Add, Seq(t2, L.AtomL(1)), transform(body))
+            L.LetP(n, CPS.XOr, Seq(t2, L.AtomL(1)), transform(body))
           }
         }
       case L3.BlockSet =>