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

correct intermediate code output of pointers in arrayvalues

Browse Source
This commit is contained in:
Irmen de Jong 2019-04-10 22:08:21 +02:00
parent ce8853ab50
commit f3c1783bf2
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/src/prog8/compiler/intermediate/IntermediateProgram.kt
View File

@ -459,13 +459,23 @@ class IntermediateProgram(val name: String, var loadAddress: Int, val heap: Heap
out.println("%end_memory") out.println("%end_memory")
out.println("%heap") out.println("%heap")
heap.allEntries().forEach { heap.allEntries().forEach {
out.print("${it.key} ${it.value.type.name.toLowerCase()} ")
when { when {
it.value.str!=null -> it.value.str!=null ->
out.println("${it.key} ${it.value.type.name.toLowerCase()} \"${escape(it.value.str!!)}\"") out.println("\"${escape(it.value.str!!)}\"")
it.value.array!=null -> it.value.array!=null -> {
out.println("${it.key} ${it.value.type.name.toLowerCase()} ${it.value.array!!.toList()}") // this array can contain both normal integers, and pointer values
val arrayvalues = it.value.array!!.map { av ->
when {
av.integer!=null -> av.integer.toString()
av.pointerOf!=null -> "&${av.pointerOf.identifier}"
else -> throw CompilerException("weird array value")
}
}
out.println(arrayvalues)
}
it.value.doubleArray!=null -> it.value.doubleArray!=null ->
out.println("${it.key} ${it.value.type.name.toLowerCase()} ${it.value.doubleArray!!.toList()}") out.println(it.value.doubleArray!!.toList())
else -> throw CompilerException("invalid heap entry $it") else -> throw CompilerException("invalid heap entry $it")
} }
} }

14
examples/test.p8
View File

@ -7,8 +7,8 @@
~ main { ~ main {
sub start() { sub start() {
;aggregates() aggregates()
pointers() ;pointers()
} }
sub aggregates() { sub aggregates() {
@ -51,7 +51,7 @@
c64.CHROUT(' ') c64.CHROUT(' ')
c64scr.print_uw(min(uwa)) c64scr.print_uw(min(uwa))
c64.CHROUT(' ') c64.CHROUT(' ')
c64flt.print_f(min(fa)) ; @todo fix min(floatarray) c64flt.print_f(min(fa)) ; @todo fix min(floatarray) (vm is ok)
c64.CHROUT('\n') c64.CHROUT('\n')
c64scr.print_b(max(ba)) c64scr.print_b(max(ba))
@ -62,7 +62,7 @@
c64.CHROUT(' ') c64.CHROUT(' ')
c64scr.print_uw(max(uwa)) c64scr.print_uw(max(uwa))
c64.CHROUT(' ') c64.CHROUT(' ')
c64flt.print_f(max(fa)) ; @todo fix max(floatarray) c64flt.print_f(max(fa)) ; @todo fix max(floatarray) (vm is ok)
c64.CHROUT('\n') c64.CHROUT('\n')
c64scr.print_uw(sum(ba)) c64scr.print_uw(sum(ba))
@ -110,9 +110,9 @@
;ptrsubasm("moet werken") ; @todo rewrite ast into pointer-of expression (and remove special cases from Compiler) ;ptrsubasm("moet werken") ; @todo rewrite ast into pointer-of expression (and remove special cases from Compiler)
;pointersub("moet werken") ; @todo rewrite ast into pointer-of expression (and remove special cases from Compiler) ;pointersub("moet werken") ; @todo rewrite ast into pointer-of expression (and remove special cases from Compiler)
myprintasm("moet werken3") ;myprintasm("moet werken3")
myprintasm("moet werken3") ;myprintasm("moet werken3")
myprintasm("moet werken4") ;myprintasm("moet werken4")
c64.CHROUT('\n') c64.CHROUT('\n')