status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix memory

This commit is contained in:
Alexander Ivanov 2018-03-14 11:15:03 +02:00
parent edac9af2a2
commit c1a8fa6381
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/opcode.nim
View File

@ -4,6 +4,7 @@ import
template run*(opcode: Opcode, computation: var BaseComputation) = template run*(opcode: Opcode, computation: var BaseComputation) =
# Hook for performing the actual VM execution # Hook for performing the actual VM execution
# opcode.consumeGas(computation)
computation.gasMeter.consumeGas(opcode.gasCost(computation), reason = $opcode.kind) computation.gasMeter.consumeGas(opcode.gasCost(computation), reason = $opcode.kind)
opcode.runLogic(computation) opcode.runLogic(computation)

40
tests/memory_test.nim
View File

@ -2,23 +2,23 @@ import unittest, macros, strformat, strutils, sequtils, constants, opcode_values
proc memory32: Memory = proc memory32: Memory =
result = newMemory() result = newMemory()
result.extend(0.i256, 32.i256) result.extend(0.u256, 32.u256)
proc memory128: Memory = proc memory128: Memory =
result = newMemory() result = newMemory()
result.extend(0.i256, 128.i256) result.extend(0.u256, 128.u256)
suite "memory": suite "memory":
test "write": test "write":
var mem = memory32() var mem = memory32()
# Test that write creates 32byte string == value padded with zeros # Test that write creates 32byte string == value padded with zeros
mem.write(startPosition = 0.i256, size = 4.i256, value = @[1.byte, 0.byte, 1.byte, 0.byte]) mem.write(startPosition = 0.u256, size = 4.u256, value = @[1.byte, 0.byte, 1.byte, 0.byte])
check(mem.bytes == @[1.byte, 0.byte, 1.byte, 0.byte].concat(repeat(0.byte, 28))) check(mem.bytes == @[1.byte, 0.byte, 1.byte, 0.byte].concat(repeat(0.byte, 28)))
test "write rejects invalid position": # test "write rejects invalid position":
expect(ValidationError): # expect(ValidationError):
var mem = memory32() # var mem = memory32()
mem.write(startPosition = -1.i256, size = 2.i256, value = @[1.byte, 0.byte]) # mem.write(startPosition = -1.i256, size = 2.i256, value = @[1.byte, 0.byte])
# expect(ValidationError): # expect(ValidationError):
# TODO: work on 256 # TODO: work on 256
# var mem = memory32() # var mem = memory32()
@ -26,38 +26,38 @@ suite "memory":
# mem.write(startPosition = pow(2.i256, 256), size = 2.i256, value = @[1.byte, 0.byte]) # mem.write(startPosition = pow(2.i256, 256), size = 2.i256, value = @[1.byte, 0.byte])
test "write rejects invalid size": test "write rejects invalid size":
expect(ValidationError): # expect(ValidationError):
var mem = memory32() # var mem = memory32()
mem.write(startPosition = 0.i256, size = -1.i256, value = @[1.byte, 0.byte]) # mem.write(startPosition = 0.i256, size = -1.i256, value = @[1.byte, 0.byte])
expect(ValidationError): expect(ValidationError):
var mem = memory32() var mem = memory32()
mem.write(startPosition = 0.i256, size = pow(2.i256, 256), value = @[1.byte, 0.byte]) mem.write(startPosition = 0.u256, size = pow(2.u256, 256), value = @[1.byte, 0.byte])
test "write rejects invalid value": test "write rejects invalid value":
expect(ValidationError): expect(ValidationError):
var mem = memory32() var mem = memory32()
mem.write(startPosition = 0.i256, size = 4.i256, value = @[1.byte, 0.byte]) mem.write(startPosition = 0.u256, size = 4.u256, value = @[1.byte, 0.byte])
test "write rejects valyes beyond memory size": test "write rejects valyes beyond memory size":
expect(ValidationError): expect(ValidationError):
var mem = memory128() var mem = memory128()
mem.write(startPosition = 128.i256, size = 4.i256, value = @[1.byte, 0.byte, 1.byte, 0.byte]) mem.write(startPosition = 128.u256, size = 4.u256, value = @[1.byte, 0.byte, 1.byte, 0.byte])
test "extends appropriately extends memory": test "extends appropriately extends memory":
var mem = newMemory() var mem = newMemory()
# Test extends to 32 byte array: 0 < (start_position + size) <= 32 # Test extends to 32 byte array: 0 < (start_position + size) <= 32
mem.extend(startPosition = 0.i256, size = 10.i256) mem.extend(startPosition = 0.u256, size = 10.u256)
check(mem.bytes == repeat(0.byte, 32)) check(mem.bytes == repeat(0.byte, 32))
# Test will extend past length if params require: 32 < (start_position + size) <= 64 # Test will extend past length if params require: 32 < (start_position + size) <= 64
mem.extend(startPosition = 28.i256, size = 32.i256) mem.extend(startPosition = 28.u256, size = 32.u256)
check(mem.bytes == repeat(0.byte, 64)) check(mem.bytes == repeat(0.byte, 64))
# Test won't extend past length unless params require: 32 < (start_position + size) <= 64 # Test won't extend past length unless params require: 32 < (start_position + size) <= 64
mem.extend(startPosition = 48.i256, size = 10.i256) mem.extend(startPosition = 48.u256, size = 10.u256)
check(mem.bytes == repeat(0.byte, 64)) check(mem.bytes == repeat(0.byte, 64))
test "read returns correct bytes": test "read returns correct bytes":
var mem = memory32() var mem = memory32()
mem.write(startPosition = 5.i256, size = 4.i256, value = @[1.byte, 0.byte, 1.byte, 0.byte]) mem.write(startPosition = 5.u256, size = 4.u256, value = @[1.byte, 0.byte, 1.byte, 0.byte])
check(mem.read(startPosition = 5.i256, size = 4.i256) == @[1.byte, 0.byte, 1.byte, 0.byte]) check(mem.read(startPosition = 5.u256, size = 4.u256) == @[1.byte, 0.byte, 1.byte, 0.byte])
check(mem.read(startPosition = 6.i256, size = 4.i256) == @[0.byte, 1.byte, 0.byte, 0.byte]) check(mem.read(startPosition = 6.u256, size = 4.u256) == @[0.byte, 1.byte, 0.byte, 0.byte])
check(mem.read(startPosition = 1.i256, size = 3.i256) == @[0.byte, 0.byte, 0.byte]) check(mem.read(startPosition = 1.u256, size = 3.u256) == @[0.byte, 0.byte, 0.byte])