Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-03-06 05:29:45 +00:00
Code Issues Projects Releases Wiki Activity

cleanups

Browse Source
This commit is contained in:
Irmen de Jong 2024-12-05 21:56:00 +01:00
parent 1a1ab0dac6
commit 86d4a4309f
6 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codeCore/src/prog8/code/optimize/Optimizer.kt
View File

@ -11,7 +11,7 @@ fun optimizeIntermediateAst(program: PtProgram, options: CompilationOptions, st:
return
while (errors.noErrors() &&
(optimizeBitTest(program, options)
+ optimizeAssignTargets(program, st, errors)) > 0
+ optimizeAssignTargets(program, st)) > 0
) {
// keep rolling
}
@ -27,7 +27,7 @@ private fun walkAst(root: PtNode, act: (node: PtNode, depth: Int) -> Boolean) {
}
private fun optimizeAssignTargets(program: PtProgram, st: SymbolTable, errors: IErrorReporter): Int {
private fun optimizeAssignTargets(program: PtProgram, st: SymbolTable): Int {
var changes = 0
walkAst(program) { node: PtNode, depth: Int ->
if(node is PtAssignment) {

26
codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AugmentableAssignmentAsmGen.kt
View File

@ -2400,12 +2400,10 @@ $shortcutLabel:""")
}
"&" -> {
asmgen.out(" lda $otherName | and $name | sta $name")
if(dt.isWord) {
if(asmgen.isTargetCpu(CpuType.CPU65c02))
asmgen.out(" stz $name+1")
else
asmgen.out(" lda #0 | sta $name+1")
}
if(asmgen.isTargetCpu(CpuType.CPU65c02))
asmgen.out(" stz $name+1")
else
asmgen.out(" lda #0 | sta $name+1")
}
"|" -> asmgen.out(" lda $otherName | ora $name | sta $name")
"^" -> asmgen.out(" lda $otherName | eor $name | sta $name")
@ -2822,12 +2820,10 @@ $shortcutLabel:""")
"&" -> {
asmgen.assignExpressionToRegister(value, RegisterOrPair.A)
asmgen.out(" and $name | sta $name")
if(dt.isWord) {
if(asmgen.isTargetCpu(CpuType.CPU65c02))
asmgen.out(" stz $name+1")
else
asmgen.out(" lda #0 | sta $name+1")
}
if(asmgen.isTargetCpu(CpuType.CPU65c02))
asmgen.out(" stz $name+1")
else
asmgen.out(" lda #0 | sta $name+1")
}
"|" -> {
asmgen.assignExpressionToRegister(value, RegisterOrPair.A)
@ -2896,11 +2892,7 @@ $shortcutLabel:""")
}
"<<", ">>" -> {
if(value is PtNumber && value.number<=255) {
when {
dt.isWord -> TODO("shift a word var by ${value.number}")
dt.isByte -> TODO("shift a byte var by ${value.number}")
else -> throw AssemblyError("weird dt for shift")
}
TODO("shift a word var by ${value.number}")
} else {
throw AssemblyError("shift by a word value not supported, max is a byte")
}

6
compiler/test/TestZeropage.kt
View File

@ -172,7 +172,7 @@ class TestC64Zeropage: FunSpec({
var result = zp.allocate("", DataType.forDt(BaseDataType.FLOAT), null, null, errors)
result.expectError { "expect allocation error: in regular zp there aren't 5 sequential bytes free" }
for (i in 0 until zp.availableBytes()) {
(0 until zp.availableBytes()).forEach {
val alloc = zp.allocate("", DataType.forDt(BaseDataType.UBYTE), null, null, errors)
alloc.getOrElse { throw it }
}
@ -196,7 +196,7 @@ class TestC64Zeropage: FunSpec({
loc shouldNotBeIn zp.free
val num = zp.availableBytes() / 2
for(i in 0..num-3) {
(0..num-3).forEach {
zp.allocate("", DataType.forDt(BaseDataType.UWORD), null, null, errors)
}
zp.availableBytes() shouldBe 5
@ -205,7 +205,7 @@ class TestC64Zeropage: FunSpec({
result = zp.allocate("", DataType.forDt(BaseDataType.UWORD), null, null, errors)
result.expectError { "should give allocation error" }
for(i in 0..4) {
(0..4).forEach {
zp.allocate("", DataType.forDt(BaseDataType.UBYTE), null, null, errors)
}

4
compilerAst/src/prog8/ast/expressions/InferredTypes.kt
View File

@ -11,7 +11,7 @@ object InferredTypes {
require(!(datatype!=null && (isUnknown || isVoid))) { "invalid combination of args" }
}
val isKnown get() = datatype!=null && !datatype!!.isUndefined
val isKnown get() = datatype!=null && !datatype.isUndefined
fun getOr(default: DataType) = if(isUnknown || isVoid) default else datatype!!
fun getOrUndef() = if(isUnknown || isVoid) DataType.forDt(BaseDataType.UNDEFINED) else datatype!!
fun getOrElse(transform: (InferredType) -> DataType): DataType =
@ -21,7 +21,7 @@ object InferredTypes {
false
else if(type==BaseDataType.STR && this.datatype?.base==BaseDataType.STR)
true
else (this.datatype?.base == type && this.datatype?.sub == null) // strict equality if known
else (this.datatype?.base == type && this.datatype.sub == null) // strict equality if known
companion object {
fun unknown() = InferredType(isUnknown = true, isVoid = false, datatype = null)

2
intermediate/src/prog8/intermediate/IRSymbolTable.kt
View File

@ -100,7 +100,7 @@ class IRSymbolTable {
} else {
scopedName = try {
variable.scopedName
} catch (ux: UninitializedPropertyAccessException) {
} catch (_: UninitializedPropertyAccessException) {
variable.name
}
varToadd = IRStMemVar(scopedName, variable.dt, variable.address, variable.length)

1
virtualmachine/src/prog8/vm/VmProgramLoader.kt
View File

@ -56,7 +56,6 @@ class VmProgramLoader {
is IRInlineAsmChunk -> throw IRParseException("encountered unconverted inline assembly chunk")
is IRInlineBinaryChunk -> throw IRParseException("inline binary data not yet supported in the VM")
is IRCodeChunk -> programChunks += chunk
else -> throw AssemblyError("weird chunk type")
}
}
}