Support int greater/less-than-or-equal ops in vm

onflow · Jan 15, 2025 · 6ac49ca · 6ac49ca
1 parent 8ec50ec
commit 6ac49ca
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/bbq/vm/value_int.go b/bbq/vm/value_int.go
@@ -68,9 +68,23 @@ func (v IntValue) Less(other IntValue) Value {
 	return FalseValue
 }
 
+func (v IntValue) LessOrEqual(other IntValue) Value {
+	if v.SmallInt <= other.SmallInt {
+		return TrueValue
+	}
+	return FalseValue
+}
+
 func (v IntValue) Greater(other IntValue) Value {
 	if v.SmallInt > other.SmallInt {
 		return TrueValue
 	}
 	return FalseValue
 }
+
+func (v IntValue) GreaterOrEqual(other IntValue) Value {
+	if v.SmallInt >= other.SmallInt {
+		return TrueValue
+	}
+	return FalseValue
+}
diff --git a/bbq/vm/vm.go b/bbq/vm/vm.go
@@ -342,13 +342,27 @@ func opBinaryIntLess(vm *VM) {
 	vm.replaceTop(leftNumber.Less(rightNumber))
 }
 
+func opBinaryIntLessOrEqual(vm *VM) {
+	left, right := vm.peekPop()
+	leftNumber := left.(IntValue)
+	rightNumber := right.(IntValue)
+	vm.replaceTop(leftNumber.LessOrEqual(rightNumber))
+}
+
 func opBinaryIntGreater(vm *VM) {
 	left, right := vm.peekPop()
 	leftNumber := left.(IntValue)
 	rightNumber := right.(IntValue)
 	vm.replaceTop(leftNumber.Greater(rightNumber))
 }
 
+func opBinaryIntGreaterOrEqual(vm *VM) {
+	left, right := vm.peekPop()
+	leftNumber := left.(IntValue)
+	rightNumber := right.(IntValue)
+	vm.replaceTop(leftNumber.GreaterOrEqual(rightNumber))
+}
+
 func opTrue(vm *VM) {
 	vm.push(TrueValue)
 }
@@ -662,8 +676,12 @@ func (vm *VM) run() {
 			opBinaryIntSubtract(vm)
 		case opcode.InstructionIntLess:
 			opBinaryIntLess(vm)
+		case opcode.InstructionIntLessOrEqual:
+			opBinaryIntLessOrEqual(vm)
 		case opcode.InstructionIntGreater:
 			opBinaryIntGreater(vm)
+		case opcode.InstructionIntGreaterOrEqual:
+			opBinaryIntGreaterOrEqual(vm)
 		case opcode.InstructionTrue:
 			opTrue(vm)
 		case opcode.InstructionFalse: