mirror of
https://github.com/irmen/ksim65.git
synced 2024-06-06 22:29:33 +00:00
kotlin 1.7.10
This commit is contained in:
parent
87c7aad49a
commit
5cc3f8fddd
|
@ -5,7 +5,7 @@ import kotlin.math.max
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
// Apply the Kotlin JVM plugin to add support for Kotlin on the JVM.
|
// 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`
|
`maven-publish`
|
||||||
application
|
application
|
||||||
java
|
java
|
||||||
|
@ -37,6 +37,7 @@ allprojects {
|
||||||
dependencies {
|
dependencies {
|
||||||
// Align versions of all Kotlin components
|
// Align versions of all Kotlin components
|
||||||
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
|
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
|
||||||
|
implementation("org.jetbrains.kotlin:kotlin-reflect")
|
||||||
|
|
||||||
// Use the Kotlin JDK 8 standard library.
|
// Use the Kotlin JDK 8 standard library.
|
||||||
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
|
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
|
||||||
|
|
|
@ -188,9 +188,7 @@ open class Cpu6502 : BusComponent() {
|
||||||
|
|
||||||
regPC++
|
regPC++
|
||||||
instrCycles = currentInstruction.cycles
|
instrCycles = currentInstruction.cycles
|
||||||
val extraCycleFromAddr = applyAddressingMode(currentInstruction.mode)
|
if(applyAddressingMode(currentInstruction.mode) and dispatchOpcode(currentOpcode))
|
||||||
val extraCycleFromInstr = dispatchOpcode(currentOpcode)
|
|
||||||
if(extraCycleFromAddr and extraCycleFromInstr)
|
|
||||||
instrCycles++
|
instrCycles++
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user