Apple-2-Tools/apple2-go
1
0
Fork 0
mirror of https://github.com/freewilll/apple2-go.git synced 2024-12-22 19:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Added warm reset key combination using ctrl-alt-r

Browse Source
This commit is contained in:
Will Angenent 2018-05-09 10:57:04 +01:00
parent 9c9f826c6a
commit 7d64938630
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/test-apple-iie-boot.go
View File

@ -27,8 +27,30 @@ var (
var cpuState cpu.State var cpuState cpu.State
var showInstructions *bool var showInstructions *bool
var disableBell *bool var disableBell *bool
var resetKeysDown bool
func reset() {
bootVector := 0xfffc
lsb := cpuState.PageTable[bootVector>>8][bootVector&0xff] // TODO move readMemory to mmu
msb := cpuState.PageTable[(bootVector+1)>>8][(bootVector+1)&0xff]
cpuState.PC = uint16(lsb) + uint16(msb)<<8
}
// checkResetKeys check ctrl-alt-R has been pressed. Releasing the R does a warm reset
func checkResetKeys() {
if ebiten.IsKeyPressed(ebiten.KeyControl) && ebiten.IsKeyPressed(ebiten.KeyAlt) && ebiten.IsKeyPressed(ebiten.KeyR) {
resetKeysDown = true
} else if ebiten.IsKeyPressed(ebiten.KeyControl) && ebiten.IsKeyPressed(ebiten.KeyAlt) && !ebiten.IsKeyPressed(ebiten.KeyR) && resetKeysDown {
resetKeysDown = false
reset()
} else {
resetKeysDown = false
}
}
func update(screen *ebiten.Image) error { func update(screen *ebiten.Image) error {
checkResetKeys()
cpu.Run(&cpuState, *showInstructions, nil, *disableBell, 1024000/60) cpu.Run(&cpuState, *showInstructions, nil, *disableBell, 1024000/60)
return vid.DrawTextScreen(cpuState.PageTable, screen, charMap) return vid.DrawTextScreen(cpuState.PageTable, screen, charMap)
} }
@ -45,11 +67,7 @@ func main() {
cpuState.Memory = memory cpuState.Memory = memory
cpuState.PageTable = &memory.PageTable cpuState.PageTable = &memory.PageTable
cpuState.Init() cpuState.Init()
reset()
bootVector := 0xfffc
lsb := cpuState.PageTable[bootVector>>8][bootVector&0xff] // TODO move readMemory to mmu
msb := cpuState.PageTable[(bootVector+1)>>8][(bootVector+1)&0xff]
cpuState.PC = uint16(lsb) + uint16(msb)<<8
var err error var err error
charMap, _, err = ebitenutil.NewImageFromFile("./pr-latin1.png", ebiten.FilterNearest) charMap, _, err = ebitenutil.NewImageFromFile("./pr-latin1.png", ebiten.FilterNearest)