projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
31853c9
)
remove internal counter from Alu3
author
adam
<adam@megacz.com>
Wed, 8 Aug 2007 06:09:14 +0000
(07:09 +0100)
committer
adam
<adam@megacz.com>
Wed, 8 Aug 2007 06:09:14 +0000
(07:09 +0100)
ships/Alu3.ship
patch
|
blob
|
history
diff --git
a/ships/Alu3.ship
b/ships/Alu3.ship
index
e6bf24b
..
5b9d0cb
100644
(file)
--- a/
ships/Alu3.ship
+++ b/
ships/Alu3.ship
@@
-17,7
+17,7
@@
data out: outBits
== TeX ==============================================================
== Fleeterpreter ====================================================
== TeX ==============================================================
== Fleeterpreter ====================================================
-int count = 74;
+boolean mode = false;
Bitfifo.BitStorage outBits = new Bitfifo.BitStorage(74);
public void service() {
if (box_in1.dataReadyForShip() &&
Bitfifo.BitStorage outBits = new Bitfifo.BitStorage(74);
public void service() {
if (box_in1.dataReadyForShip() &&
@@
-31,7
+31,7
@@
public void service() {
long v2 = box_in2.removeDataForShip();
long v3 = box_in3.removeDataForShip();
long o1, o2, o3;
long v2 = box_in2.removeDataForShip();
long v3 = box_in3.removeDataForShip();
long o1, o2, o3;
- if (count % 2 == 0) {
+ if (!mode) {
o1 = v1;
o2 = v2 >>> 1;
o3 = ((v2 & 0x1L) == 0) ? 0 : v1;
o1 = v1;
o2 = v2 >>> 1;
o3 = ((v2 & 0x1L) == 0) ? 0 : v1;
@@
-44,20
+44,7
@@
public void service() {
box_out1.addDataFromShip(o1);
box_out2.addDataFromShip(o2);
box_out3.addDataFromShip(o3);
box_out1.addDataFromShip(o1);
box_out2.addDataFromShip(o2);
box_out3.addDataFromShip(o3);
- count--;
- // This should be removed
- if (count == 0) {
- for (int i = 0; i < 37; i++) {
- v1 = o1;
- v2 = o2;
- v3 = o3;
- o1 = ((v1 & v2) | (v2 & v3) | (v1 & v3))/* << 1*/;
- o2 = (v1 ^ v2 ^ v3) >> 1;
- o3 = 0;
- outBits.add((v1 ^ v2 ^ v3) & 0x1L, 1);
- }
- count = 74;
- }
+ mode = !mode;
}
if (box_outBits.readyForDataFromShip() &&
outBits.size() >= 37) {
}
if (box_outBits.readyForDataFromShip() &&
outBits.size() >= 37) {
@@
-126,8
+113,11
@@
alu3.in1: [*] take, deliver;
alu3.in2: [*] take, deliver;
alu3.in3: [*] take, deliver;
alu3.out1: [74] take, sendto alu3.in1;
alu3.in2: [*] take, deliver;
alu3.in3: [*] take, deliver;
alu3.out1: [74] take, sendto alu3.in1;
+ [74] take, sendto alu3.in1;
alu3.out2: [74] take, sendto alu3.in2;
alu3.out2: [74] take, sendto alu3.in2;
+ [74] take, sendto alu3.in2;
alu3.out3: [74] take, sendto alu3.in3;
alu3.out3: [74] take, sendto alu3.in3;
+ [74] take, sendto alu3.in3;
alu3.outBits: [2] take, sendto debug.in;
debug.in: [*] take, deliver;
alu3.outBits: [2] take, sendto debug.in;
debug.in: [*] take, deliver;