diff --git a/codeGenVirtual/src/prog8/codegen/virtual/ExpressionGen.kt b/codeGenVirtual/src/prog8/codegen/virtual/ExpressionGen.kt index 4f4143338..ed82dc614 100644 --- a/codeGenVirtual/src/prog8/codegen/virtual/ExpressionGen.kt +++ b/codeGenVirtual/src/prog8/codegen/virtual/ExpressionGen.kt @@ -283,8 +283,8 @@ internal class ExpressionGen(private val codeGen: CodeGen) { "^", "xor" -> operatorXor(binExpr, vmDt, resultRegister) "<<" -> operatorShiftLeft(binExpr, vmDt, resultRegister) ">>" -> operatorShiftRight(binExpr, vmDt, resultRegister, signed) - "==" -> operatorEquals(binExpr, vmDt, resultRegister, true) - "!=" -> operatorEquals(binExpr, vmDt, resultRegister, false) + "==" -> operatorEquals(binExpr, vmDt, resultRegister, false) + "!=" -> operatorEquals(binExpr, vmDt, resultRegister, true) "<" -> operatorLessThan(binExpr, vmDt, resultRegister, signed, false) ">" -> operatorGreaterThan(binExpr, vmDt, resultRegister, signed, false) "<=" -> operatorLessThan(binExpr, vmDt, resultRegister, signed, true) diff --git a/compiler/res/prog8lib/virtual/conv.p8 b/compiler/res/prog8lib/virtual/conv.p8 index b1ddaa17c..652b37666 100644 --- a/compiler/res/prog8lib/virtual/conv.p8 +++ b/compiler/res/prog8lib/virtual/conv.p8 @@ -219,7 +219,6 @@ sub str2word(str string) -> word { sub hex2uword(str string) -> uword { ; -- hexadecimal string (with or without '$') to uword. ; stops parsing at the first character that's not a hex digit (except leading $) - ; TODO fix this result uword result ubyte char if @(string)=='$' @@ -240,7 +239,6 @@ sub hex2uword(str string) -> uword { sub bin2uword(str string) -> uword { ; -- binary string (with or without '%') to uword. ; stops parsing at the first character that's not a 0 or 1. (except leading %) - ; TODO fix this result uword result ubyte char if @(string)=='%' diff --git a/docs/source/todo.rst b/docs/source/todo.rst index 7961a9b64..44104dfb4 100644 --- a/docs/source/todo.rst +++ b/docs/source/todo.rst @@ -3,8 +3,6 @@ TODO For next release ^^^^^^^^^^^^^^^^ -- vm: fix if @(string)=='$' string++ not working on ea31 -- vm: fix conv hex2uword and bin2uword - vm: implement float div, minus, plus - vm: implement float type casts to integer types - vm: implement float any, all, reverse, sort diff --git a/examples/test.p8 b/examples/test.p8 index 47c58a1aa..f41a7d46c 100644 --- a/examples/test.p8 +++ b/examples/test.p8 @@ -8,7 +8,6 @@ main { sub start() { - ubyte ub = conv.str2ubyte("234") txt.print_ub(ub) txt.nl()