remove last vestiges of old literal system

[fleet.git] / src / edu / berkeley / fleet / api / Instruction.java

diff --git a/src/edu/berkeley/fleet/api/Instruction.java b/src/edu/berkeley/fleet/api/Instruction.java
index 8ca41b7..e9a74b6 100644 (file)
--- a/src/edu/berkeley/fleet/api/Instruction.java
+++ b/src/edu/berkeley/fleet/api/Instruction.java
@@ -129,18 +129,23 @@ public abstract class Instruction {
                 return "(@"+offset+"): sendto " + dest;
             }
         }
+    }
 
-        public static class CodeBagDescriptor extends Literal {
-            /** address of CBD, relative to address that this instruction was loaded from */
-            public final long offset;
-            public final long size;
-            public CodeBagDescriptor(Destination dest, long offset, long size) {
-                super(dest); this.offset = offset; this.size = size; }
-            public String toString() {
-                String off = ""+offset;
-                if (offset > 0) off = "+"+off;
-                return "(CBD @"+off+"+"+size+"): sendto " + dest;
-            }
+    public static class CodeBagDescriptor extends Instruction {
+        /** address of CBD, relative to address that this instruction was loaded from */
+        public final Pump pump;
+        public final long offset;
+        public final long size;
+        public CodeBagDescriptor(Pump pump, long offset, long size) {
+            this.pump = pump;
+            this.offset = offset;
+            this.size = size;
+        }
+        public String toString() {
+            String off = ""+offset;
+            if (offset > 0) off = "+"+off;
+            return "(CBD @"+off+"+"+size+"): sendto " + pump;
         }
     }
+
 }