X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fcom%2Fatmel%2Ffpslic%2FFpslic.java;h=c79441781091bb827538cc00a646dbf9b53f4eef;hb=b89edf07b45b7821a31388f2467ad74d99870d60;hp=3a97c035a75f1dcc0535e9ffcba3067c52c93e26;hpb=daff49a8da20b577ab7af4a2e52b5901fbcbf9a9;p=slipway.git diff --git a/src/com/atmel/fpslic/Fpslic.java b/src/com/atmel/fpslic/Fpslic.java index 3a97c03..c794417 100644 --- a/src/com/atmel/fpslic/Fpslic.java +++ b/src/com/atmel/fpslic/Fpslic.java @@ -176,6 +176,8 @@ public abstract class Fpslic { this.col = col; } + public Fpslic fpslic() { return Fpslic.this; } + // Accessors for Neighbors ////////////////////////////////////////////////////////////////////////////// public SectorWire hwire(int plane) { return new SectorWire(true, plane, col, row); } @@ -256,8 +258,8 @@ public abstract class Fpslic { public void h(int plane, boolean enable) { switch(plane) { - case 0: mode4(0x08, row, col, 2, enable); return; - case 1: mode4(0x08, row, col, 0, enable); return; + case 0: mode4(0x08, row, col, 0, enable); return; + case 1: mode4(0x08, row, col, 2, enable); return; case 2: mode4(0x08, row, col, 5, enable); return; case 3: mode4(0x08, row, col, 6, enable); return; case 4: mode4(0x00, row, col, 6, enable); return; @@ -267,8 +269,8 @@ public abstract class Fpslic { public boolean hx(int plane) { switch(plane) { - case 0: return (mode4(0x08, row, col) & (1<<2)) != 0; - case 1: return (mode4(0x08, row, col) & (1<<0)) != 0; + case 0: return (mode4(0x08, row, col) & (1<<0)) != 0; + case 1: return (mode4(0x08, row, col) & (1<<2)) != 0; case 2: return (mode4(0x08, row, col) & (1<<5)) != 0; case 3: return (mode4(0x08, row, col) & (1<<6)) != 0; case 4: return (mode4(0x00, row, col) & (1<<6)) != 0; @@ -309,14 +311,11 @@ public abstract class Fpslic { } public int t() { - System.err.println("found " + (mode4(1, row, col) & 0x34)); - switch(mode4(1, row, col) & 0x34) { - case 0x20: return TMUX_Z; - case 0x24: return TMUX_W_AND_Z; - case 0x34: return TMUX_FB; - case 0x14: return TMUX_W_AND_FB; + switch(mode4(1, row, col) & 0x30) { case 0x00: return TMUX_W; - //default: throw new RuntimeException("unknown!"); + case 0x10: return wi()==NONE ? TMUX_FB : TMUX_W_AND_FB; + case 0x20: return wi()==NONE ? TMUX_Z : TMUX_W_AND_Z; + case 0x30: throw new RuntimeException("illegal!"); default: return TMUX_W; } } @@ -324,15 +323,14 @@ public abstract class Fpslic { public void t(int code) { int result = 0; switch(code) { - case TMUX_Z: result = 0x20; break; // TOTALLYBOGUS throw new Error("not implemented, but should be possible"); - case TMUX_W_AND_Z: result = 0x24; break; - case TMUX_FB: result = 0x34; break; /* I think this is actually W_AND_FB, sadly */ - case TMUX_W_AND_FB: result = 0x14; break; case TMUX_W: result = 0x00; break; - //default: throw new RuntimeException("unknown code! " + code); + case TMUX_Z: result = 0x20; break; + case TMUX_W_AND_Z: result = 0x20; break; + case TMUX_FB: result = 0x10; break; + case TMUX_W_AND_FB: result = 0x10; break; default: result = 0x00; break; } - mode4(1, row, col, result, 0x34); + mode4(1, row, col, result, 0x30); } /* private void fmux(int source) { @@ -469,11 +467,13 @@ public abstract class Fpslic { case NE: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 1<<6); break; case SE: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 1<<5); break; case NW: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 1<<4); break; - case L4: mode4(0x03, row, col, 4, true); mode4(0x05, row, col, 0); break; - case L3: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 1<<0); break; - case L2: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 1<<1); break; - case L1: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 1<<2); break; + case L0: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 1<<3); break; + case L1: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 1<<2); break; + case L2: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 1<<1); break; + case L3: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 1<<0); break; + case L4: mode4(0x03, row, col, 4, true); mode4(0x05, row, col, 0); break; + case NONE: mode4(0x03, row, col, 4, false); mode4(0x05, row, col, 0); break; default: throw new RuntimeException("invalid argument"); } @@ -587,7 +587,7 @@ public abstract class Fpslic { } public int zi() { - switch(mode4(0x02, row, col) & 0xDB) { + switch(mode4(0x02, row, col) & 0x9B) { case (1<<7): return L4; case (1<<5): return L3; case (1<<4): return L2; @@ -596,8 +596,57 @@ public abstract class Fpslic { case (1<<1): return NONE; /* huh? */ case (1<<0): return NONE; /* huh? */ case 0: return NONE; - default: throw new RuntimeException("invalid argument: zi=="+(mode4(0x02, row, col) & 0xDB)); - } + default: throw new RuntimeException("invalid argument: zi=="+(mode4(0x02, row, col) & 0x9B)); + } + } + + public Cell dir(int i) { + switch(i) { + case NORTH: return north(); + case SOUTH: return south(); + case EAST: return east(); + case WEST: return west(); + case NW: return nw(); + case SW: return sw(); + case SE: return se(); + case NE: return ne(); + } + return null; + } + public int dir(Cell c) { + if (c.row==row-1 && c.col==col-1) return SW; + else if (c.row==row+1 && c.col==col-1) return NW; + else if (c.row==row-1 && c.col==col+1) return SE; + else if (c.row==row+1 && c.col==col+1) return NE; + else if (c.row==row-1 && c.col==col) return SOUTH; + else if (c.row==row+1 && c.col==col) return NORTH; + else if (c.row==row && c.col==col-1) return WEST; + else if (c.row==row && c.col==col+1) return EAST; + return -1; + } + + public void generalized_c_element() { + + /* + ylut(LUT_SELF & (~LUT_OTHER)); + xlut((~LUT_SELF) | LUT_OTHER); + c(ZMUX); + zi(L2); + //h(L2, true); + out(L2, true); + xo(true); + yo(true); + */ + + //ylut(0xB2); + ylut((LUT_SELF & ~LUT_OTHER) | (LUT_Z & ~LUT_OTHER) | (LUT_Z & LUT_SELF & LUT_OTHER)); + xlut(LUT_Z); + c(YLUT); + f(false); + b(false); + t(false, false, true); + yo(false); + xo(false); } @@ -670,6 +719,10 @@ public abstract class Fpslic { boolean out = false; boolean connect = false; for(int i=0; i<4; i++) { + + // FIXME FIXME FIXME + if (i==3) continue; + if (out(L0+i)) out = true; if (hx(L0+i)) connect = true; if (vx(L0+i)) connect = true;