logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-15 20:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Dmitry Vagner 2022-08-08 10:57:39 -04:00
parent ac4d7820e3
commit 4633845452
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
evm/src/cpu/kernel/asm/util/basic_macros.asm
View File

@ -194,22 +194,6 @@
// stack: x^2
%endmacro
<<<<<<< HEAD:evm/src/cpu/kernel/asm/basic_macros.asm
%macro not_32
// stack: x
push 0xffffffff
// stack: 0xffffffff, x
sub
// stack: 0xffffffff - x
%endmacro
%macro u32
// stack: x
push 0xffffffff
// stack: 0xffffffff, x
and
// stack: 0xffffffff & x
=======
%macro min
// stack: x, y
DUP2
@ -230,5 +214,20 @@
// stack: x > y, x, y
%select_bool
// stack: max
>>>>>>> 65a20bcd8a5a4040f86b7425817b98daecc05a78:evm/src/cpu/kernel/asm/util/basic_macros.asm
%endmacro
%macro not_32
// stack: x
push 0xffffffff
// stack: 0xffffffff, x
sub
// stack: 0xffffffff - x
%endmacro
%macro u32
// stack: x
push 0xffffffff
// stack: 0xffffffff, x
and
// stack: 0xffffffff & x