checkpoint

darcs-hash:20050906043927-5007d-d4ec0120feab55324cb1843ce1034258ce78cca9.gz

diff --git a/src/edu/berkeley/cs/obits/Atmel.java b/src/edu/berkeley/cs/obits/Atmel.java
index 31cdb5f..a01369b 100644 (file)
--- a/src/edu/berkeley/cs/obits/Atmel.java
+++ b/src/edu/berkeley/cs/obits/Atmel.java
@@ -1,55 +1,119 @@
 package edu.berkeley.cs.obits;
+import java.util.*;
+import java.io.*;
 import org.ibex.util.*;
 
 public class Atmel {
 
-    public static String pad(int len, String s) { if (s.length() >= len) return s; return "0"+pad(len-1,s); }
+    public static String pad(int len, String s) { if (s.length() >= len) return s.toUpperCase(); return "0"+pad(len-1,s); }
+    public static String hex32(int i) { return pad(8, Long.toString(i & 0xffffffffffffffffL, 16)); }
     public static String hex24(int i) { return pad(6, Integer.toString((i & 0xffffff), 16)); }
     public static String hex8(int i)  { return pad(2, Integer.toString((i & 0xff), 16)); }
     public static String bin8(int i)  { return pad(8, Integer.toString((i & 0xff), 2)); }
     public static String dec2(int i)  { return pad(2, Integer.toString(i & 0xff)); }
 
+    public static void main(String[] s) throws Exception {
+        Log.level = Log.DEBUG;
+        new Bits().read(System.in);
+    }
     private static class Bits {
         private byte[] bits    = new byte[0];
-        public int  get(int whichByte, int whichBit, int len) { }
-        public void set(int whichByte, int whichBit, int len, int val) { }
+        //public int  get(int whichByte, int whichBit, int len) { }
+        //public void set(int whichByte, int whichBit, int len, int val) { }
 
         private int    control = 0;
         public int  control()            { return control; }
         public void control(int control) { this.control = control; }
 
-        public void read(InputStream bitstream) {
-            DataInputStream dis = new DataInputStream(new Encode.Ascii.Binary(bitstream));
-            if (dis.readByte() != (byte)0x00) throw new Error("bitstream did not start with zero-byte");
+        public void read2(InputStream bitstream) throws IOException {
+            DataInputStream dis = new DataInputStream(new Encode.Ascii.In(16, bitstream));
+            try {
+                while(true) {
+                    dis.readUnsignedByte();
+                    dis.readUnsignedByte();
+                    dis.readUnsignedByte();
+                    int i = dis.readUnsignedByte();
+                    System.out.println(bin8(i));
+                }
+            } catch (EOFException e) {
+            }
+        }
+        public void read(InputStream bitstream) throws IOException {
+            DataInputStream dis = new DataInputStream(new Encode.Ascii.In(2, bitstream));
+            int b = dis.readUnsignedByte();
+            if (b != 0x00) throw new Error("bitstream did not start with zero-byte; got " + b);
             Log.debug(this, "saw leading zero-byte");
-            if (dis.readByte() != (byte)0xB7) throw new Error("bitstream did not start with preamble byte B7");
+            b = dis.readUnsignedByte();
+            if (b != 0xB7) throw new Error("bitstream did not start with preamble byte B7; got " + b);
             Log.debug(this, "saw preamble byte");
             control(dis.readInt());
-            Log.debug(this, "set control register to " + control());
+            Log.debug(this, "set control register to " + hex32(control()));
             int numWindows = dis.readShort();
             Log.debug(this, "this bitstream has " + numWindows + " window(s)");
+            int count = 0;
             for(int i=0; i<numWindows; i++) {
-                int start      = (((int)dis.readByte()) << 16) | (int)dis.readShort();
-                int end        = (((int)dis.readByte()) << 16) | (int)dis.readShort();
-                Log.debug(this, "  window " + i + " spans addresses " + hex24(start) + " - " + hex24(end));
-                for(int j=start; j<=end; j++) {
-                    int z = (j & 0x0000ff) >>  0;
-                    int y = (j & 0x00ff00) >>  8;
-                    int x = (j & 0xff0000) >> 16;
-                    mode4(x, y, z, dis.readByte());
+                int start      = (dis.readUnsignedByte() << 16) | (int)dis.readShort();
+                int end        = (dis.readUnsignedByte() << 16) | (int)dis.readShort();
+                count = 0;
+                Log.debug(this, "  window " + dec2(i) + " spans addresses " + hex24(start) + " - " + hex24(end) + "[count="+count+"]");
+                int _z = (start & 0x0000ff) >>  0;
+                int _y = (start & 0x00ff00) >>  8;
+                int _x = (start & 0xff0000) >> 16;
+                int z_ = (end & 0x0000ff) >>  0;
+                int y_ = (end & 0x00ff00) >>  8;
+                int x_ = (end & 0xff0000) >> 16;
+                int z =  (start & 0x0000ff) >>  0;
+                int y =  (start & 0x00ff00) >>  8;
+                int x =  (start & 0xff0000) >> 16;
+
+                while(true) {
+                    count++;
+                    mode4(x, y, z, dis.readUnsignedByte());
+                    x++;
+                    if (x > 15) { x = 0; y++; }
+                    if (y > 15) { y = 0; z++; }
+                    do {
+                        z++;
+                        if (z > 77) {
+                            z = _z;
+                            x++;
+                            if (x > 15) {
+                                x = _x;
+                                y++;
+                                if (y > y_) break;
+                            }
+                        }
+                    } while(!valid(x,y,z));
                 }
+                //Log.debug(this, "    read " + count + " bytes (" + hex24(count)+")");
             }
+            /*
+            Log.debug(this, "done " + count);
+            b = dis.readUnsignedByte();
+            if (b != 0xB7) throw new Error("bitstream did not start with preamble byte B7; got " + bin8(b));
+            Log.debug(this, "done2");
+            */
+        }
+
+        public boolean valid(int x, int y, int z) {
+            switch(z) {
+                case 0x00: case 0x01: break;
+            }
+            if (x > 15) return false;
+            if (y > 15) return false;
+            return true;
         }
 
         public void mode4(int x, int y, int z, int d) {
-            Log.debug(this, "    ("+dec2(x)+","+dec2(y)+"):"+hex8(z)+" = "+bin8(d));
+            //Log.debug(this, "    ("+dec2(x)+","+dec2(y)+"):"+hex8(z)+" = "+bin8(d));
+            //System.out.println(hex8(z)+hex8(y)+hex8(x)+hex8(d));
         }
     }
-
-
+}
+        /*
     public static class At40k extends FPGA {
 
-        /*
+
         public At40k(int width, int height) { this.width = width; this.height = height; }
 
         public static class At40k10 extends At40k { public At40k10() { super(24, 24); } }
@@ -133,4 +197,4 @@ public class Atmel {
     public class At94k extends At40k {
     }
         */
-}
+