Skip to content

Commit 3caf910

Browse files
committed
finalizing 9.4.1 release
1 parent bde4be8 commit 3caf910

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

codeCore/src/prog8/code/target/pet/PETZeropage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ class PETZeropage(options: CompilationOptions) : Zeropage(options) {
5353
}
5454

5555
override fun allocateCx16VirtualRegisters() {
56-
TODO("Not known if C128 can put the virtual regs in ZP")
56+
TODO("Not known if PET can put the virtual regs in ZP")
5757
}
5858
}

codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AugmentableAssignmentAsmGen.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ internal class AugmentableAssignmentAsmGen(private val program: PtProgram,
5757
// the asm-gen code can deal with situations where you want to assign a byte into a word.
5858
// it will create the most optimized code to do this (so it type-extends for us).
5959
// But we can't deal with writing a word into a byte - explicit typeconversion should be done
60-
if(program.memsizer.memorySize(value.datatype) > program.memsizer.memorySize(target.datatype)) {
61-
TODO("missing type cast: value type > target type ${target.position}")
62-
}
60+
if(program.memsizer.memorySize(value.datatype) > program.memsizer.memorySize(target.datatype))
61+
throw AssemblyError("missing type cast: value type > target type ${target.position}")
6362

6463
fun regName(v: AsmAssignSource) = "cx16.${v.register!!.name.lowercase()}"
6564

compiler/res/prog8lib/cx16/syslib.p8

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ romsub $febd = kbdbuf_peek() -> ubyte @A, ubyte @X ; key in A, queue length
395395
romsub $febd = kbdbuf_peek2() -> uword @AX ; alternative to above to not have the hassle to deal with multiple return values
396396
romsub $fec0 = kbdbuf_get_modifiers() -> ubyte @A
397397
romsub $fec3 = kbdbuf_put(ubyte key @A) clobbers(X)
398+
romsub $fed2 = keymap(uword identifier @XY, bool read @Pc) -> bool @Pc
398399
romsub $ff68 = mouse_config(ubyte shape @A, ubyte resX @X, ubyte resY @Y) clobbers (A, X, Y)
399400
romsub $ff6b = mouse_get(ubyte zpdataptr @X) -> ubyte @A
400401
romsub $ff71 = mouse_scan() clobbers(A, X, Y)
@@ -403,10 +404,10 @@ romsub $ff56 = joystick_get(ubyte joynr @A) -> ubyte @A, ubyte @X, ubyte @Y
403404
romsub $ff56 = joystick_get2(ubyte joynr @A) clobbers(Y) -> uword @AX ; alternative to above to not have the hassle to deal with multiple return values
404405

405406
; Audio (rom bank 10)
406-
romsub $C04B = psg_init() clobbers(A,X,Y)
407+
romsub $C04B = psg_init() clobbers(A,X,Y) ; (re)init Vera PSG
407408
romsub $C063 = ym_init() clobbers(A,X,Y) -> bool @Pc ; (re)init YM chip
408409
romsub $C066 = ym_loaddefpatches() clobbers(A,X,Y) -> bool @Pc ; load default YM patches
409-
romsub $C09F = audio_init() clobbers(A,X,Y) -> bool @Pc ; (re)initialize PSG and YM audio chips
410+
romsub $C09F = audio_init() clobbers(A,X,Y) -> bool @Pc ; (re)initialize both vera PSG and YM audio chips
410411
; TODO: add more of the audio routines?
411412

412413

compiler/src/prog8/compiler/astprocessing/NotExpressionAndIfComparisonExprChanger.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ internal class NotExpressionAndIfComparisonExprChanger(val program: Program, val
143143

144144
private fun simplifyConditionalExpression(expr: BinaryExpression): CondExprSimplificationResult {
145145

146-
// TODO: somehow figure out if the expr will result in stack-evaluation STILL after being split off,
147-
// in that case: do *not* split it off but just keep it as it is (otherwise code size increases)
148146
// NOTE: do NOT move this to an earler ast transform phase (such as StatementReorderer or StatementOptimizer) - it WILL result in larger code.
149147

150148
if(compTarget.name == VMTarget.NAME) // don't apply this optimization for Vm target

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ org.gradle.daemon=true
55
kotlin.code.style=official
66
javaVersion=11
77
kotlinVersion=1.9.10
8-
version=9.5-SNAPSHOT
8+
version=9.4.1

0 commit comments

Comments
 (0)