Merge branch 'ed' into svg

expert.html

@@ -56,7 +56,7 @@ $().ready(function(){
 <a href="http://blog.visual6502.org">Blog</a>&nbsp;
 <a href="http://www.visual6502.org/links.html">Links</a>&nbsp;
 <a href="http://github.com/trebonian/visual6502">Source</a>&nbsp;
-<a href="http://www.6502asm.com/">6502asm assembler</a>&nbsp;
+<a href="http://skilldrick.github.com/easy6502/#first-program">easy6502 assembler</a>&nbsp;
 <a href="http://www.e-tradition.net/bytes/6502/disassembler.html">e-tradition disassembler</a>&nbsp;
 </span>
 <div class="frame" id="frame">
@@ -76,7 +76,7 @@ $().ready(function(){
   </form>
 </div>
 <div id="layoutControlPanel">
-  Use 'z' or '>' to zoom in, 'x' or '<' to zoom out, click to probe signals and drag to pan.
+  Use 'z' or '&gt;' to zoom in, 'x' or '&lt;' to zoom out, click to probe signals and drag to pan.
   <form id="updateShow"> Show:
   <input type="checkbox" name="1" id="updateShow1" onchange="updateShow(this.name,this.checked)" />(diffusion)
   <input type="checkbox" name="3" id="updateShow3" onchange="updateShow(this.name,this.checked)" />(grounded diffusion)

index.html

@@ -66,7 +66,7 @@ Keyboard controls: 'z' to zoom in, 'x' to zoom out, 'n' to step the simulation.
 <br />
 Mouse controls: Left-click and drag to scroll around (when you're zoomed in.)
 <br />
-More information in the <a href="http://visual6502.org/wiki/index.php?title=JssimUserHelp">User Guide<a>.
+More information in the <a href="http://visual6502.org/wiki/index.php?title=JssimUserHelp">User Guide</a>.
 <br />
 <br /> 
 </span>
@@ -79,13 +79,13 @@ More information in the <a href="http://visual6502.org/wiki/index.php?title=Jssi
 </div>
 <div class = "buttons">
   <div style="position:relative; float:left;">
-    <a href ="javascript:stopChip()"id="stop"><img class="navstop" src="images/stop.png"></a>
+    <a href ="javascript:stopChip()" id="stop"><img class="navstop" src="images/stop.png" title="stop"></a>
-    <a href ="javascript:runChip()" id="start"><img class="navplay" src="images/play.png"></a>
+    <a href ="javascript:runChip()" id="start"><img class="navplay" src="images/play.png" title="start"></a>
   </div>
   <div style="float:left;">
-    <a href ="javascript:resetChip()"><img class="navbutton" src="images/up.png"></a>
+    <a href ="javascript:resetChip()"><img class="navbutton" src="images/up.png" title="reset"></a>
-    <a href ="javascript:stepBack()"><img class="navbutton" src="images/prev.png"></a>
+    <a href ="javascript:stepBack()"><img class="navbutton" src="images/prev.png" title="back"></a>
-    <a href ="javascript:stepForward()"><img class="navbutton" src="images/next.png"></a>
+    <a href ="javascript:stepForward()"><img class="navbutton" src="images/next.png" title="step"></a>
   </div>
   <div style="float:right; margin-left:20px;">... or try <a href="expert.html">Advanced</a></div>
 </div>
@@ -97,7 +97,7 @@ More information in the <a href="http://visual6502.org/wiki/index.php?title=Jssi
 <br />
 <br />
 Source code is available on <a href="http://github.com/trebonian/visual6502">github visual6502</a>.
-Use the online <a href="http://www.6502asm.com/">emulator and assembler</a> from 6502asm.com
+Use the online <a href="http://skilldrick.github.com/easy6502/#first-program">emulator and assembler</a> from the easy6502 tutorial
 and <a href="http://www.e-tradition.net/bytes/6502/disassembler.html">disassembler</a> from e-tradition.net
 <br />
 For in-depth 6502 investigation and some more advanced features, try our <a href="expert.html">Advanced</a> page.

macros.js

@@ -226,9 +226,10 @@ fetchTriggers={};
 // simulate a single clock phase with no update to graphics or trace
 function halfStep(){
 	var clk = isNodeHigh(nodenames['clk0']);
-	eval(clockTriggers[cycle]);
 	if (clk) {setLow('clk0'); handleBusRead(); } 
 	else {setHigh('clk0'); handleBusWrite();}
+	eval(clockTriggers[cycle+1]);  // pre-apply next tick's inputs now, so the updates are displayed
+
 }
 
 function handleBusRead(){

nodenames.js

@@ -190,7 +190,7 @@ notir4: 26,
 notir5: 1394,
 notir6: 895,
 notir7: 1320,
-irline3: 996,   // internal signal: PLA input - ir0 AND ir1
+irline3: 996,   // internal signal: PLA input - ir0 OR ir1
 clock1: 1536,   // internal state: timing control aka #T0
 clock1: 1536,    // automatic alias replacing hash with tilde
 clock2: 156,    // internal state: timing control aka #T+