Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-02-16 22:30:46 +00:00
Code Issues Projects Releases Wiki Activity

* fix #54 / step 2: the path stated with assembler directive .binary must be *relative to the .asm file*, not the working directory

Browse Source
This commit is contained in:
meisl 2021-07-17 12:17:31 +02:00
parent 23c99002c0
commit 402884b5ce
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt
View File

@ -1309,19 +1309,26 @@ $repeatLabel lda $counterVar
} }
} }
/**
* TODO: %asminclude and %asmbinary should be done earlier than code gen (-> put content into AST)
*/
private fun translate(stmt: Directive) { private fun translate(stmt: Directive) {
when(stmt.directive) { when(stmt.directive) {
"%asminclude" -> { "%asminclude" -> {
val sourcecode = loadAsmIncludeFile(stmt.args[0].str!!, stmt.definingModule().source) val includedName = stmt.args[0].str!!
val sourcePath = stmt.definingModule().source // FIXME: %asminclude inside non-library, non-filesystem module
val sourcecode = loadAsmIncludeFile(includedName, sourcePath)
assemblyLines.add(sourcecode.trimEnd().trimStart('\n')) assemblyLines.add(sourcecode.trimEnd().trimStart('\n'))
} }
"%asmbinary" -> { "%asmbinary" -> {
val includedName = stmt.args[0].str!! val includedName = stmt.args[0].str!!
val offset = if(stmt.args.size>1) ", ${stmt.args[1].int}" else "" val offset = if(stmt.args.size>1) ", ${stmt.args[1].int}" else ""
val length = if(stmt.args.size>2) ", ${stmt.args[2].int}" else "" val length = if(stmt.args.size>2) ", ${stmt.args[2].int}" else ""
val includedPath = stmt.definingModule().source.resolveSibling(includedName) val sourcePath = stmt.definingModule().source // FIXME: %asmbinary inside non-library, non-filesystem module
val pathForAssembler = Paths.get("") val includedPath = sourcePath.resolveSibling(includedName)
.absolute() // avoid IllegalArgumentExc in case non-absolute path .relativize(absolute path)
val pathForAssembler = outputDir // 64tass needs the path *relative to the .asm file*
.absolute() // avoid IllegalArgumentExc due to non-absolute path .relativize(absolute path)
.relativize(includedPath) .relativize(includedPath)
out(" .binary \"$pathForAssembler\" $offset $length") out(" .binary \"$pathForAssembler\" $offset $length")
} }