Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-11-20 03:32:05 +00:00
Code Issues Projects Releases Wiki Activity

vm: fix mul and div instructions

Browse Source
This commit is contained in:
Irmen de Jong 2022-05-04 01:10:59 +02:00
parent 0f9e87d7bb
commit 3f9cdd9b56
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codeGenVirtual/src/prog8/codegen/virtual/CodeGen.kt
View File

@ -388,6 +388,7 @@ class CodeGen(internal val program: PtProgram,
code += VmCodeInstruction(Opcode.LOAD, VmDataType.FLOAT, fpReg1 = fpReg, fpValue = 0f) code += VmCodeInstruction(Opcode.LOAD, VmDataType.FLOAT, fpReg1 = fpReg, fpValue = 0f)
} else { } else {
val factorReg = vmRegisters.nextFreeFloat() val factorReg = vmRegisters.nextFreeFloat()
code += VmCodeInstruction(Opcode.LOAD, VmDataType.FLOAT, fpReg1=factorReg, fpValue = factor)
code += VmCodeInstruction(Opcode.MUL, VmDataType.FLOAT, fpReg1 = fpReg, fpReg2 = fpReg, fpReg3 = factorReg) code += VmCodeInstruction(Opcode.MUL, VmDataType.FLOAT, fpReg1 = fpReg, fpReg2 = fpReg, fpReg3 = factorReg)
} }
return code return code
@ -430,6 +431,7 @@ class CodeGen(internal val program: PtProgram,
code += VmCodeInstruction(Opcode.LOAD, VmDataType.FLOAT, fpReg1 = fpReg, fpValue = Float.MAX_VALUE) code += VmCodeInstruction(Opcode.LOAD, VmDataType.FLOAT, fpReg1 = fpReg, fpValue = Float.MAX_VALUE)
} else { } else {
val factorReg = vmRegisters.nextFreeFloat() val factorReg = vmRegisters.nextFreeFloat()
code += VmCodeInstruction(Opcode.LOAD, VmDataType.FLOAT, fpReg1=factorReg, fpValue = factor)
code += VmCodeInstruction(Opcode.DIV, VmDataType.FLOAT, fpReg1 = fpReg, fpReg2 = fpReg, fpReg3 = factorReg) code += VmCodeInstruction(Opcode.DIV, VmDataType.FLOAT, fpReg1 = fpReg, fpReg2 = fpReg, fpReg3 = factorReg)
} }
return code return code

1
docs/source/todo.rst
View File

@ -4,7 +4,6 @@ TODO
For next release For next release
^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^
- vm: implement float any, all, reverse, sort - vm: implement float any, all, reverse, sort
- vm: fix test fp calc result being 0
- vm: get rid of intermediate floats.xxx() functions somehow, instead generate the float instructions directly? - vm: get rid of intermediate floats.xxx() functions somehow, instead generate the float instructions directly?
- pipe operator: allow non-unary function calls in the pipe that specify the other argument(s) in the calls. - pipe operator: allow non-unary function calls in the pipe that specify the other argument(s) in the calls.
- allow "xxx" * constexpr (where constexpr is not a number literal), now gives expression error not same type - allow "xxx" * constexpr (where constexpr is not a number literal), now gives expression error not same type

31
examples/test.p8
View File

@ -10,29 +10,14 @@ main {
sub start() { sub start() {
float fl = 42.123 float fl = 42.123
float fl2 = fl / 1.0 float fl2 = fl / 1.0
txt.print_ub(fl2 as ubyte) txt.print("rad 180 = ")
txt.nl() floats.print_f(floats.rad(180.0))
txt.print_uw(fl2 as uword) txt.print("\nrad 360 = ")
txt.nl() floats.print_f(floats.rad(360.0))
byte bb = fl2 as byte txt.print("\ndeg 2 = ")
txt.print_b(bb) floats.print_f(floats.deg(2.0))
txt.nl() txt.print("\ndeg pi = ")
txt.print_b(fl2 as byte) floats.print_f(floats.deg(floats.PI))
txt.nl()
txt.print_w(fl2 as word)
txt.nl()
word ww = fl2 as word
txt.print_w(ww)
txt.nl()
; txt.print("rad 180 = ")
; floats.print_f(floats.rad(180.0))
; txt.print("rad 360 = ")
; floats.print_f(floats.rad(360.0))
; txt.print("deg 2 = ")
; floats.print_f(floats.deg(2.0))
; txt.print("deg pi = ")
; floats.print_f(floats.deg(floats.PI))
sys.exit(42) sys.exit(42)
; floats.print_f(-42.42) ; floats.print_f(-42.42)
; float f1 = 1.2345 ; float f1 = 1.2345