From: adam <adam@megacz.com>
Date: Wed, 2 Jan 2008 07:02:00 +0000 (+0100)
Subject: checkpoint synthesizing
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c5f2cfdf0cf57a62f1091763fdf7432070a5c011;p=fleet.git

checkpoint synthesizing
---

diff --git a/src/edu/berkeley/fleet/ies44/InstructionEncoder.java b/src/edu/berkeley/fleet/ies44/InstructionEncoder.java
index 6a33b5b..7871d78 100644
--- a/src/edu/berkeley/fleet/ies44/InstructionEncoder.java
+++ b/src/edu/berkeley/fleet/ies44/InstructionEncoder.java
@@ -20,17 +20,31 @@ public abstract class InstructionEncoder {
     public static final int WIDTH_MASK_LITERAL     = 6;
     public static final int MASK_LITERAL           = 13;
     */
-    public static final int OFFSET_MASK_KILL       = 21;
-    public static final int WIDTH_MASK_KILL        = 5;
-    public static final int MASK_KILL              = 5;
 
-    public static final int OFFSET_MASK_UNCLOG     = 21;
-    public static final int WIDTH_MASK_UNCLOG      = 5;
-    public static final int MASK_UNCLOG            = 2;
-
-    public static final int OFFSET_MASK_CLOG       = 21;
-    public static final int WIDTH_MASK_CLOG        = 5;
-    public static final int MASK_CLOG              = 4;
+    public static final int OFFSET_MASK_MASSACRE   = 14;
+    public static final int WIDTH_MASK_MASSACRE    = 26-14;
+    public static final int MASK_MASSACRE          = 1;
+
+    //public static final int OFFSET_MASK_KILL       = 21;
+    //public static final int WIDTH_MASK_KILL        = 5;
+    //public static final int MASK_KILL              = 5;
+    public static final int OFFSET_MASK_KILL       = 14;
+    public static final int WIDTH_MASK_KILL        = 26-14;
+    public static final int MASK_KILL              = 0;
+
+    //public static final int OFFSET_MASK_UNCLOG     = 21;
+    //public static final int WIDTH_MASK_UNCLOG      = 5;
+    //public static final int MASK_UNCLOG            = 2;
+    public static final int OFFSET_MASK_UNCLOG     = 14;
+    public static final int WIDTH_MASK_UNCLOG      = 26-14;
+    public static final int MASK_UNCLOG            = 3;
+
+    //public static final int OFFSET_MASK_CLOG       = 21;
+    //public static final int WIDTH_MASK_CLOG        = 5;
+    //public static final int MASK_CLOG              = 4;
+    public static final int OFFSET_MASK_CLOG       = 14;
+    public static final int WIDTH_MASK_CLOG        = 26-14;
+    public static final int MASK_CLOG              = 2;
 
     public static final int OFFSET_MASK_NORMAL     = 25;
     public static final int WIDTH_MASK_NORMAL      = 1;