A.5.1. Addition, subtraction, multiplication.

Signed-off-by: andreypfau <[email protected]>

bigint/src/BigInt.kt

@@ -26,6 +26,8 @@ public expect operator fun BigInt.times(other: BigInt): BigInt
 public expect operator fun BigInt.div(other: BigInt): BigInt
 public expect operator fun BigInt.unaryMinus(): BigInt
 public expect operator fun BigInt.rem(other: BigInt): BigInt
+public expect operator fun BigInt.inc(): BigInt
+public expect operator fun BigInt.dec(): BigInt
 public expect infix fun BigInt.shr(shr: Int): BigInt
 public expect infix fun BigInt.shl(shl: Int): BigInt
 public expect infix fun BigInt.and(and: BigInt): BigInt

bigint/src@jvm/BigIntJvm.kt

@@ -29,6 +29,10 @@ public operator fun BigInt.div(long: Long): BigInt = divide(long.toBigInt())
 
 public actual operator fun BigInt.unaryMinus(): BigInt = negate()
 
+public actual operator fun BigInt.inc(): BigInt = add(BigInteger.ONE)
+
+public actual operator fun BigInt.dec(): BigInt = subtract(BigInteger.ONE)
+
 public actual infix fun BigInt.shr(shr: Int): BigInt = shiftRight(shr)
 
 public actual infix fun BigInt.shl(shl: Int): BigInt = shiftLeft(shl)

bigint/src@native/BigInt.kt

@@ -101,6 +101,12 @@ public actual operator fun BigInt.unaryMinus(): BigInt =
 public actual operator fun BigInt.rem(other: BigInt): BigInt =
     BigInt(value % other.value)
 
+public actual operator fun BigInt.inc(): BigInt =
+    BigInt(value.inc())
+
+public actual operator fun BigInt.dec(): BigInt =
+    BigInt(value.dec())
+
 public actual infix fun BigInt.shr(shr: Int): BigInt =
     BigInt(value shr shr)
 

vm/src/GasConsumer.kt

@@ -1,13 +1,48 @@
 package org.ton.kotlin.tvm
 
+import org.ton.cell.Cell
 import kotlin.math.max
 
 public interface GasCalculator {
     public fun calculateOperationCost(bitCount: Int): Long
 
     public fun calculateRollCost(elements: Int): Long = max(elements - 255L, 0L)
+
+    public fun calculateCellLoad(cell: Cell): Long
+
+    public fun calculateCellReload(cell: Cell): Long
+
+    public fun calculateCellCreate(cell: Cell): Long
+
+    public fun calculateException(): Long
+
+    public fun calculateImplicitReturn(): Long
 }
 
 public object FreeGasCalculator : GasCalculator {
     override fun calculateOperationCost(bitCount: Int): Long = 0
+
+    override fun calculateCellLoad(cell: Cell): Long = 0
+
+    override fun calculateCellReload(cell: Cell): Long = 0
+
+    override fun calculateCellCreate(cell: Cell): Long = 0
+
+    override fun calculateException(): Long = 0
+
+    override fun calculateImplicitReturn(): Long = 0
+}
+
+public object DefaultGasCalculator : GasCalculator {
+    override fun calculateOperationCost(bitCount: Int): Long = 10 + bitCount.toLong()
+
+    override fun calculateCellLoad(cell: Cell): Long = 100
+
+    override fun calculateCellReload(cell: Cell): Long = 25
+
+    override fun calculateCellCreate(cell: Cell): Long = 500
+
+    override fun calculateException(): Long = 50
+
+    override fun calculateImplicitReturn(): Long = 5
 }

vm/src/OpCodes.kt

@@ -221,4 +221,15 @@ public object OpCodes {
     public const val PUSHCONT_13: Int = 0x9D
     public const val PUSHCONT_14: Int = 0x9E
     public const val PUSHCONT_15: Int = 0x9F
+
+    // A.5.1. Addition, subtraction, multiplication.
+    public const val ADD: Int = 0xA0
+    public const val SUB: Int = 0xA1
+    public const val SUBR: Int = 0xA2
+    public const val NEGATE: Int = 0xA3
+    public const val INC: Int = 0xA4
+    public const val DEC: Int = 0xA5
+    public const val ADDCONST: Int = 0xA6
+    public const val MULCONST: Int = 0xA7
+    public const val MUL: Int = 0xA8
 }

vm/src/Stack.kt

@@ -12,7 +12,15 @@ private const val INCREMENT = 256
 public fun stackOf(vararg elements: Any): Stack {
     val stack = Stack()
     for (element in elements) {
-        stack.pushElement(element)
+        when (element) {
+            is BigInt -> stack.pushInt(element)
+            is Number -> stack.pushInt(element.toLong())
+            is Boolean -> stack.pushBoolean(element)
+            is Cell -> stack.pushCell(element)
+            is CellSlice -> stack.pushSlice(element)
+            is TvmContinuation -> stack.pushContinuation(element)
+            else -> throw IllegalArgumentException("Unsupported type ${element::class}")
+        }
     }
     return stack
 }
@@ -43,6 +51,10 @@ public class Stack {
         pushElement(value)
     }
 
+    public fun pushBoolean(value: Boolean) {
+        pushElement(if (value) (-1).toBigInt() else 0.toBigInt())
+    }
+
     public fun pushCell(value: Cell) {
         pushElement(value)
     }