Performance: Remove float state

chipsim.js

@@ -57,14 +57,11 @@ function recalcNode(node){
 	if(node==ngnd) return;
 	if(node==npwr) return;
 	group = getNodeGroup(node);
-	var newv = getNodeValue();
+	var newState = getNodeValue(group);
-	var newState = (newv[0]=='h');
-	var newFloat = (newv[1]=='f');
 	if(ctrace && (traceTheseNodes.indexOf(node)!=-1))
 		console.log('recalc', node, group);
 	for(var i in group){
 		var n = nodes[group[i]];
-		n.float = newFloat;
 		if(n.state==newState)continue;	/******Performance********/
 		n.state = newState;
 		n.gates.forEach(
@@ -93,27 +90,16 @@ function turnTransistorOff(t){
 	if(ctrace && (traceTheseTransistors.indexOf(t.name)!=-1))
 		console.log(t.name, 'off', t.gate, t.c1, t.c2);
 	t.on = false;
-	floatnode(t.c1);
-	floatnode(t.c2);
 	addRecalcNode(t.c1);
 	addRecalcNode(t.c2);
 }
 
-function floatnode(nn){
-	if(nn==ngnd) return;
-	if(nn==npwr) return;
-	var n = nodes[nn];
-	n.float = true;
-	if(ctrace && (traceTheseNodes.indexOf(nn)!=-1))
-		console.log('floating', nn, 'at', n.state);
-}
-
 function addRecalcNode(nn){
-	if(nn==ngnd) return;
+       if(nn==ngnd) return;
-	if(nn==npwr) return;
+       if(nn==npwr) return;
-	if(recalcHash[nn] == 1)return; 
+       if(recalcHash[nn] == 1)return; 
-	recalclist.push(nn);
+       recalclist.push(nn);
-	recalcHash[nn] = 1;
+       recalcHash[nn] = 1;
 }
 
 function getNodeGroup(i){
@@ -147,19 +133,16 @@ function addNodeTransistor(node, tr){
 
 
 function getNodeValue(){
-	if(arrayContains(group, ngnd)) return 'l ';
+	if(arrayContains(group, ngnd)) return false;
-	if(arrayContains(group, npwr)) return 'h ';
+	if(arrayContains(group, npwr)) return true;
-	var flstate;
 	for(var i in group){
 		var nn = group[i];
 		var n = nodes[nn];
-		if(n.pullup) return 'h ';
+		if(n.pullup) return true;
-		if(n.pulldown) return 'l ';
+		if(n.pulldown) return false;
-		if((!n.state && n.float)&&(flstate==undefined)) flstate = 'lf';
+		if(n.state) return true;
-		if(n.state && n.float) flstate = 'hf';
 	}
-	if(flstate==undefined && ctrace) console.log(group);
+	return false;
-	return flstate;
 }
 
 
@@ -182,26 +165,26 @@ function allNodes(){
 }
 
 function stateString(){
-	var codes = ['g','l','h','f' ];
+	var codes = ['l','h'];
 	var res = '';
 	for(var i=0;i<1725;i++){
 		var n = nodes[i];
 		if(n==undefined) res+='x';
 		else if(i==ngnd) res+='g';
-		else if(i==npwr) res+='h';
+		else if(i==npwr) res+='v';
-		else res+= codes[n.state*2 + n.float];
+		else res+= codes[0+n.state];
 	}
 	return res;
 }
 
 function showState(str){
-	var codes = {g: 'l ', h: 'h ', f: 'hf', l: 'lf'};
+	var codes = {g: false, h: true, v: true, l: false};
 	for(var i=0;i<str.length;i++){
 		if(str[i]=='x') continue;
-		nodes[i].state = ((codes[str[i]])[0]=='h');
+		var state = codes[str[i]];
-		nodes[i].float = ((codes[str[i]])[1]=='f');
+		nodes[i].state = state;
 		var gates = nodes[i].gates;
-		gates.forEach(function(t){t.on=isNodeHigh(i);});
+		gates.forEach(function(t){t.on=state;});
 	}
 	refresh();
 }

macros.js

@@ -172,10 +172,6 @@ var goldenChecksum;
 
 // simulate a single clock phase, updating trace and highlighting layout
 function step(){
-	if(!animateChipLayout){
-		halfStep();
-		return;
-	}
 	var s=stateString();
 	var m=getMem();
 	trace[cycle]= {chip: s, mem: m};

wires.js

@@ -36,7 +36,7 @@ function setupNodes(){
 		var w = seg[0];
 		if(nodes[w]==undefined) 
 			nodes[w] = {segs: new Array(), num: w, pullup: seg[1]=='+',
-			            state: false, float: true, gates: new Array(), c1c2s: new Array()};
+			            state: false, gates: new Array(), c1c2s: new Array()};
 		if(w==ngnd) continue;
 		if(w==npwr) continue;
 		nodes[w].segs.push(seg.slice(3));