steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

math.primes.erato: bit faster by inlining.

db4
John Benediktsson 2012-08-23 09:35:09 -07:00
parent 42f4193939
commit dd2a5729a7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
basis/math/primes/erato/erato.factor
View File

@ -9,16 +9,17 @@ IN: math.primes.erato
CONSTANT: masks B{ 0 128 0 0 0 0 0 64 0 0 0 32 0 16 0 0 0 8 0 4 0 0 0 2 0 0 0 0 0 1 } CONSTANT: masks B{ 0 128 0 0 0 0 0 64 0 0 0 32 0 16 0 0 0 8 0 4 0 0 0 2 0 0 0 0 0 1 }
: bit-pos ( n -- byte/f mask/f ) : bit-pos ( n -- byte/f mask/f )
30 /mod masks nth-unsafe [ drop f f ] when-zero ; 30 /mod masks nth-unsafe [ drop f f ] when-zero ; inline
: marked-unsafe? ( n arr -- ? ) : marked-unsafe? ( n arr -- ? )
[ bit-pos ] dip swap [ [ nth-unsafe ] [ bitand zero? not ] bi* ] [ 2drop f ] if* ; [ bit-pos ] dip swap
[ [ nth-unsafe ] [ bitand zero? not ] bi* ] [ 2drop f ] if* ; inline
: unmark ( n arr -- ) : unmark ( n arr -- )
[ bit-pos swap ] dip [ bit-pos swap ] dip
over [ [ swap unmask ] change-nth-unsafe ] [ 3drop ] if ; over [ [ swap unmask ] change-nth-unsafe ] [ 3drop ] if ; inline
: upper-bound ( arr -- n ) length 30 * 1 - ; : upper-bound ( arr -- n ) length 30 * 1 - ; inline
: unmark-multiples ( i arr -- ) : unmark-multiples ( i arr -- )
2dup marked-unsafe? [ 2dup marked-unsafe? [
@ -26,9 +27,9 @@ CONSTANT: masks B{ 0 128 0 0 0 0 0 64 0 0 0 32 0 16 0 0 0 8 0 4 0 0 0 2 0 0 0 0
[ unmark ] curry each [ unmark ] curry each
] [ ] [
2drop 2drop
] if ; ] if ; inline
: init-sieve ( n -- arr ) 30 /i 1 + 255 <array> >byte-array ; : init-sieve ( n -- arr ) 30 /i 1 + 255 <array> >byte-array ; inline
PRIVATE> PRIVATE>