logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-03 22:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

addressed comments

Browse Source
This commit is contained in:
Nicholas Ward 2023-06-21 09:03:43 -07:00
parent 975e9a49fa
commit 54cf74ac2d
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
evm/Cargo.toml
View File

@ -26,8 +26,8 @@ num-bigint = "0.4.3"
once_cell = "1.13.0" once_cell = "1.13.0"
pest = "2.1.3" pest = "2.1.3"
pest_derive = "2.1.0" pest_derive = "2.1.0"
plonky2 = { version = "0.1.2", default-features = false, features = ["timing"] } plonky2 = { path = "../plonky2", default-features = false, features = ["timing"] }
plonky2_util = { version = "0.1.0" } plonky2_util = { path = "../util" }
rand = "0.8.5" rand = "0.8.5"
rand_chacha = "0.3.1" rand_chacha = "0.3.1"
rlp = "0.5.1" rlp = "0.5.1"

6
evm/src/cpu/kernel/asm/bignum/util.asm
View File

@ -1,13 +1,15 @@
%macro memcpy_current_general %macro memcpy_current_general
// stack: dst, src, len // stack: dst, src, len
%stack (dst, src, len) -> (0, @SEGMENT_KERNEL_GENERAL, dst, 0, @SEGMENT_KERNEL_GENERAL, src, len, %%after) GET_CONTEXT
%stack (context, dst, src, len) -> (context, @SEGMENT_KERNEL_GENERAL, dst, 0, @SEGMENT_KERNEL_GENERAL, src, len, %%after)
%jump(memcpy) %jump(memcpy)
%%after: %%after:
%endmacro %endmacro
%macro clear_current_general %macro clear_current_general
// stack: dst, len // stack: dst, len
%stack (dst, len) -> (0, @SEGMENT_KERNEL_GENERAL, dst, 0, len, %%after) GET_CONTEXT
%stack (context, dst, len) -> (context, @SEGMENT_KERNEL_GENERAL, dst, 0, len, %%after)
%jump(memset) %jump(memset)
%%after: %%after:
%endmacro %endmacro

14
evm/src/cpu/kernel/asm/core/precompiles/expmod.asm
View File

@ -61,7 +61,7 @@ store_limbs:
// stack: offset, retdest, num_limbs, limb[num_limbs - 1], ..limb[0] // stack: offset, retdest, num_limbs, limb[num_limbs - 1], ..limb[0]
%stack (offset, ret, num, limb) -> (offset, limb, offset, ret, num) %stack (offset, ret, num, limb) -> (offset, limb, offset, ret, num)
// stack: offset, limb[num_limbs - 1], offset, retdest, num_limbs, limb[num_limbs - 2], ..limb[0] // stack: offset, limb[num_limbs - 1], offset, retdest, num_limbs, limb[num_limbs - 2], ..limb[0]
%mstore_kernel_general %mstore_current_general
// stack: offset, retdest, num_limbs, limb[num_limbs - 2], ..limb[0] // stack: offset, retdest, num_limbs, limb[num_limbs - 2], ..limb[0]
%increment %increment
SWAP2 SWAP2
@ -230,7 +230,7 @@ l_E_prime_return:
%stack (kexit_info, l: 4) -> (l, kexit_info) %stack (kexit_info, l: 4) -> (l, kexit_info)
// stack: len, l_M, l_E, l_B, kexit_info // stack: len, l_M, l_E, l_B, kexit_info
// Copy B to kernel general memory. // Copy B to memory.
// stack: len, l_M, l_E, l_B, kexit_info // stack: len, l_M, l_E, l_B, kexit_info
DUP1 DUP1
// stack: len, len, l_M, l_E, l_B, kexit_info // stack: len, len, l_M, l_E, l_B, kexit_info
@ -262,7 +262,7 @@ copy_b_len_zero:
%pop3 %pop3
copy_b_end: copy_b_end:
// Copy E to kernel general memory. // Copy E to memory.
// stack: len, l_M, l_E, l_B, kexit_info // stack: len, l_M, l_E, l_B, kexit_info
DUP1 DUP1
// stack: len, len, l_M, l_E, l_B, kexit_info // stack: len, len, l_M, l_E, l_B, kexit_info
@ -294,7 +294,7 @@ copy_e_len_zero:
%pop3 %pop3
copy_e_end: copy_e_end:
// Copy M to kernel general memory. // Copy M to memory.
// stack: len, l_M, l_E, l_B, kexit_info // stack: len, l_M, l_E, l_B, kexit_info
DUP1 DUP1
// stack: len, len, l_M, l_E, l_B, kexit_info // stack: len, len, l_M, l_E, l_B, kexit_info
@ -389,7 +389,7 @@ copy_m_end:
expmod_contd: expmod_contd:
// stack: len, l_M, kexit_info // stack: len, l_M, kexit_info
// Copy the result value from kernel general memory to the parent's return data. // Copy the result value from memory to the parent's return data.
// Store return data size: l_M (number of bytes). // Store return data size: l_M (number of bytes).
SWAP1 SWAP1
@ -411,7 +411,7 @@ expmod_contd:
DUP2 DUP2
ADD ADD
// stack: cur_address=out+l_M_128-1, end_address=out-1, l_M_128, l_M%16, kexit_info // stack: cur_address=out+l_M_128-1, end_address=out-1, l_M_128, l_M%16, kexit_info
DUP1 %mload_kernel_general DUP1 %mload_current_general
%stack (cur_limb, cur_address, end_address, l_M_128, l_M_mod16, kexit_info) -> %stack (cur_limb, cur_address, end_address, l_M_128, l_M_mod16, kexit_info) ->
(@SEGMENT_RETURNDATA, 0, cur_limb, l_M_mod16, cur_address, end_address, l_M_128, kexit_info) (@SEGMENT_RETURNDATA, 0, cur_limb, l_M_mod16, cur_address, end_address, l_M_128, kexit_info)
%mload_context_metadata(@CTX_METADATA_PARENT_CONTEXT) %mload_context_metadata(@CTX_METADATA_PARENT_CONTEXT)
@ -425,7 +425,7 @@ expmod_store_loop:
// stack: cur_address, offset, end_address, l_M_128, kexit_info // stack: cur_address, offset, end_address, l_M_128, kexit_info
DUP3 DUP2 EQ %jumpi(expmod_store_end) DUP3 DUP2 EQ %jumpi(expmod_store_end)
// stack: cur_address, offset, end_address, l_M_128, kexit_info // stack: cur_address, offset, end_address, l_M_128, kexit_info
DUP1 %mload_kernel_general DUP1 %mload_current_general
%stack (cur_limb, cur_address, offset, end_address, l_M_128, kexit_info) -> %stack (cur_limb, cur_address, offset, end_address, l_M_128, kexit_info) ->
(offset, cur_limb, cur_address, end_address, l_M_128, kexit_info) (offset, cur_limb, cur_address, end_address, l_M_128, kexit_info)
%stack (offset, cur_limb) -> (@SEGMENT_RETURNDATA, offset, cur_limb, 16) %stack (offset, cur_limb) -> (@SEGMENT_RETURNDATA, offset, cur_limb, 16)