6502
/
i6502
mirror of https://github.com/ariejan/i6502.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'broken_range' of https://github.com/marcopeereboom/i6502 into marcopeereboom-broken_range

This commit is contained in:
Ariejan de Vroom 2015-04-09 09:25:43 +02:00
parent 36197e2ba8 43f3d06988
commit a0f722e9ee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
address_bus.go
View File

@ -11,7 +11,7 @@ address space of the Cpu to the relative memory addressing of
each component.
*/
type AddressBus struct {
addressables []addressable // Different components
addressables []*addressable // Different components
}
type addressable struct {
@ -26,7 +26,7 @@ func (a *addressable) String() string {
// Creates a new, empty 16-bit AddressBus
func NewAddressBus() (*AddressBus, error) {
return &AddressBus{addressables: make([]addressable, 0)}, nil
return &AddressBus{addressables: make([]*addressable, 0)}, nil
}
// Returns a string with details about the AddressBus and attached memory
@ -54,7 +54,7 @@ func (a *AddressBus) Attach(memory Memory, offset uint16) {
end := offset + memory.Size() - 1
addressable := addressable{memory: memory, start: start, end: end}
a.addressables = append(a.addressables, addressable)
a.addressables = append(a.addressables, &addressable)
}
/*
@ -112,7 +112,7 @@ func (a *AddressBus) Write16(address uint16, data uint16) {
func (a *AddressBus) addressableForAddress(address uint16) (*addressable, error) {
for _, addressable := range a.addressables {
if addressable.start <= address && addressable.end >= address {
return &addressable, nil
return addressable, nil
}
}