diff --git a/src/main/kotlin/razorvine/ksim65/Assembler.kt b/src/main/kotlin/razorvine/ksim65/Assembler.kt index 584eada..8b9268b 100644 --- a/src/main/kotlin/razorvine/ksim65/Assembler.kt +++ b/src/main/kotlin/razorvine/ksim65/Assembler.kt @@ -49,7 +49,6 @@ class Assembler(cpu: Cpu6502, val memory: MemMappedComponent, initialStartAddres fun assemble(lines: Iterable): Result { for(line in lines) { val result = assemble(line) - println("line: $line -> ${result.success} ${result.error}") // TODO if(!result.success) return result assembledSize += result.numBytes diff --git a/src/main/kotlin/razorvine/ksim65/Monitor.kt b/src/main/kotlin/razorvine/ksim65/Monitor.kt index 8b1cab4..5acb523 100644 --- a/src/main/kotlin/razorvine/ksim65/Monitor.kt +++ b/src/main/kotlin/razorvine/ksim65/Monitor.kt @@ -83,7 +83,8 @@ class Monitor(val bus: Bus, val cpu: Cpu6502) { IVirtualMachine.MonitorCmdResult("", "", true) } 'a' -> { - val address = 0 // TODO parse from line + val parts = command.substring(1).trim().split(' ') + val address = if(parts.size>=2) Assembler.parseNumber(parts[0]) else 0 val assembler = Assembler(cpu, bus.memoryComponentFor(address), address) val result = assembler.assemble(command.substring(1).trimStart()) if(result.success) {