6502/go6502
1
0
Fork 0
mirror of https://github.com/zellyn/go6502.git synced 2024-06-25 12:29:33 +00:00
Code Issues Projects Releases Wiki Activity

speedups to visual.go

Browse Source
This commit is contained in:
Zellyn Hunter 2013-03-07 22:34:54 -08:00
parent 9605e2d69f
commit 56959ddcc9
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/functional_test.go
View File

@ -76,7 +76,6 @@ func TestFunctionalTestInstructions(t *testing.T) {
if c.PC() != 0x3CC5 { if c.PC() != 0x3CC5 {
t.Errorf("Stuck at $%04X: 0x%02X", oldPC, m[oldPC]) t.Errorf("Stuck at $%04X: 0x%02X", oldPC, m[oldPC])
} }
fmt.Println(cc, "ticks")
return return
} }
} }

37
visual/visual.go
View File

@ -1,8 +1,6 @@
package visual package visual
import ( import (
"github.com/willf/bitset"
icpu "github.com/zellyn/go6502/cpu" // Just need the interface icpu "github.com/zellyn/go6502/cpu" // Just need the interface
) )
@ -16,9 +14,6 @@ type cpu struct {
nodeC1C2s [NODES][2 * NODES]uint // the list of transistor c1/c2s attached to a node nodeC1C2s [NODES][2 * NODES]uint // the list of transistor c1/c2s attached to a node
transistorValues []bool transistorValues []bool
transistorGates [TRANSISTORS]uint
transistorC1s [TRANSISTORS]uint
transistorC2s [TRANSISTORS]uint
nodeDependantCounts [NODES]uint nodeDependantCounts [NODES]uint
nodeDependants [NODES][NODES]uint // all C1 and C2 nodes of transistors attached to a node nodeDependants [NODES][NODES]uint // all C1 and C2 nodes of transistors attached to a node
@ -26,9 +21,9 @@ type cpu struct {
listIn []uint listIn []uint
listOut []uint listOut []uint
groupList []uint groupList []uint // list of node group membership
groupSet *bitset.BitSet groupSet [NODES/32 + 1]uint32 // quick check for node group membership
groupValue byte groupValue byte // presence of vss/vcc/pulldown/pullup/hi in group
} }
// Bitfield for node values. // Bitfield for node values.
@ -191,11 +186,13 @@ func (c *cpu) switchLists() {
} }
func (c *cpu) addNodeToGroup(n uint) { func (c *cpu) addNodeToGroup(n uint) {
if c.groupSet.Test(n) { index := n >> 5
mask := uint32(1 << (n & 0x1f))
if c.groupSet[index]&mask > 0 {
return return
} }
c.groupSet.Set(n) c.groupSet[index] |= mask
c.groupList = append(c.groupList, n) c.groupList = append(c.groupList, n)
c.groupValue |= c.nodeValues[n] c.groupValue |= c.nodeValues[n]
@ -207,10 +204,10 @@ func (c *cpu) addNodeToGroup(n uint) {
for t := uint(0); t < c.nodeC1C2Counts[n]; t++ { for t := uint(0); t < c.nodeC1C2Counts[n]; t++ {
tn := c.nodeC1C2s[n][t] tn := c.nodeC1C2s[n][t]
if c.transistorValues[tn] { if c.transistorValues[tn] {
if c.transistorC1s[tn] == n { if TransDefs[tn].c1 == n {
c.addNodeToGroup(c.transistorC2s[tn]) c.addNodeToGroup(TransDefs[tn].c2)
} else { } else {
c.addNodeToGroup(c.transistorC1s[tn]) c.addNodeToGroup(TransDefs[tn].c1)
} }
} }
} }
@ -219,7 +216,6 @@ func (c *cpu) addNodeToGroup(n uint) {
func (c *cpu) addAllNodesToGroup(node uint) { func (c *cpu) addAllNodesToGroup(node uint) {
c.groupList = c.groupList[0:0] c.groupList = c.groupList[0:0]
c.groupValue = 0 c.groupValue = 0
c.groupSet.ClearAll()
c.addNodeToGroup(node) c.addNodeToGroup(node)
} }
@ -241,6 +237,7 @@ func (c *cpu) recalcNode(node uint) {
* for the next run * for the next run
*/ */
for _, nn := range c.groupList { for _, nn := range c.groupList {
c.groupSet[nn>>5] = 0 // Clear as we go
if c.nodeValues[nn]&VAL_HI != newv { if c.nodeValues[nn]&VAL_HI != newv {
c.nodeValues[nn] ^= VAL_HI c.nodeValues[nn] ^= VAL_HI
for t := uint(0); t < c.nodeGateCounts[nn]; t++ { for t := uint(0); t < c.nodeGateCounts[nn]; t++ {
@ -370,7 +367,6 @@ func (c *cpu) setupNodesAndTransistors() {
// Zero out bitsets // Zero out bitsets
c.transistorValues = make([]bool, TRANSISTORS) c.transistorValues = make([]bool, TRANSISTORS)
c.groupSet = bitset.New(NODES)
c.groupList = make([]uint, 0, NODES) c.groupList = make([]uint, 0, NODES)
c.nodeValues = make([]byte, NODES) c.nodeValues = make([]byte, NODES)
@ -390,13 +386,6 @@ func (c *cpu) setupNodesAndTransistors() {
} }
} }
// Copy transistor data from TransDefs into r/w data structures
for i, t := range TransDefs {
c.transistorGates[i] = t.gate
c.transistorC1s[i] = t.c1
c.transistorC2s[i] = t.c2
}
// Cross-reference transistors in nodes data structures // Cross-reference transistors in nodes data structures
for j, t := range TransDefs { for j, t := range TransDefs {
i := uint(j) i := uint(j)
@ -413,8 +402,8 @@ func (c *cpu) setupNodesAndTransistors() {
c.nodeDependantCounts[i] = 0 c.nodeDependantCounts[i] = 0
for g := uint(0); g < c.nodeGateCounts[i]; g++ { for g := uint(0); g < c.nodeGateCounts[i]; g++ {
t := c.nodeGates[i][g] t := c.nodeGates[i][g]
c.addNodeDependant(i, c.transistorC1s[t]) c.addNodeDependant(i, TransDefs[t].c1)
c.addNodeDependant(i, c.transistorC2s[t]) c.addNodeDependant(i, TransDefs[t].c2)
} }
} }
} }