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

simplify 'calldataload' implementation

This commit is contained in:
andri lim 2019-08-20 16:26:27 +07:00
parent 7d9aa54b2c
commit 60b3ac15d6
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nimbus/vm/interpreter/opcodes_impl.nim
View File

@ -253,26 +253,19 @@ op callValue, inline = true:
op callDataLoad, inline = false, startPos: op callDataLoad, inline = false, startPos:
## 0x35, Get input data of current environment ## 0x35, Get input data of current environment
let dataPos = startPos.cleanMemRef let start = startPos.cleanMemRef
if dataPos >= computation.msg.data.len: if start >= computation.msg.data.len:
push: 0 push: 0
return return
let dataEndPosition = dataPos + 31 # If the data does not take 32 bytes, pad with zeros
let endRange = min(computation.msg.data.len - 1, start + 31)
let presentBytes = endRange - start
# We rely on value being initialized with 0 by default
var value: array[32, byte]
value[0 .. presentBytes] = computation.msg.data.toOpenArray(start, endRange)
if dataEndPosition < computation.msg.data.len: push: value
computation.stack.push(computation.msg.data[dataPos .. dataEndPosition])
else:
var bytes: array[32, byte]
var presentBytes = min(computation.msg.data.len - dataPos, 32)
if presentBytes > 0:
copyMem(addr bytes[0], addr computation.msg.data[dataPos], presentBytes)
else:
presentBytes = 0
for i in presentBytes ..< 32: bytes[i] = 0
computation.stack.push(bytes)
op callDataSize, inline = true: op callDataSize, inline = true:
## 0x36, Get size of input data in current environment. ## 0x36, Get size of input data in current environment.