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

fix that memory("name", ...) also allocates a STR variable for the name

Browse Source
This commit is contained in:
Irmen de Jong 2022-01-02 17:07:04 +01:00
parent 7bc75fd220
commit 74257163b1
5 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,8 +341,9 @@ class AsmGen(private val program: Program,
}
}
DataType.STR -> {
val str = decl.value as StringLiteralValue
outputStringvar(decl, compTarget.encodeString(str.value, str.altEncoding).plus(0.toUByte()))
throw AssemblyError("all string vars should have been interned")
// val str = decl.value as StringLiteralValue
// outputStringvar(decl, compTarget.encodeString(str.value, str.altEncoding).plus(0.toUByte()))
}
DataType.ARRAY_UB -> {
val data = makeArrayFillDataUnsigned(decl)
@ -435,7 +436,7 @@ class AsmGen(private val program: Program,
val vars = statements.filterIsInstance<VarDecl>().filter { it.type==VarDeclType.VAR }
val encodedstringVars = vars
.filter {it.datatype == DataType.STR }
.filter { it.datatype == DataType.STR && shouldActuallyOutputStringVar(it) }
.map {
val str = it.value as StringLiteralValue
it to compTarget.encodeString(str.value, str.altEncoding).plus(0.toUByte())
@ -456,6 +457,17 @@ class AsmGen(private val program: Program,
}
}
private fun shouldActuallyOutputStringVar(strvar: VarDecl): Boolean {
if(strvar.sharedWithAsm)
return true
val uses = callGraph.usages(strvar)
val onlyInMemoryFuncs = uses.all {
val builtinfunc = (it.parent as? IFunctionCall)?.target?.targetStatement(program) as? BuiltinFunctionPlaceholder
builtinfunc?.name=="memory"
}
return !onlyInMemoryFuncs
}
private fun outputStringvar(strdecl: VarDecl, bytes: List<UByte>) {
val sv = strdecl.value as StringLiteralValue
val altEncoding = if(sv.altEncoding) "@" else ""

8
compiler/test/codegeneration/TestVariables.kt
View File

@ -15,13 +15,13 @@ class TestVariables: FunSpec({
val text = """
main {
sub start() {
ubyte[] @shared array = [1,2,3,4]
str @shared name = "test"
ubyte[] @shared arrayvar = [1,2,3,4]
str @shared stringvar = "test"
ubyte @shared bytevar = 0
%asm {{
lda array
lda name
lda arrayvar
lda stringvar
lda bytevar
}}
}

2
compilerInterfaces/src/prog8/compilerinterface/CallGraph.kt
View File

@ -189,7 +189,7 @@ class CallGraph(private val program: Program) : IAstVisitor {
}
fun usages(decl: VarDecl): List<IdentifierReference> {
if(decl.type!=VarDeclType.VAR || decl.autogeneratedDontRemove || decl.sharedWithAsm)
if(decl.type!=VarDeclType.VAR)
return emptyList()
if(decl.definingBlock !in usedBlocks)

1
docs/source/todo.rst
View File

@ -3,7 +3,6 @@ TODO
For next compiler release (7.6)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- fix that memory("name", ...) allocates a STR variable with contents "name" in the assembly source
- make it possible to inline non-asmsub routines that just contain a single statement (return, functioncall, assignment)
...

4
examples/test.p8
View File

@ -8,6 +8,10 @@ main {
sub start() {
txt.print_uwhex(buffer, true)
txt.print_uwhex(buffer2, true)
txt.print_uwhex("zzzz", true)
str xyz = "irmen"
xyz="2342344234"
txt.print_uwhex(xyz, true)
}
}