thequux/jdp11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Got another 40 insns into EKBA. Now at 247

Browse Source
This commit is contained in:
TQ Hirsch
2023-09-19 23:11:06 +02:00
parent aee3672252
commit 82498e0c19
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/kotlin/com/thequux/mcpdp/core/CPU.kt
View File

@@ -7,7 +7,6 @@ import com.thequux.mcpdp.util.ProgrammerError
import org.slf4j.Logger import org.slf4j.Logger
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import java.lang.StringBuilder import java.lang.StringBuilder
import kotlin.math.log
/// The main CPU /// The main CPU
/// ///
@@ -607,8 +606,10 @@ class CPU(val mbus: MemBus) {
val dst = opc_dst(opcode) val dst = opc_dst(opcode)
val res = op_loadw(dst) and op_loadw(src) val res = op_loadw(dst) and op_loadw(src)
N = res bit 15 N = res bit 15
Z = res != 0u.toUShort() Z = res == 0u.toUShort()
V = false V = false
logger.debug("RV: ${dst.toString(16)} RES: ${res.toString(16)}, SRC: ${op_loadw(src).toString(16)}")
debugFlags()
} // BIT } // BIT
0x4000 -> { // BIC 0x4000 -> { // BIC
val src = opc_src(opcode) val src = opc_src(opcode)
@@ -616,7 +617,7 @@ class CPU(val mbus: MemBus) {
val res = op_loadw(dst) and op_loadw(src).inv() val res = op_loadw(dst) and op_loadw(src).inv()
op_storw(dst, res) op_storw(dst, res)
N = res bit 15 N = res bit 15
Z = res != 0u.toUShort() Z = res == 0u.toUShort()
V = false V = false
} // BIC } // BIC
0x5000 -> { // BIS 0x5000 -> { // BIS
@@ -625,7 +626,7 @@ class CPU(val mbus: MemBus) {
val res = op_loadw(dst) or op_loadw(src) val res = op_loadw(dst) or op_loadw(src)
op_storw(dst, res) op_storw(dst, res)
N = res and 0x8000u != 0u.toUShort() N = res and 0x8000u != 0u.toUShort()
Z = res != 0u.toUShort() Z = res == 0u.toUShort()
V = false V = false
} // BIS } // BIS
0x6000 -> { // ADD 0x6000 -> { // ADD
@@ -744,16 +745,21 @@ class CPU(val mbus: MemBus) {
0x9000 -> { // MOVB 0x9000 -> { // MOVB
val src = opc_srcb(opcode) val src = opc_srcb(opcode)
val dst = opc_dstb(opcode) val dst = opc_dstb(opcode)
op_loadb(src).also { var dstv = op_loadb(src)
if (dst bit 32) {
op_storw(dst, it.toUShort() sex 8) var dstw = if (is_paddr_reg(dst)) {
} else { op_storw(dst, dstv.toUShort() sex 8)
op_storb(dst, it) dstv.toUShort() sex 8
} } else {
N = it bit 15 op_storb(dst, dstv)
Z = it == 0.toUByte() dstv.toUShort()
V = false
} }
N = dstv bit 7
Z = dstv == 0.toUByte()
V = false
logger.debug("RV: ${dst.toString(16)} RES: ${dstw.toString(16)}, SRC: ${dstv.toString(16)}")
debugFlags()
} // MOVB } // MOVB
0xA000 -> { // CMPB 0xA000 -> { // CMPB
val src = op_loadb(opc_srcb(opcode)) val src = op_loadb(opc_srcb(opcode))
@@ -778,7 +784,7 @@ class CPU(val mbus: MemBus) {
val res = op_loadb(dst) and op_loadb(src).inv() val res = op_loadb(dst) and op_loadb(src).inv()
op_storb(dst, res) op_storb(dst, res)
N = res bit 7 N = res bit 7
Z = res != 0u.toUByte() Z = res == 0u.toUByte()
V = false V = false
} // BICB } // BICB
0xD000 -> { // BISB 0xD000 -> { // BISB
@@ -787,7 +793,7 @@ class CPU(val mbus: MemBus) {
val res = op_loadb(dst) or op_loadb(src) val res = op_loadb(dst) or op_loadb(src)
op_storb(dst, res) op_storb(dst, res)
N = res bit 7 N = res bit 7
Z = res != 0u.toUByte() Z = res == 0u.toUByte()
V = false V = false
} // BISB } // BISB
0xE000 -> { 0xE000 -> {

4
src/main/kotlin/com/thequux/mcpdp/ext/bit/bitext.kt
View File

@@ -46,8 +46,8 @@ inline fun UShort.bit(n: Int, v: Boolean): UShort = if (v) this bis n else this
inline infix fun UShort.bis(n: Int): UShort = this.toUInt().or(1U shl n).toUShort() inline infix fun UShort.bis(n: Int): UShort = this.toUInt().or(1U shl n).toUShort()
inline infix fun UShort.bic(n: Int): UShort = this.toUInt().and(1U.shl(n).inv()).toUShort() inline infix fun UShort.bic(n: Int): UShort = this.toUInt().and(1U.shl(n).inv()).toUShort()
inline infix fun UShort.sex(n: Int): UShort { inline infix fun UShort.sex(n: Int): UShort {
val sign = 1.toUShort() shl n+1 val sign = 1.toUShort() shl (n-1)
return ((this and sign.dec()) - (this and sign)).toUShort() return (this - (this and sign shl 1)).toUShort()
} }
inline fun UShort.maskSet(v: UShort, mask: UShort) = this and mask.inv() or (v and mask) inline fun UShort.maskSet(v: UShort, mask: UShort) = this and mask.inv() or (v and mask)

11
src/main/kotlin/com/thequux/mcpdp/util/DebugTools.kt
View File

@@ -116,8 +116,17 @@ class Disassembler(val core: VAddressSpace) {
in 0x40..0x7f -> fmt("JMP", dst()) // JMP in 0x40..0x7f -> fmt("JMP", dst()) // JMP
in 0x80..0x87 -> fmt("RTS", reg0()) // RTS in 0x80..0x87 -> fmt("RTS", reg0()) // RTS
in 0x98..0x9F -> fmt("SPL", (opcode and 7).toString()) in 0x98..0x9F -> fmt("SPL", (opcode and 7).toString())
0xAF -> fmt("CCC")
in 0xA0..0xAE -> {
val items: ArrayList<String> = ArrayList()
if (opcode bit 0) items.add("CLC")
if (opcode bit 1) items.add("CLZ")
if (opcode bit 2) items.add("CLV")
if (opcode bit 3) items.add("CLN")
fmt(items.joinToString(" "))
} // Scc/Ccc
0xBF -> fmt("SCC") 0xBF -> fmt("SCC")
in 0xA0..0xBE -> { in 0xB0..0xBE -> {
val items: ArrayList<String> = ArrayList() val items: ArrayList<String> = ArrayList()
if (opcode bit 0) items.add("SEC") if (opcode bit 0) items.add("SEC")
if (opcode bit 1) items.add("SEZ") if (opcode bit 1) items.add("SEZ")