logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-05-23 10:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
Nicholas Ward 2023-03-14 12:08:00 -07:00
parent 4aa212ab84
commit 511f450add
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
evm/src/cpu/kernel/asm/bignum/add.asm
View File

@ -11,11 +11,7 @@ global add_bignum:
%jumpi(len_zero) %jumpi(len_zero)
// stack: len, a_start_loc, b_start_loc, retdest // stack: len, a_start_loc, b_start_loc, retdest
PUSH 0 PUSH 0
<<<<<<< HEAD
// stack: carry=0, i=len, a_cur_loc=a_start_loc, b_cur_loc=b_start_loc, retdest // stack: carry=0, i=len, a_cur_loc=a_start_loc, b_cur_loc=b_start_loc, retdest
=======
// stack: carry=0, i=len, a_start_loc, b_start_loc, retdest
>>>>>>> 96ddadf6 (basic bignum)
add_loop: add_loop:
// stack: carry, i, a_cur_loc, b_cur_loc, retdest // stack: carry, i, a_cur_loc, b_cur_loc, retdest
DUP4 DUP4