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

kotlin 1.7.10

This commit is contained in:
Irmen de Jong 2022-08-13 21:24:12 +02:00
parent 87c7aad49a
commit 5cc3f8fddd
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle.kts
View File

@ -5,7 +5,7 @@ import kotlin.math.max
plugins {
// Apply the Kotlin JVM plugin to add support for Kotlin on the JVM.
kotlin("jvm") version "1.6.10"
kotlin("jvm") version "1.7.10"
`maven-publish`
application
java
@ -37,6 +37,7 @@ allprojects {
dependencies {
// Align versions of all Kotlin components
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation("org.jetbrains.kotlin:kotlin-reflect")
// Use the Kotlin JDK 8 standard library.
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

4
src/main/kotlin/razorvine/ksim65/Cpu6502.kt
View File

@ -188,9 +188,7 @@ open class Cpu6502 : BusComponent() {
regPC++
instrCycles = currentInstruction.cycles
val extraCycleFromAddr = applyAddressingMode(currentInstruction.mode)
val extraCycleFromInstr = dispatchOpcode(currentOpcode)
if(extraCycleFromAddr and extraCycleFromInstr)
if(applyAddressingMode(currentInstruction.mode) and dispatchOpcode(currentOpcode))
instrCycles++
}