Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-10-18 01:24:51 +00:00
Code Issues Projects Releases Wiki Activity

pipe expression not evaluated via stack

Browse Source
This commit is contained in:
Irmen de Jong 2022-01-08 17:51:23 +01:00
parent 7135205299
commit 9e5e3d1559
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
codeGeneration/src/prog8/codegen/target/cpu6502/codegen/AsmGen.kt
View File

@ -3413,7 +3413,6 @@ $label nop""")
} }
internal fun translatePipeExpression(expressions: Iterable<Expression>, scope: Node, isStatement: Boolean, pushResultOnEstack: Boolean) { internal fun translatePipeExpression(expressions: Iterable<Expression>, scope: Node, isStatement: Boolean, pushResultOnEstack: Boolean) {
// NOTE:
// TODO more efficient code generation to avoid needless assignments to the temp var // TODO more efficient code generation to avoid needless assignments to the temp var

14
codeGeneration/src/prog8/codegen/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt
View File

@ -276,12 +276,14 @@ internal class AssignmentAsmGen(private val program: Program, private val asmgen
assignRegisterByte(assign.target, CpuRegister.A) assignRegisterByte(assign.target, CpuRegister.A)
} }
is PipeExpression -> { is PipeExpression -> {
// TODO NOT VIA STACK!! asmgen.translatePipeExpression(value.expressions, value, false, false)
asmgen.translateExpression(value) val resultDt = value.inferType(program)
if (assign.target.datatype in WordDatatypes && assign.source.datatype in ByteDatatypes) val register =
asmgen.signExtendStackLsb(assign.source.datatype) if(resultDt.isBytes) RegisterOrPair.A
if(assign.target.kind!=TargetStorageKind.STACK || assign.target.datatype != assign.source.datatype) else if(resultDt.isWords) RegisterOrPair.AY
assignStackValue(assign.target) else if(resultDt istype DataType.FLOAT) RegisterOrPair.FAC1
else throw AssemblyError("invalid dt")
asmgen.assignRegister(register, assign.target)
} }
else -> { else -> {
// Everything else just evaluate via the stack. // Everything else just evaluate via the stack.

10
examples/test.p8
View File

@ -5,11 +5,11 @@
main { main {
sub start() { sub start() {
; float @shared f1 float @shared f1
;
; f1 = 1.234 |> addfloat1 |> addfloat2 |> addfloat3 ; TODO fix that the value is actually returned f1 = 1.234 |> addfloat1 |> addfloat2 |> addfloat3 ; TODO fix that the value is actually returned
; floats.print_f(f1) floats.print_f(f1)
; txt.nl() txt.nl()
; 1.234 |> addfloat1 ; 1.234 |> addfloat1
; |> addfloat2 |> addfloat3 |> floats.print_f ; |> addfloat2 |> addfloat3 |> floats.print_f
; txt.nl() ; txt.nl()