Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-11-29 17:50:35 +00:00
Code Issues Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Irmen de Jong 2019-09-05 01:38:05 +02:00
parent 900c2aea23
commit e46982f652
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sim65/src/components/Cpu6502.kt
View File

@ -16,8 +16,11 @@ interface ICpu {
val totalCycles: Int val totalCycles: Int
} }
// TODO: add additional cycles to certain instructions and addressing modes // TODO: add the optional additional cycles to certain instructions and addressing modes
// TODO: fix sbc and adc with BCD arithmetic. // TODO: fix sbc and adc with BCD arithmetic.
// TODO: add IRQ and NMI signaling.
// TODO: make a 65c02 variant as well (and re-enable the unit tests for that).
class Cpu6502(private val illegalInstrsAllowed: Boolean) : BusComponent(), ICpu { class Cpu6502(private val illegalInstrsAllowed: Boolean) : BusComponent(), ICpu {
override var tracing: Boolean = false override var tracing: Boolean = false
@ -33,7 +36,7 @@ class Cpu6502(private val illegalInstrsAllowed: Boolean) : BusComponent(), ICpu
fun hexW(number: Address, allowSingleByte: Boolean = false): String { fun hexW(number: Address, allowSingleByte: Boolean = false): String {
val msb = number ushr 8 val msb = number ushr 8
val lsb = number and 255 val lsb = number and 255
return if(msb==0 && allowSingleByte) return if (msb == 0 && allowSingleByte)
hexB(lsb) hexB(lsb)
else else
hexB(msb) + hexB(lsb) hexB(msb) + hexB(lsb)
@ -106,9 +109,9 @@ class Cpu6502(private val illegalInstrsAllowed: Boolean) : BusComponent(), ICpu
override fun hashCode(): Int = asByte().toInt() override fun hashCode(): Int = asByte().toInt()
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {
if(other !is StatusRegister) if (other !is StatusRegister)
return false return false
return asByte()==other.asByte() return asByte() == other.asByte()
} }
} }
@ -276,9 +279,9 @@ class Cpu6502(private val illegalInstrsAllowed: Boolean) : BusComponent(), ICpu
override fun step() { override fun step() {
// step a whole instruction // step a whole instruction
while(instrCycles>0) clock() // remaining instruction subcycles from the previous instruction while (instrCycles > 0) clock() // remaining instruction subcycles from the previous instruction
clock() // the actual instruction execution cycle clock() // the actual instruction execution cycle
while(instrCycles>0) clock() // instruction subcycles while (instrCycles > 0) clock() // instruction subcycles
} }
fun printState() { fun printState() {
@ -384,9 +387,9 @@ class Cpu6502(private val illegalInstrsAllowed: Boolean) : BusComponent(), ICpu
} }
private fun getFetched(): Int { private fun getFetched(): Int {
return if(currentInstruction.mode==AddrMode.Imm || return if (currentInstruction.mode == AddrMode.Imm ||
currentInstruction.mode==AddrMode.Acc || currentInstruction.mode == AddrMode.Acc ||
currentInstruction.mode==AddrMode.Imp) currentInstruction.mode == AddrMode.Imp)
fetchedData fetchedData
else else
read(fetchedAddress) read(fetchedAddress)
@ -700,10 +703,10 @@ class Cpu6502(private val illegalInstrsAllowed: Boolean) : BusComponent(), ICpu
if (lo and 0xff > 9) lo += 6 if (lo and 0xff > 9) lo += 6
var hi = (A shr 4) + (operand shr 4) + if (lo > 15) 1 else 0 var hi = (A shr 4) + (operand shr 4) + if (lo > 15) 1 else 0
if (hi and 0xff > 9) hi += 6 if (hi and 0xff > 9) hi += 6
var result = lo and 0x0f or (hi shl 4) val result = lo and 0x0f or (hi shl 4)
result = result and 0xff A = result and 0xff
Status.C = hi > 15 Status.C = hi > 15
Status.Z = result == 0 Status.Z = A == 0
Status.V = false // BCD never sets overflow flag Status.V = false // BCD never sets overflow flag
Status.N = false // BCD is never negative on NMOS 6502 (bug) Status.N = false // BCD is never negative on NMOS 6502 (bug)
} else { } else {
@ -873,7 +876,7 @@ class Cpu6502(private val illegalInstrsAllowed: Boolean) : BusComponent(), ICpu
} }
private fun iJsr() { private fun iJsr() {
pushStackAddr(PC-1) pushStackAddr(PC - 1)
PC = fetchedAddress PC = fetchedAddress
} }
@ -983,7 +986,7 @@ class Cpu6502(private val illegalInstrsAllowed: Boolean) : BusComponent(), ICpu
private fun iRts() { private fun iRts() {
PC = popStackAddr() PC = popStackAddr()
PC = (PC+1) and 0xffff PC = (PC + 1) and 0xffff
} }
private fun iSbc() { private fun iSbc() {
@ -991,10 +994,10 @@ class Cpu6502(private val illegalInstrsAllowed: Boolean) : BusComponent(), ICpu
if (Status.D) { if (Status.D) {
var lo = (A and 0x0f) - (operand and 0x0f) - if (Status.C) 0 else 1 var lo = (A and 0x0f) - (operand and 0x0f) - if (Status.C) 0 else 1
if (lo and 0x10 != 0) lo -= 6 if (lo and 0x10 != 0) lo -= 6
var h = (A shr 4) - (operand shr 4) - if (lo and 0x10 != 0) 1 else 0 var hi = (A shr 4) - (operand shr 4) - if (lo and 0x10 != 0) 1 else 0
if (h and 0x10 != 0) h -= 6 if (hi and 0x10 != 0) hi -= 6
val result = lo and 0x0f or ((h shl 4) and 0xff) val result = lo and 0x0f or ((hi shl 4) and 0xff)
Status.C = h and 255 < 15 Status.C = hi and 255 < 15
Status.Z = result == 0 Status.Z = result == 0
Status.V = false // BCD never sets overflow flag Status.V = false // BCD never sets overflow flag
Status.N = false // BCD is never negative on NMOS 6502 (bug) Status.N = false // BCD is never negative on NMOS 6502 (bug)