Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-12-24 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

fix ubyte2float conversion

Browse Source
This commit is contained in:
Irmen de Jong 2019-01-15 22:16:03 +01:00
parent de4353a93e
commit ee906ba82c
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/res/prog8lib/c64flt.p8
View File

@ -227,7 +227,7 @@ ub2float .proc
; clobbers A, Y ; clobbers A, Y
stx c64.SCRATCH_ZPREGX stx c64.SCRATCH_ZPREGX
sta c64.SCRATCH_ZPWORD2 sta c64.SCRATCH_ZPWORD2
sty c64.SCRATCH_ZPWORD1+1 sty c64.SCRATCH_ZPWORD2+1
ldy c64.SCRATCH_ZPB1 ldy c64.SCRATCH_ZPB1
jsr c64flt.FREADUY jsr c64flt.FREADUY
_fac_to_mem ldx c64.SCRATCH_ZPWORD2 _fac_to_mem ldx c64.SCRATCH_ZPWORD2

30
compiler/src/prog8/compiler/target/c64/AsmGen.kt
View File

@ -147,7 +147,7 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
private fun out(str: String, splitlines: Boolean=true) { private fun out(str: String, splitlines: Boolean=true) {
if(splitlines) { if(splitlines) {
for (line in str.split('\n')) { for (line in str.split('\n')) {
var trimmed = if (line.startsWith(' ')) "\t" + line.trim() else line.trim() val trimmed = if (line.startsWith(' ')) "\t" + line.trim() else line.trim()
// trimmed = trimmed.replace(Regex("^\\+\\s+"), "+\t") // sanitize local label indentation // trimmed = trimmed.replace(Regex("^\\+\\s+"), "+\t") // sanitize local label indentation
assemblyLines.add(trimmed) assemblyLines.add(trimmed)
} }
@ -210,16 +210,16 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
out("; ---- basic program with sys call ----") out("; ---- basic program with sys call ----")
out("* = ${program.loadAddress.toHex()}") out("* = ${program.loadAddress.toHex()}")
val year = Calendar.getInstance().get(Calendar.YEAR) val year = Calendar.getInstance().get(Calendar.YEAR)
out("\t.word (+), $year") out(" .word (+), $year")
out("\t.null $9e, format(' %d ', _prog8_entrypoint), $3a, $8f, ' prog8 by idj'") out(" .null $9e, format(' %d ', _prog8_entrypoint), $3a, $8f, ' prog8 by idj'")
out("+\t.word 0") out("+\t.word 0")
out("_prog8_entrypoint\t; assembly code starts here\n") out("_prog8_entrypoint\t; assembly code starts here\n")
out("\tjsr c64utils.init_system") out(" jsr c64utils.init_system")
} }
options.output == OutputType.PRG -> { options.output == OutputType.PRG -> {
out("; ---- program without sys call ----") out("; ---- program without sys call ----")
out("* = ${program.loadAddress.toHex()}\n") out("* = ${program.loadAddress.toHex()}\n")
out("\tjsr c64utils.init_system") out(" jsr c64utils.init_system")
} }
options.output == OutputType.RAW -> { options.output == OutputType.RAW -> {
out("; ---- raw assembler program ----") out("; ---- raw assembler program ----")
@ -227,9 +227,9 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
} }
} }
out("\tldx #\$ff\t; init estack pointer") out(" ldx #\$ff\t; init estack pointer")
out("\tclc") out(" clc")
out("\tjmp main.start\t; jump to program entrypoint") out(" jmp main.start\t; jump to program entrypoint")
out("") out("")
// the global list of all floating point constants for the whole program // the global list of all floating point constants for the whole program
@ -275,7 +275,7 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
private fun memdefs2asm(block: IntermediateProgram.ProgramBlock) { private fun memdefs2asm(block: IntermediateProgram.ProgramBlock) {
for(m in block.memoryPointers) { for(m in block.memoryPointers) {
out("\t${m.key} = ${m.value.first.toHex()}") out(" ${m.key} = ${m.value.first.toHex()}")
} }
} }
@ -296,7 +296,7 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
val bytes = encodeStr(rawStr, v.second.type).map { "$" + it.toString(16).padStart(2, '0') } val bytes = encodeStr(rawStr, v.second.type).map { "$" + it.toString(16).padStart(2, '0') }
out("${v.first}\t; ${v.second.type} \"${escape(rawStr)}\"") out("${v.first}\t; ${v.second.type} \"${escape(rawStr)}\"")
for (chunk in bytes.chunked(16)) for (chunk in bytes.chunked(16))
out("\t.byte " + chunk.joinToString()) out(" .byte " + chunk.joinToString())
} }
DataType.ARRAY_UB -> { DataType.ARRAY_UB -> {
// unsigned integer byte arrayspec // unsigned integer byte arrayspec
@ -306,7 +306,7 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
else { else {
out(v.first) out(v.first)
for (chunk in data.chunked(16)) for (chunk in data.chunked(16))
out("\t.byte " + chunk.joinToString()) out(" .byte " + chunk.joinToString())
} }
} }
DataType.ARRAY_B -> { DataType.ARRAY_B -> {
@ -317,7 +317,7 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
else { else {
out(v.first) out(v.first)
for (chunk in data.chunked(16)) for (chunk in data.chunked(16))
out("\t.char " + chunk.joinToString()) out(" .char " + chunk.joinToString())
} }
} }
DataType.ARRAY_UW -> { DataType.ARRAY_UW -> {
@ -328,7 +328,7 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
else { else {
out(v.first) out(v.first)
for (chunk in data.chunked(16)) for (chunk in data.chunked(16))
out("\t.word " + chunk.joinToString()) out(" .word " + chunk.joinToString())
} }
} }
DataType.ARRAY_W -> { DataType.ARRAY_W -> {
@ -339,7 +339,7 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
else { else {
out(v.first) out(v.first)
for (chunk in data.chunked(16)) for (chunk in data.chunked(16))
out("\t.sint " + chunk.joinToString()) out(" .sint " + chunk.joinToString())
} }
} }
DataType.ARRAY_F -> { DataType.ARRAY_F -> {
@ -348,7 +348,7 @@ class AsmGen(val options: CompilationOptions, val program: IntermediateProgram,
val floatFills = array.map { makeFloatFill(Mflpt5.fromNumber(it)) } val floatFills = array.map { makeFloatFill(Mflpt5.fromNumber(it)) }
out(v.first) out(v.first)
for(f in array.zip(floatFills)) for(f in array.zip(floatFills))
out("\t.byte ${f.second} ; float ${f.first}") out(" .byte ${f.second} ; float ${f.first}")
} }
} }
} }

1
examples/mandelbrot.p8
View File

@ -36,7 +36,6 @@
} }
} }
; @todo calculation is wrong, gives "1"
float duration = floor(((c64.TIME_LO as float) + 256.0*(c64.TIME_MID as float) + 65536.0*(c64.TIME_HI as float))/60.0) float duration = floor(((c64.TIME_LO as float) + 256.0*(c64.TIME_MID as float) + 65536.0*(c64.TIME_HI as float))/60.0)
c64.PLOT(0, 0, 21) c64.PLOT(0, 0, 21)
c64scr.print("finished in ") c64scr.print("finished in ")