diff --git a/crc/crc64_ecma_norm_by8.asm b/crc/crc64_ecma_norm_by8.asm
index 31e6177..6b6313f 100644
--- a/crc/crc64_ecma_norm_by8.asm
+++ b/crc/crc64_ecma_norm_by8.asm
@@ -27,484 +27,9 @@
 ;  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;       Function API:
-;       uint64_t crc64_ecma_norm_by8(
-;               uint64_t init_crc, //initial CRC value, 64 bits
-;               const unsigned char *buf, //buffer pointer to calculate CRC on
-;               uint64_t len //buffer length in bytes (64-bit data)
-;       );
-;
-;       yasm -f x64 -f elf64 -X gnu -g dwarf2 crc64_ecma_norm_by8
-%include "reg_sizes.asm"
-
-%define	fetch_dist	1024
-
-[bits 64]
-default rel
-
-section .text
-
-%ifidn __OUTPUT_FORMAT__, win64
-        %xdefine        arg1 rcx
-        %xdefine        arg2 rdx
-        %xdefine        arg3 r8
-%else
-        %xdefine        arg1 rdi
-        %xdefine        arg2 rsi
-        %xdefine        arg3 rdx
-%endif
-
-%define TMP 16*0
-%ifidn __OUTPUT_FORMAT__, win64
-        %define XMM_SAVE 16*2
-        %define VARIABLE_OFFSET 16*10+8
-%else
-        %define VARIABLE_OFFSET 16*2+8
-%endif
-align 16
-mk_global 	crc64_ecma_norm_by8, function
-crc64_ecma_norm_by8:
-	endbranch
-
-	not	arg1      ;~init_crc
-
-	sub	rsp,VARIABLE_OFFSET
-
-%ifidn __OUTPUT_FORMAT__, win64
-        ; push the xmm registers into the stack to maintain
-        movdqa  [rsp + XMM_SAVE + 16*0], xmm6
-        movdqa  [rsp + XMM_SAVE + 16*1], xmm7
-        movdqa  [rsp + XMM_SAVE + 16*2], xmm8
-        movdqa  [rsp + XMM_SAVE + 16*3], xmm9
-        movdqa  [rsp + XMM_SAVE + 16*4], xmm10
-        movdqa  [rsp + XMM_SAVE + 16*5], xmm11
-        movdqa  [rsp + XMM_SAVE + 16*6], xmm12
-        movdqa  [rsp + XMM_SAVE + 16*7], xmm13
-%endif
-
-
-	; check if smaller than 256
-	cmp	arg3, 256
-
-	; for sizes less than 256, we can't fold 128B at a time...
-	jl	_less_than_256
-
-
-	; load the initial crc value
-	movq	xmm10, arg1	; initial crc
-
-	; crc value does not need to be byte-reflected, but it needs to be moved to the high part of the register.
-	; because data will be byte-reflected and will align with initial crc at correct place.
-	pslldq	xmm10, 8
-
-	movdqa xmm11, [SHUF_MASK]
-	; receive the initial 128B data, xor the initial crc value
-	movdqu	xmm0, [arg2+16*0]
-	movdqu	xmm1, [arg2+16*1]
-	movdqu	xmm2, [arg2+16*2]
-	movdqu	xmm3, [arg2+16*3]
-	movdqu	xmm4, [arg2+16*4]
-	movdqu	xmm5, [arg2+16*5]
-	movdqu	xmm6, [arg2+16*6]
-	movdqu	xmm7, [arg2+16*7]
-
-	pshufb	xmm0, xmm11
-	; XOR the initial_crc value
-	pxor	xmm0, xmm10
-	pshufb	xmm1, xmm11
-	pshufb	xmm2, xmm11
-	pshufb	xmm3, xmm11
-	pshufb	xmm4, xmm11
-	pshufb	xmm5, xmm11
-	pshufb	xmm6, xmm11
-	pshufb	xmm7, xmm11
-
-	movdqa	xmm10, [rk3]	;xmm10 has rk3 and rk4
-					;imm value of pclmulqdq instruction will determine which constant to use
-	;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-	; we subtract 256 instead of 128 to save one instruction from the loop
-	sub	arg3, 256
-
-	; at this section of the code, there is 128*x+y (0<=y<128) bytes of buffer. The _fold_128_B_loop
-	; loop will fold 128B at a time until we have 128+y Bytes of buffer
-
-
-	; fold 128B at a time. This section of the code folds 8 xmm registers in parallel
-_fold_128_B_loop:
-
-	; update the buffer pointer
-	add	arg2, 128		;    buf += 128;
-
-	prefetchnta [arg2+fetch_dist+0]
-	movdqu	xmm9, [arg2+16*0]
-	movdqu	xmm12, [arg2+16*1]
-	pshufb	xmm9, xmm11
-	pshufb	xmm12, xmm11
-	movdqa	xmm8, xmm0
-	movdqa	xmm13, xmm1
-	pclmulqdq	xmm0, xmm10, 0x0
-	pclmulqdq	xmm8, xmm10 , 0x11
-	pclmulqdq	xmm1, xmm10, 0x0
-	pclmulqdq	xmm13, xmm10 , 0x11
-	pxor	xmm0, xmm9
-	xorps	xmm0, xmm8
-	pxor	xmm1, xmm12
-	xorps	xmm1, xmm13
-
-	prefetchnta [arg2+fetch_dist+32]
-	movdqu	xmm9, [arg2+16*2]
-	movdqu	xmm12, [arg2+16*3]
-	pshufb	xmm9, xmm11
-	pshufb	xmm12, xmm11
-	movdqa	xmm8, xmm2
-	movdqa	xmm13, xmm3
-	pclmulqdq	xmm2, xmm10, 0x0
-	pclmulqdq	xmm8, xmm10 , 0x11
-	pclmulqdq	xmm3, xmm10, 0x0
-	pclmulqdq	xmm13, xmm10 , 0x11
-	pxor	xmm2, xmm9
-	xorps	xmm2, xmm8
-	pxor	xmm3, xmm12
-	xorps	xmm3, xmm13
-
-	prefetchnta [arg2+fetch_dist+64]
-	movdqu	xmm9, [arg2+16*4]
-	movdqu	xmm12, [arg2+16*5]
-	pshufb	xmm9, xmm11
-	pshufb	xmm12, xmm11
-	movdqa	xmm8, xmm4
-	movdqa	xmm13, xmm5
-	pclmulqdq	xmm4, xmm10, 0x0
-	pclmulqdq	xmm8, xmm10 , 0x11
-	pclmulqdq	xmm5, xmm10, 0x0
-	pclmulqdq	xmm13, xmm10 , 0x11
-	pxor	xmm4, xmm9
-	xorps	xmm4, xmm8
-	pxor	xmm5, xmm12
-	xorps	xmm5, xmm13
-
-	prefetchnta [arg2+fetch_dist+96]
-	movdqu	xmm9, [arg2+16*6]
-	movdqu	xmm12, [arg2+16*7]
-	pshufb	xmm9, xmm11
-	pshufb	xmm12, xmm11
-	movdqa	xmm8, xmm6
-	movdqa	xmm13, xmm7
-	pclmulqdq	xmm6, xmm10, 0x0
-	pclmulqdq	xmm8, xmm10 , 0x11
-	pclmulqdq	xmm7, xmm10, 0x0
-	pclmulqdq	xmm13, xmm10 , 0x11
-	pxor	xmm6, xmm9
-	xorps	xmm6, xmm8
-	pxor	xmm7, xmm12
-	xorps	xmm7, xmm13
-
-	sub	arg3, 128
-
-	; check if there is another 128B in the buffer to be able to fold
-	jge	_fold_128_B_loop
-	;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-	add	arg2, 128
-        ; at this point, the buffer pointer is pointing at the last y Bytes of the buffer, where 0 <= y < 128
-        ; the 128B of folded data is in 8 of the xmm registers: xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
-
-
-	; fold the 8 xmm registers to 1 xmm register with different constants
-
-	movdqa	xmm10, [rk9]
-	movdqa	xmm8, xmm0
-	pclmulqdq	xmm0, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	xorps	xmm7, xmm0
-
-	movdqa	xmm10, [rk11]
-	movdqa	xmm8, xmm1
-	pclmulqdq	xmm1, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	xorps	xmm7, xmm1
-
-	movdqa	xmm10, [rk13]
-	movdqa	xmm8, xmm2
-	pclmulqdq	xmm2, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	pxor	xmm7, xmm2
-
-	movdqa	xmm10, [rk15]
-	movdqa	xmm8, xmm3
-	pclmulqdq	xmm3, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	xorps	xmm7, xmm3
-
-	movdqa	xmm10, [rk17]
-	movdqa	xmm8, xmm4
-	pclmulqdq	xmm4, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	pxor	xmm7, xmm4
-
-	movdqa	xmm10, [rk19]
-	movdqa	xmm8, xmm5
-	pclmulqdq	xmm5, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	xorps	xmm7, xmm5
-
-	movdqa	xmm10, [rk1]	;xmm10 has rk1 and rk2
-
-	movdqa	xmm8, xmm6
-	pclmulqdq	xmm6, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	pxor	xmm7, xmm6
-
-
-	; instead of 128, we add 112 to the loop counter to save 1 instruction from the loop
-	; instead of a cmp instruction, we use the negative flag with the jl instruction
-	add	arg3, 128-16
-	jl	_final_reduction_for_128
-
-	; now we have 16+y bytes left to reduce. 16 Bytes is in register xmm7 and the rest is in memory
-	; we can fold 16 bytes at a time if y>=16
-	; continue folding 16B at a time
-
-_16B_reduction_loop:
-	movdqa	xmm8, xmm7
-	pclmulqdq	xmm7, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	movdqu	xmm0, [arg2]
-	pshufb	xmm0, xmm11
-	pxor	xmm7, xmm0
-	add	arg2, 16
-	sub	arg3, 16
-	; instead of a cmp instruction, we utilize the flags with the jge instruction
-	; equivalent of: cmp arg3, 16-16
-	; check if there is any more 16B in the buffer to be able to fold
-	jge	_16B_reduction_loop
-
-	;now we have 16+z bytes left to reduce, where 0<= z < 16.
-	;first, we reduce the data in the xmm7 register
-
-
-_final_reduction_for_128:
-	; check if any more data to fold. If not, compute the CRC of the final 128 bits
-	add	arg3, 16
-	je	_128_done
-
-	; here we are getting data that is less than 16 bytes.
-	; since we know that there was data before the pointer, we can offset the input pointer before the actual point, to receive exactly 16 bytes.
-	; after that the registers need to be adjusted.
-_get_last_two_xmms:
-	movdqa	xmm2, xmm7
-
-	movdqu	xmm1, [arg2 - 16 + arg3]
-	pshufb	xmm1, xmm11
-
-	; get rid of the extra data that was loaded before
-	; load the shift constant
-	lea	rax, [pshufb_shf_table + 16]
-	sub	rax, arg3
-	movdqu	xmm0, [rax]
-
-	; shift xmm2 to the left by arg3 bytes
-	pshufb	xmm2, xmm0
-
-	; shift xmm7 to the right by 16-arg3 bytes
-	pxor	xmm0, [mask1]
-	pshufb	xmm7, xmm0
-	pblendvb	xmm1, xmm2	;xmm0 is implicit
-
-	; fold 16 Bytes
-	movdqa	xmm2, xmm1
-	movdqa	xmm8, xmm7
-	pclmulqdq	xmm7, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	pxor	xmm7, xmm2
-
-_128_done:
-	; compute crc of a 128-bit value
-	movdqa	xmm10, [rk5]	; rk5 and rk6 in xmm10
-	movdqa	xmm0, xmm7
-
-	;64b fold
-	pclmulqdq	xmm7, xmm10, 0x01	; H*L
-	pslldq	xmm0, 8
-	pxor	xmm7, xmm0
-
-	;barrett reduction
-_barrett:
-	movdqa	xmm10, [rk7]	; rk7 and rk8 in xmm10
-	movdqa	xmm0, xmm7
-
-	movdqa	xmm1, xmm7
-        pand    xmm1, [mask3]
-	pclmulqdq	xmm7, xmm10, 0x01
-	pxor	xmm7, xmm1
-
-	pclmulqdq	xmm7, xmm10, 0x11
-	pxor	xmm7, xmm0
-	pextrq	rax, xmm7, 0
-
-_cleanup:
-	not     rax
-%ifidn __OUTPUT_FORMAT__, win64
-        movdqa  xmm6, [rsp + XMM_SAVE + 16*0]
-        movdqa  xmm7, [rsp + XMM_SAVE + 16*1]
-        movdqa  xmm8, [rsp + XMM_SAVE + 16*2]
-        movdqa  xmm9, [rsp + XMM_SAVE + 16*3]
-        movdqa  xmm10, [rsp + XMM_SAVE + 16*4]
-        movdqa  xmm11, [rsp + XMM_SAVE + 16*5]
-        movdqa  xmm12, [rsp + XMM_SAVE + 16*6]
-        movdqa  xmm13, [rsp + XMM_SAVE + 16*7]
-%endif
-	add	rsp, VARIABLE_OFFSET
-	ret
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-align 16
-_less_than_256:
-
-	; check if there is enough buffer to be able to fold 16B at a time
-	cmp	arg3, 32
-	jl	_less_than_32
-	movdqa xmm11, [SHUF_MASK]
-
-	; if there is, load the constants
-	movdqa	xmm10, [rk1]	; rk1 and rk2 in xmm10
-
-	movq	xmm0, arg1	; get the initial crc value
-	pslldq	xmm0, 8	; align it to its correct place
-	movdqu	xmm7, [arg2]	; load the plaintext
-	pshufb	xmm7, xmm11	; byte-reflect the plaintext
-	pxor	xmm7, xmm0
-
-
-	; update the buffer pointer
-	add	arg2, 16
-
-	; update the counter. subtract 32 instead of 16 to save one instruction from the loop
-	sub	arg3, 32
-
-	jmp	_16B_reduction_loop
-align 16
-_less_than_32:
-	; mov initial crc to the return value. this is necessary for zero-length buffers.
-	mov	rax, arg1
-	test	arg3, arg3
-	je	_cleanup
-
-	movdqa xmm11, [SHUF_MASK]
-
-	movq	xmm0, arg1	; get the initial crc value
-	pslldq	xmm0, 8	; align it to its correct place
-
-	cmp	arg3, 16
-	je	_exact_16_left
-	jl	_less_than_16_left
-
-	movdqu	xmm7, [arg2]	; load the plaintext
-	pshufb	xmm7, xmm11	; byte-reflect the plaintext
-	pxor	xmm7, xmm0	; xor the initial crc value
-	add	arg2, 16
-	sub	arg3, 16
-	movdqa	xmm10, [rk1]	; rk1 and rk2 in xmm10
-	jmp	_get_last_two_xmms
-align 16
-_less_than_16_left:
-	; use stack space to load data less than 16 bytes, zero-out the 16B in memory first.
-	pxor	xmm1, xmm1
-	mov	r11, rsp
-	movdqa	[r11], xmm1
-
-	;	backup the counter value
-	mov	r9, arg3
-	cmp	arg3, 8
-	jl	_less_than_8_left
-
-	; load 8 Bytes
-	mov	rax, [arg2]
-	mov	[r11], rax
-	add	r11, 8
-	sub	arg3, 8
-	add	arg2, 8
-_less_than_8_left:
-
-	cmp	arg3, 4
-	jl	_less_than_4_left
-
-	; load 4 Bytes
-	mov	eax, [arg2]
-	mov	[r11], eax
-	add	r11, 4
-	sub	arg3, 4
-	add	arg2, 4
-_less_than_4_left:
-
-	cmp	arg3, 2
-	jl	_less_than_2_left
-
-	; load 2 Bytes
-	mov	ax, [arg2]
-	mov	[r11], ax
-	add	r11, 2
-	sub	arg3, 2
-	add	arg2, 2
-_less_than_2_left:
-	cmp     arg3, 1
-        jl      _zero_left
-
-	; load 1 Byte
-	mov	al, [arg2]
-	mov	[r11], al
-_zero_left:
-	movdqa	xmm7, [rsp]
-	pshufb	xmm7, xmm11
-	pxor	xmm7, xmm0	; xor the initial crc value
-
-	; shl r9, 4
-	lea	rax, [pshufb_shf_table + 16]
-	sub	rax, r9
-
-	cmp     r9, 8
-        jl      _end_1to7
-
-_end_8to15:
-	movdqu	xmm0, [rax]
-	pxor	xmm0, [mask1]
-
-	pshufb	xmm7, xmm0
-	jmp	_128_done
-
-_end_1to7:
-	; Right shift (8-length) bytes in XMM
-	add	rax, 8
-        movdqu  xmm0, [rax]
-        pshufb  xmm7,xmm0
-
-        jmp     _barrett
-align 16
-_exact_16_left:
-	movdqu	xmm7, [arg2]
-	pshufb	xmm7, xmm11
-	pxor	xmm7, xmm0	; xor the initial crc value
-
-	jmp	_128_done
-
-section .data
-
-; precomputed constants
-align 16
-
+%define FUNCTION_NAME crc64_ecma_norm_by8
+%define USE_CONSTS
+%macro INCLUDE_CONSTS 0
 rk1 :
 DQ 0x5f5c3c7eb52fab6
 rk2 :
@@ -545,37 +70,6 @@ rk19 :
 DQ 0x571bee0a227ef92b
 rk20 :
 DQ 0x44bef2a201b5200c
+%endm
 
-
-mask1:
-dq 0x8080808080808080, 0x8080808080808080
-mask2:
-dq 0xFFFFFFFFFFFFFFFF, 0x00000000FFFFFFFF
-mask3:
-dq 0x0000000000000000, 0xFFFFFFFFFFFFFFFF
-
-SHUF_MASK:
-dq 0x08090A0B0C0D0E0F, 0x0001020304050607
-
-pshufb_shf_table:
-; use these values for shift constants for the pshufb instruction
-; different alignments result in values as shown:
-;	dq 0x8887868584838281, 0x008f8e8d8c8b8a89 ; shl 15 (16-1) / shr1
-;	dq 0x8988878685848382, 0x01008f8e8d8c8b8a ; shl 14 (16-3) / shr2
-;	dq 0x8a89888786858483, 0x0201008f8e8d8c8b ; shl 13 (16-4) / shr3
-;	dq 0x8b8a898887868584, 0x030201008f8e8d8c ; shl 12 (16-4) / shr4
-;	dq 0x8c8b8a8988878685, 0x04030201008f8e8d ; shl 11 (16-5) / shr5
-;	dq 0x8d8c8b8a89888786, 0x0504030201008f8e ; shl 10 (16-6) / shr6
-;	dq 0x8e8d8c8b8a898887, 0x060504030201008f ; shl 9  (16-7) / shr7
-;	dq 0x8f8e8d8c8b8a8988, 0x0706050403020100 ; shl 8  (16-8) / shr8
-;	dq 0x008f8e8d8c8b8a89, 0x0807060504030201 ; shl 7  (16-9) / shr9
-;	dq 0x01008f8e8d8c8b8a, 0x0908070605040302 ; shl 6  (16-10) / shr10
-;	dq 0x0201008f8e8d8c8b, 0x0a09080706050403 ; shl 5  (16-11) / shr11
-;	dq 0x030201008f8e8d8c, 0x0b0a090807060504 ; shl 4  (16-12) / shr12
-;	dq 0x04030201008f8e8d, 0x0c0b0a0908070605 ; shl 3  (16-13) / shr13
-;	dq 0x0504030201008f8e, 0x0d0c0b0a09080706 ; shl 2  (16-14) / shr14
-;	dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
-dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
-dq 0x0706050403020100, 0x0f0e0d0c0b0a0908
-dq 0x8080808080808080, 0x0f0e0d0c0b0a0908
-dq 0x8080808080808080, 0x8080808080808080
+%include "crc64_iso_norm_by8.asm"
diff --git a/crc/crc64_ecma_refl_by8.asm b/crc/crc64_ecma_refl_by8.asm
index 36b9792..74b6728 100644
--- a/crc/crc64_ecma_refl_by8.asm
+++ b/crc/crc64_ecma_refl_by8.asm
@@ -27,453 +27,9 @@
 ;  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;       Function API:
-;       uint64_t crc64_ecma_refl_by8(
-;               uint64_t init_crc, //initial CRC value, 64 bits
-;               const unsigned char *buf, //buffer pointer to calculate CRC on
-;               uint64_t len //buffer length in bytes (64-bit data)
-;       );
-;
-;       Reference paper titled "Fast CRC Computation for Generic Polynomials Using PCLMULQDQ Instruction"
-;       sample yasm command line:
-;       yasm -f x64 -f elf64 -X gnu -g dwarf2 crc64_ecma_refl_by8
-%include "reg_sizes.asm"
-
-%define	fetch_dist	1024
-
-[bits 64]
-default rel
-
-section .text
-
-
-%ifidn __OUTPUT_FORMAT__, win64
-        %xdefine        arg1 rcx
-        %xdefine        arg2 rdx
-        %xdefine        arg3 r8
-%else
-        %xdefine        arg1 rdi
-        %xdefine        arg2 rsi
-        %xdefine        arg3 rdx
-%endif
-
-%define TMP 16*0
-%ifidn __OUTPUT_FORMAT__, win64
-        %define XMM_SAVE 16*2
-        %define VARIABLE_OFFSET 16*10+8
-%else
-        %define VARIABLE_OFFSET 16*2+8
-%endif
-
-
-align 16
-mk_global crc64_ecma_refl_by8, function
-crc64_ecma_refl_by8:
-	endbranch
-        ; uint64_t c = crc ^ 0xffffffff,ffffffffL;
-	not arg1
-        sub     rsp, VARIABLE_OFFSET
-
-%ifidn __OUTPUT_FORMAT__, win64
-        ; push the xmm registers into the stack to maintain
-        movdqa  [rsp + XMM_SAVE + 16*0], xmm6
-        movdqa  [rsp + XMM_SAVE + 16*1], xmm7
-        movdqa  [rsp + XMM_SAVE + 16*2], xmm8
-        movdqa  [rsp + XMM_SAVE + 16*3], xmm9
-        movdqa  [rsp + XMM_SAVE + 16*4], xmm10
-        movdqa  [rsp + XMM_SAVE + 16*5], xmm11
-        movdqa  [rsp + XMM_SAVE + 16*6], xmm12
-        movdqa  [rsp + XMM_SAVE + 16*7], xmm13
-%endif
-
-        ; check if smaller than 256B
-        cmp     arg3, 256
-
-        ; for sizes less than 256, we can't fold 128B at a time...
-        jl      _less_than_256
-
-
-        ; load the initial crc value
-        movq    xmm10, arg1      ; initial crc
-      ; receive the initial 128B data, xor the initial crc value
-        movdqu  xmm0, [arg2+16*0]
-        movdqu  xmm1, [arg2+16*1]
-        movdqu  xmm2, [arg2+16*2]
-        movdqu  xmm3, [arg2+16*3]
-        movdqu  xmm4, [arg2+16*4]
-        movdqu  xmm5, [arg2+16*5]
-        movdqu  xmm6, [arg2+16*6]
-        movdqu  xmm7, [arg2+16*7]
-
-        ; XOR the initial_crc value
-        pxor    xmm0, xmm10
-        movdqa  xmm10, [rk3]    ;xmm10 has rk3 and rk4
-                                        ;imm value of pclmulqdq instruction will determine which constant to use
-        ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-        ; we subtract 256 instead of 128 to save one instruction from the loop
-        sub     arg3, 256
-
-        ; at this section of the code, there is 128*x+y (0<=y<128) bytes of buffer. The _fold_128_B_loop
-        ; loop will fold 128B at a time until we have 128+y Bytes of buffer
-
-
-        ; fold 128B at a time. This section of the code folds 8 xmm registers in parallel
-_fold_128_B_loop:
-
-        ; update the buffer pointer
-        add     arg2, 128
-
-	prefetchnta [arg2+fetch_dist+0]
-        movdqu  xmm9, [arg2+16*0]
-        movdqu  xmm12, [arg2+16*1]
-        movdqa  xmm8, xmm0
-        movdqa  xmm13, xmm1
-        pclmulqdq       xmm0, xmm10, 0x10
-        pclmulqdq       xmm8, xmm10 , 0x1
-        pclmulqdq       xmm1, xmm10, 0x10
-        pclmulqdq       xmm13, xmm10 , 0x1
-        pxor    xmm0, xmm9
-        xorps   xmm0, xmm8
-        pxor    xmm1, xmm12
-        xorps   xmm1, xmm13
-
-	prefetchnta [arg2+fetch_dist+32]
-        movdqu  xmm9, [arg2+16*2]
-        movdqu  xmm12, [arg2+16*3]
-        movdqa  xmm8, xmm2
-        movdqa  xmm13, xmm3
-        pclmulqdq       xmm2, xmm10, 0x10
-        pclmulqdq       xmm8, xmm10 , 0x1
-        pclmulqdq       xmm3, xmm10, 0x10
-        pclmulqdq       xmm13, xmm10 , 0x1
-        pxor    xmm2, xmm9
-        xorps   xmm2, xmm8
-        pxor    xmm3, xmm12
-        xorps   xmm3, xmm13
-
-	prefetchnta [arg2+fetch_dist+64]
-        movdqu  xmm9, [arg2+16*4]
-        movdqu  xmm12, [arg2+16*5]
-        movdqa  xmm8, xmm4
-        movdqa  xmm13, xmm5
-        pclmulqdq       xmm4, xmm10, 0x10
-        pclmulqdq       xmm8, xmm10 , 0x1
-        pclmulqdq       xmm5, xmm10, 0x10
-        pclmulqdq       xmm13, xmm10 , 0x1
-        pxor    xmm4, xmm9
-        xorps   xmm4, xmm8
-        pxor    xmm5, xmm12
-        xorps   xmm5, xmm13
-
-	prefetchnta [arg2+fetch_dist+96]
-        movdqu  xmm9, [arg2+16*6]
-        movdqu  xmm12, [arg2+16*7]
-        movdqa  xmm8, xmm6
-        movdqa  xmm13, xmm7
-        pclmulqdq       xmm6, xmm10, 0x10
-        pclmulqdq       xmm8, xmm10 , 0x1
-        pclmulqdq       xmm7, xmm10, 0x10
-        pclmulqdq       xmm13, xmm10 , 0x1
-        pxor    xmm6, xmm9
-        xorps   xmm6, xmm8
-        pxor    xmm7, xmm12
-        xorps   xmm7, xmm13
-
-        sub     arg3, 128
-
-        ; check if there is another 128B in the buffer to be able to fold
-        jge     _fold_128_B_loop
-        ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-        add     arg2, 128
-        ; at this point, the buffer pointer is pointing at the last y Bytes of the buffer, where 0 <= y < 128
-        ; the 128B of folded data is in 8 of the xmm registers: xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
-
-
-        ; fold the 8 xmm registers to 1 xmm register with different constants
-	; xmm0 to xmm7
-        movdqa  xmm10, [rk9]
-        movdqa  xmm8, xmm0
-        pclmulqdq       xmm0, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        xorps   xmm7, xmm0
-        ;xmm1 to xmm7
-        movdqa  xmm10, [rk11]
-        movdqa  xmm8, xmm1
-        pclmulqdq       xmm1, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        xorps   xmm7, xmm1
-
-        movdqa  xmm10, [rk13]
-        movdqa  xmm8, xmm2
-        pclmulqdq       xmm2, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        pxor    xmm7, xmm2
-
-        movdqa  xmm10, [rk15]
-        movdqa  xmm8, xmm3
-        pclmulqdq       xmm3, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        xorps   xmm7, xmm3
-
-        movdqa  xmm10, [rk17]
-        movdqa  xmm8, xmm4
-        pclmulqdq       xmm4, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        pxor    xmm7, xmm4
-
-        movdqa  xmm10, [rk19]
-        movdqa  xmm8, xmm5
-        pclmulqdq       xmm5, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        xorps   xmm7, xmm5
-	; xmm6 to xmm7
-        movdqa  xmm10, [rk1]
-        movdqa  xmm8, xmm6
-        pclmulqdq       xmm6, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        pxor    xmm7, xmm6
-
-
-        ; instead of 128, we add 128-16 to the loop counter to save 1 instruction from the loop
-        ; instead of a cmp instruction, we use the negative flag with the jl instruction
-        add     arg3, 128-16
-        jl      _final_reduction_for_128
-
-        ; now we have 16+y bytes left to reduce. 16 Bytes is in register xmm7 and the rest is in memory
-        ; we can fold 16 bytes at a time if y>=16
-        ; continue folding 16B at a time
-
-_16B_reduction_loop:
-        movdqa  xmm8, xmm7
-        pclmulqdq       xmm7, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        movdqu  xmm0, [arg2]
-        pxor    xmm7, xmm0
-        add     arg2, 16
-        sub     arg3, 16
-        ; instead of a cmp instruction, we utilize the flags with the jge instruction
-        ; equivalent of: cmp arg3, 16-16
-        ; check if there is any more 16B in the buffer to be able to fold
-        jge     _16B_reduction_loop
-
-        ;now we have 16+z bytes left to reduce, where 0<= z < 16.
-        ;first, we reduce the data in the xmm7 register
-
-
-_final_reduction_for_128:
-        add arg3, 16
-        je _128_done
-  ; here we are getting data that is less than 16 bytes.
-        ; since we know that there was data before the pointer, we can offset the input pointer before the actual point, to receive exactly 16 bytes.
-        ; after that the registers need to be adjusted.
-_get_last_two_xmms:
-
-
-        movdqa xmm2, xmm7
-        movdqu xmm1, [arg2 - 16 + arg3]
-
-        ; get rid of the extra data that was loaded before
-        ; load the shift constant
-        lea     rax, [pshufb_shf_table]
-        add     rax, arg3
-        movdqu  xmm0, [rax]
-
-
-        pshufb  xmm7, xmm0
-        pxor    xmm0, [mask3]
-        pshufb  xmm2, xmm0
-
-        pblendvb        xmm2, xmm1     ;xmm0 is implicit
-        ;;;;;;;;;;
-        movdqa  xmm8, xmm7
-        pclmulqdq       xmm7, xmm10, 0x1
-
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        pxor    xmm7, xmm2
-
-_128_done:
-        ; compute crc of a 128-bit value
-        movdqa  xmm10, [rk5]
-        movdqa  xmm0, xmm7
-
-        ;64b fold
-        pclmulqdq       xmm7, xmm10, 0
-        psrldq  xmm0, 8
-        pxor    xmm7, xmm0
-
-        ;barrett reduction
-_barrett:
-        movdqa  xmm1, xmm7
-        movdqa  xmm10, [rk7]
-
-        pclmulqdq       xmm7, xmm10, 0
-        movdqa  xmm2, xmm7
-        pclmulqdq       xmm7, xmm10, 0x10
-        pslldq  xmm2, 8
-        pxor    xmm7, xmm2
-        pxor    xmm7, xmm1
-        pextrq  rax, xmm7, 1
-
-_cleanup:
-        ; return c ^ 0xffffffff, ffffffffL;
-        not     rax
-
-
-%ifidn __OUTPUT_FORMAT__, win64
-        movdqa  xmm6, [rsp + XMM_SAVE + 16*0]
-        movdqa  xmm7, [rsp + XMM_SAVE + 16*1]
-        movdqa  xmm8, [rsp + XMM_SAVE + 16*2]
-        movdqa  xmm9, [rsp + XMM_SAVE + 16*3]
-        movdqa  xmm10, [rsp + XMM_SAVE + 16*4]
-        movdqa  xmm11, [rsp + XMM_SAVE + 16*5]
-        movdqa  xmm12, [rsp + XMM_SAVE + 16*6]
-        movdqa  xmm13, [rsp + XMM_SAVE + 16*7]
-%endif
-        add     rsp, VARIABLE_OFFSET
-        ret
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-align 16
-_less_than_256:
-
-        ; check if there is enough buffer to be able to fold 16B at a time
-        cmp     arg3, 32
-        jl      _less_than_32
-
-        ; if there is, load the constants
-        movdqa  xmm10, [rk1]    ; rk1 and rk2 in xmm10
-
-        movq    xmm0, arg1       ; get the initial crc value
-        movdqu  xmm7, [arg2]            ; load the plaintext
-        pxor    xmm7, xmm0
-
-        ; update the buffer pointer
-        add     arg2, 16
-
-        ; update the counter. subtract 32 instead of 16 to save one instruction from the loop
-        sub     arg3, 32
-
-        jmp     _16B_reduction_loop
-
-align 16
-_less_than_32:
-        ; mov initial crc to the return value. this is necessary for zero-length buffers.
-        mov     rax, arg1
-        test    arg3, arg3
-        je      _cleanup
-
-        movq    xmm0, arg1       ; get the initial crc value
-
-        cmp     arg3, 16
-        je      _exact_16_left
-        jl      _less_than_16_left
-
-        movdqu  xmm7, [arg2]            ; load the plaintext
-        pxor    xmm7, xmm0              ; xor the initial crc value
-        add     arg2, 16
-        sub     arg3, 16
-        movdqa  xmm10, [rk1]    ; rk1 and rk2 in xmm10
-        jmp     _get_last_two_xmms
-
-
-align 16
-_less_than_16_left:
-        ; use stack space to load data less than 16 bytes, zero-out the 16B in memory first.
-
-        pxor    xmm1, xmm1
-        mov     r11, rsp
-        movdqa  [r11], xmm1
-
-        ;       backup the counter value
-        mov     r9, arg3
-        cmp     arg3, 8
-        jl      _less_than_8_left
-
-        ; load 8 Bytes
-        mov     rax, [arg2]
-        mov     [r11], rax
-        add     r11, 8
-        sub     arg3, 8
-        add     arg2, 8
-_less_than_8_left:
-
-        cmp     arg3, 4
-        jl      _less_than_4_left
-
-        ; load 4 Bytes
-        mov     eax, [arg2]
-        mov     [r11], eax
-        add     r11, 4
-        sub     arg3, 4
-        add     arg2, 4
-_less_than_4_left:
-
-        cmp     arg3, 2
-        jl      _less_than_2_left
-
-        ; load 2 Bytes
-        mov     ax, [arg2]
-        mov     [r11], ax
-        add     r11, 2
-        sub     arg3, 2
-        add     arg2, 2
-_less_than_2_left:
-        cmp     arg3, 1
-        jl      _zero_left
-
-        ; load 1 Byte
-        mov     al, [arg2]
-        mov     [r11], al
-
-_zero_left:
-        movdqa  xmm7, [rsp]
-        pxor    xmm7, xmm0      ; xor the initial crc value
-
-        lea rax,[pshufb_shf_table]
-
-	cmp     r9, 8
-        jl      _end_1to7
-
-_end_8to15:
-        movdqu  xmm0, [rax + r9]
-        pshufb  xmm7,xmm0
-        jmp     _128_done
-
-_end_1to7:
-	; Left shift (8-length) bytes in XMM
-        movdqu  xmm0, [rax + r9 + 8]
-        pshufb  xmm7,xmm0
-
-        jmp     _barrett
-
-align 16
-_exact_16_left:
-        movdqu  xmm7, [arg2]
-        pxor    xmm7, xmm0      ; xor the initial crc value
-
-        jmp     _128_done
-
-section .data
-
-; precomputed constants
-align 16
-; rk7 = floor(2^128/Q)
-; rk8 = Q
+%define FUNCTION_NAME crc64_ecma_refl_by8
+%define USE_CONSTS
+%macro INCLUDE_CONSTS 0
 rk1 :
 DQ 0xdabe95afc7875f40
 rk2 :
@@ -514,33 +70,6 @@ rk19 :
 DQ 0x3be653a30fe1af51
 rk20 :
 DQ 0x60095b008a9efa44
+%endm
 
-
-pshufb_shf_table:
-; use these values for shift constants for the pshufb instruction
-; different alignments result in values as shown:
-;       dq 0x8887868584838281, 0x008f8e8d8c8b8a89 ; shl 15 (16-1) / shr1
-;       dq 0x8988878685848382, 0x01008f8e8d8c8b8a ; shl 14 (16-3) / shr2
-;       dq 0x8a89888786858483, 0x0201008f8e8d8c8b ; shl 13 (16-4) / shr3
-;       dq 0x8b8a898887868584, 0x030201008f8e8d8c ; shl 12 (16-4) / shr4
-;       dq 0x8c8b8a8988878685, 0x04030201008f8e8d ; shl 11 (16-5) / shr5
-;       dq 0x8d8c8b8a89888786, 0x0504030201008f8e ; shl 10 (16-6) / shr6
-;       dq 0x8e8d8c8b8a898887, 0x060504030201008f ; shl 9  (16-7) / shr7
-;       dq 0x8f8e8d8c8b8a8988, 0x0706050403020100 ; shl 8  (16-8) / shr8
-;       dq 0x008f8e8d8c8b8a89, 0x0807060504030201 ; shl 7  (16-9) / shr9
-;       dq 0x01008f8e8d8c8b8a, 0x0908070605040302 ; shl 6  (16-10) / shr10
-;       dq 0x0201008f8e8d8c8b, 0x0a09080706050403 ; shl 5  (16-11) / shr11
-;       dq 0x030201008f8e8d8c, 0x0b0a090807060504 ; shl 4  (16-12) / shr12
-;       dq 0x04030201008f8e8d, 0x0c0b0a0908070605 ; shl 3  (16-13) / shr13
-;       dq 0x0504030201008f8e, 0x0d0c0b0a09080706 ; shl 2  (16-14) / shr14
-;       dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
-dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
-dq 0x0706050403020100, 0x000e0d0c0b0a0908
-
-
-mask:
-dq     0xFFFFFFFFFFFFFFFF, 0x0000000000000000
-mask2:
-dq     0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFF
-mask3:
-dq     0x8080808080808080, 0x8080808080808080
+%include "crc64_iso_refl_by8.asm"
diff --git a/crc/crc64_iso_norm_by8.asm b/crc/crc64_iso_norm_by8.asm
index 3631fba..34c954d 100644
--- a/crc/crc64_iso_norm_by8.asm
+++ b/crc/crc64_iso_norm_by8.asm
@@ -36,6 +36,10 @@
 ;
 %include "reg_sizes.asm"
 
+%ifndef FUNCTION_NAME
+%define FUNCTION_NAME crc64_iso_norm_by8
+%endif
+
 %define	fetch_dist	1024
 
 [bits 64]
@@ -61,8 +65,8 @@ section .text
         %define VARIABLE_OFFSET 16*2+8
 %endif
 align 16
-mk_global 	crc64_iso_norm_by8, function
-crc64_iso_norm_by8:
+mk_global 	FUNCTION_NAME, function
+FUNCTION_NAME:
 	endbranch
 
 	not	arg1      ;~init_crc
@@ -504,6 +508,7 @@ section .data
 ; precomputed constants
 align 16
 
+%ifndef USE_CONSTS
 rk1:
 DQ 0x0000000000000145
 rk2:
@@ -544,6 +549,9 @@ rk19:
 DQ 0x0000000000011011
 rk20:
 DQ 0x00000000001ab1ab
+%else
+INCLUDE_CONSTS
+%endif
 
 mask1:
 dq 0x8080808080808080, 0x8080808080808080
diff --git a/crc/crc64_iso_refl_by8.asm b/crc/crc64_iso_refl_by8.asm
index 7f5f7b0..0a11805 100644
--- a/crc/crc64_iso_refl_by8.asm
+++ b/crc/crc64_iso_refl_by8.asm
@@ -37,6 +37,10 @@
 ;
 %include "reg_sizes.asm"
 
+%ifndef FUNCTION_NAME
+%define FUNCTION_NAME crc64_iso_refl_by8
+%endif
+
 %define	fetch_dist	1024
 
 [bits 64]
@@ -65,8 +69,8 @@ section .text
 
 
 align 16
-mk_global crc64_iso_refl_by8, function
-crc64_iso_refl_by8:
+mk_global 	FUNCTION_NAME, function
+FUNCTION_NAME:
 	endbranch
         ; uint64_t c = crc ^ 0xffffffff,ffffffffL;
 	not arg1
@@ -471,6 +475,7 @@ section .data
 align 16
 ; rk7 = floor(2^128/Q)
 ; rk8 = Q
+%ifndef USE_CONSTS
 rk1:
 DQ 0xf500000000000001
 rk2:
@@ -511,6 +516,9 @@ rk19:
 DQ 0xa011000000000001
 rk20:
 DQ 0x1b1ab00000000001
+%else
+INCLUDE_CONSTS
+%endif
 
 pshufb_shf_table:
 ; use these values for shift constants for the pshufb instruction
diff --git a/crc/crc64_jones_norm_by8.asm b/crc/crc64_jones_norm_by8.asm
index 6d6ae2e..64ddcf8 100644
--- a/crc/crc64_jones_norm_by8.asm
+++ b/crc/crc64_jones_norm_by8.asm
@@ -27,483 +27,9 @@
 ;  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;       Function API:
-;       uint64_t crc64_jones_norm_by8(
-;               uint64_t init_crc, //initial CRC value, 64 bits
-;               const unsigned char *buf, //buffer pointer to calculate CRC on
-;               uint64_t len //buffer length in bytes (64-bit data)
-;       );
-;
-%include "reg_sizes.asm"
-
-%define	fetch_dist	1024
-
-[bits 64]
-default rel
-
-section .text
-
-%ifidn __OUTPUT_FORMAT__, win64
-        %xdefine        arg1 rcx
-        %xdefine        arg2 rdx
-        %xdefine        arg3 r8
-%else
-        %xdefine        arg1 rdi
-        %xdefine        arg2 rsi
-        %xdefine        arg3 rdx
-%endif
-
-%define TMP 16*0
-%ifidn __OUTPUT_FORMAT__, win64
-        %define XMM_SAVE 16*2
-        %define VARIABLE_OFFSET 16*10+8
-%else
-        %define VARIABLE_OFFSET 16*2+8
-%endif
-align 16
-mk_global 	crc64_jones_norm_by8, function
-crc64_jones_norm_by8:
-	endbranch
-
-	not	arg1      ;~init_crc
-
-	sub	rsp,VARIABLE_OFFSET
-
-%ifidn __OUTPUT_FORMAT__, win64
-        ; push the xmm registers into the stack to maintain
-        movdqa  [rsp + XMM_SAVE + 16*0], xmm6
-        movdqa  [rsp + XMM_SAVE + 16*1], xmm7
-        movdqa  [rsp + XMM_SAVE + 16*2], xmm8
-        movdqa  [rsp + XMM_SAVE + 16*3], xmm9
-        movdqa  [rsp + XMM_SAVE + 16*4], xmm10
-        movdqa  [rsp + XMM_SAVE + 16*5], xmm11
-        movdqa  [rsp + XMM_SAVE + 16*6], xmm12
-        movdqa  [rsp + XMM_SAVE + 16*7], xmm13
-%endif
-
-
-	; check if smaller than 256
-	cmp	arg3, 256
-
-	; for sizes less than 256, we can't fold 128B at a time...
-	jl	_less_than_256
-
-
-	; load the initial crc value
-	movq	xmm10, arg1	; initial crc
-
-	; crc value does not need to be byte-reflected, but it needs to be moved to the high part of the register.
-	; because data will be byte-reflected and will align with initial crc at correct place.
-	pslldq	xmm10, 8
-
-	movdqa xmm11, [SHUF_MASK]
-	; receive the initial 128B data, xor the initial crc value
-	movdqu	xmm0, [arg2+16*0]
-	movdqu	xmm1, [arg2+16*1]
-	movdqu	xmm2, [arg2+16*2]
-	movdqu	xmm3, [arg2+16*3]
-	movdqu	xmm4, [arg2+16*4]
-	movdqu	xmm5, [arg2+16*5]
-	movdqu	xmm6, [arg2+16*6]
-	movdqu	xmm7, [arg2+16*7]
-
-	pshufb	xmm0, xmm11
-	; XOR the initial_crc value
-	pxor	xmm0, xmm10
-	pshufb	xmm1, xmm11
-	pshufb	xmm2, xmm11
-	pshufb	xmm3, xmm11
-	pshufb	xmm4, xmm11
-	pshufb	xmm5, xmm11
-	pshufb	xmm6, xmm11
-	pshufb	xmm7, xmm11
-
-	movdqa	xmm10, [rk3]	;xmm10 has rk3 and rk4
-				;imm value of pclmulqdq instruction will determine which constant to use
-	;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-	; we subtract 256 instead of 128 to save one instruction from the loop
-	sub	arg3, 256
-
-	; at this section of the code, there is 128*x+y (0<=y<128) bytes of buffer. The _fold_128_B_loop
-	; loop will fold 128B at a time until we have 128+y Bytes of buffer
-
-
-	; fold 128B at a time. This section of the code folds 8 xmm registers in parallel
-_fold_128_B_loop:
-
-	; update the buffer pointer
-	add	arg2, 128		;    buf += 128;
-
-	prefetchnta [arg2+fetch_dist+0]
-	movdqu	xmm9, [arg2+16*0]
-	movdqu	xmm12, [arg2+16*1]
-	pshufb	xmm9, xmm11
-	pshufb	xmm12, xmm11
-	movdqa	xmm8, xmm0
-	movdqa	xmm13, xmm1
-	pclmulqdq	xmm0, xmm10, 0x0
-	pclmulqdq	xmm8, xmm10 , 0x11
-	pclmulqdq	xmm1, xmm10, 0x0
-	pclmulqdq	xmm13, xmm10 , 0x11
-	pxor	xmm0, xmm9
-	xorps	xmm0, xmm8
-	pxor	xmm1, xmm12
-	xorps	xmm1, xmm13
-
-	prefetchnta [arg2+fetch_dist+32]
-	movdqu	xmm9, [arg2+16*2]
-	movdqu	xmm12, [arg2+16*3]
-	pshufb	xmm9, xmm11
-	pshufb	xmm12, xmm11
-	movdqa	xmm8, xmm2
-	movdqa	xmm13, xmm3
-	pclmulqdq	xmm2, xmm10, 0x0
-	pclmulqdq	xmm8, xmm10 , 0x11
-	pclmulqdq	xmm3, xmm10, 0x0
-	pclmulqdq	xmm13, xmm10 , 0x11
-	pxor	xmm2, xmm9
-	xorps	xmm2, xmm8
-	pxor	xmm3, xmm12
-	xorps	xmm3, xmm13
-
-	prefetchnta [arg2+fetch_dist+64]
-	movdqu	xmm9, [arg2+16*4]
-	movdqu	xmm12, [arg2+16*5]
-	pshufb	xmm9, xmm11
-	pshufb	xmm12, xmm11
-	movdqa	xmm8, xmm4
-	movdqa	xmm13, xmm5
-	pclmulqdq	xmm4, xmm10, 0x0
-	pclmulqdq	xmm8, xmm10 , 0x11
-	pclmulqdq	xmm5, xmm10, 0x0
-	pclmulqdq	xmm13, xmm10 , 0x11
-	pxor	xmm4, xmm9
-	xorps	xmm4, xmm8
-	pxor	xmm5, xmm12
-	xorps	xmm5, xmm13
-
-	prefetchnta [arg2+fetch_dist+96]
-	movdqu	xmm9, [arg2+16*6]
-	movdqu	xmm12, [arg2+16*7]
-	pshufb	xmm9, xmm11
-	pshufb	xmm12, xmm11
-	movdqa	xmm8, xmm6
-	movdqa	xmm13, xmm7
-	pclmulqdq	xmm6, xmm10, 0x0
-	pclmulqdq	xmm8, xmm10 , 0x11
-	pclmulqdq	xmm7, xmm10, 0x0
-	pclmulqdq	xmm13, xmm10 , 0x11
-	pxor	xmm6, xmm9
-	xorps	xmm6, xmm8
-	pxor	xmm7, xmm12
-	xorps	xmm7, xmm13
-
-	sub	arg3, 128
-
-	; check if there is another 128B in the buffer to be able to fold
-	jge	_fold_128_B_loop
-	;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-	add	arg2, 128
-        ; at this point, the buffer pointer is pointing at the last y Bytes of the buffer, where 0 <= y < 128
-        ; the 128B of folded data is in 8 of the xmm registers: xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
-
-
-	; fold the 8 xmm registers to 1 xmm register with different constants
-
-	movdqa	xmm10, [rk9]
-	movdqa	xmm8, xmm0
-	pclmulqdq	xmm0, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	xorps	xmm7, xmm0
-
-	movdqa	xmm10, [rk11]
-	movdqa	xmm8, xmm1
-	pclmulqdq	xmm1, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	xorps	xmm7, xmm1
-
-	movdqa	xmm10, [rk13]
-	movdqa	xmm8, xmm2
-	pclmulqdq	xmm2, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	pxor	xmm7, xmm2
-
-	movdqa	xmm10, [rk15]
-	movdqa	xmm8, xmm3
-	pclmulqdq	xmm3, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	xorps	xmm7, xmm3
-
-	movdqa	xmm10, [rk17]
-	movdqa	xmm8, xmm4
-	pclmulqdq	xmm4, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	pxor	xmm7, xmm4
-
-	movdqa	xmm10, [rk19]
-	movdqa	xmm8, xmm5
-	pclmulqdq	xmm5, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	xorps	xmm7, xmm5
-
-	movdqa	xmm10, [rk1]	;xmm10 has rk1 and rk2
-
-	movdqa	xmm8, xmm6
-	pclmulqdq	xmm6, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	pxor	xmm7, xmm6
-
-
-	; instead of 128, we add 112 to the loop counter to save 1 instruction from the loop
-	; instead of a cmp instruction, we use the negative flag with the jl instruction
-	add	arg3, 128-16
-	jl	_final_reduction_for_128
-
-	; now we have 16+y bytes left to reduce. 16 Bytes is in register xmm7 and the rest is in memory
-	; we can fold 16 bytes at a time if y>=16
-	; continue folding 16B at a time
-
-_16B_reduction_loop:
-	movdqa	xmm8, xmm7
-	pclmulqdq	xmm7, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	movdqu	xmm0, [arg2]
-	pshufb	xmm0, xmm11
-	pxor	xmm7, xmm0
-	add	arg2, 16
-	sub	arg3, 16
-	; instead of a cmp instruction, we utilize the flags with the jge instruction
-	; equivalent of: cmp arg3, 16-16
-	; check if there is any more 16B in the buffer to be able to fold
-	jge	_16B_reduction_loop
-
-	;now we have 16+z bytes left to reduce, where 0<= z < 16.
-	;first, we reduce the data in the xmm7 register
-
-
-_final_reduction_for_128:
-	; check if any more data to fold. If not, compute the CRC of the final 128 bits
-	add	arg3, 16
-	je	_128_done
-
-	; here we are getting data that is less than 16 bytes.
-	; since we know that there was data before the pointer, we can offset the input pointer before the actual point, to receive exactly 16 bytes.
-	; after that the registers need to be adjusted.
-_get_last_two_xmms:
-	movdqa	xmm2, xmm7
-
-	movdqu	xmm1, [arg2 - 16 + arg3]
-	pshufb	xmm1, xmm11
-
-	; get rid of the extra data that was loaded before
-	; load the shift constant
-	lea	rax, [pshufb_shf_table + 16]
-	sub	rax, arg3
-	movdqu	xmm0, [rax]
-
-	; shift xmm2 to the left by arg3 bytes
-	pshufb	xmm2, xmm0
-
-	; shift xmm7 to the right by 16-arg3 bytes
-	pxor	xmm0, [mask1]
-	pshufb	xmm7, xmm0
-	pblendvb	xmm1, xmm2	;xmm0 is implicit
-
-	; fold 16 Bytes
-	movdqa	xmm2, xmm1
-	movdqa	xmm8, xmm7
-	pclmulqdq	xmm7, xmm10, 0x11
-	pclmulqdq	xmm8, xmm10, 0x0
-	pxor	xmm7, xmm8
-	pxor	xmm7, xmm2
-
-_128_done:
-	; compute crc of a 128-bit value
-	movdqa	xmm10, [rk5]	; rk5 and rk6 in xmm10
-	movdqa	xmm0, xmm7
-
-	;64b fold
-	pclmulqdq	xmm7, xmm10, 0x01	; H*L
-	pslldq	xmm0, 8
-	pxor	xmm7, xmm0
-
-	;barrett reduction
-_barrett:
-	movdqa	xmm10, [rk7]	; rk7 and rk8 in xmm10
-	movdqa	xmm0, xmm7
-
-	movdqa	xmm1, xmm7
-        pand    xmm1, [mask3]
-	pclmulqdq	xmm7, xmm10, 0x01
-	pxor	xmm7, xmm1
-
-	pclmulqdq	xmm7, xmm10, 0x11
-	pxor	xmm7, xmm0
-	pextrq	rax, xmm7, 0
-
-_cleanup:
-	not     rax
-%ifidn __OUTPUT_FORMAT__, win64
-        movdqa  xmm6, [rsp + XMM_SAVE + 16*0]
-        movdqa  xmm7, [rsp + XMM_SAVE + 16*1]
-        movdqa  xmm8, [rsp + XMM_SAVE + 16*2]
-        movdqa  xmm9, [rsp + XMM_SAVE + 16*3]
-        movdqa  xmm10, [rsp + XMM_SAVE + 16*4]
-        movdqa  xmm11, [rsp + XMM_SAVE + 16*5]
-        movdqa  xmm12, [rsp + XMM_SAVE + 16*6]
-        movdqa  xmm13, [rsp + XMM_SAVE + 16*7]
-%endif
-	add	rsp, VARIABLE_OFFSET
-	ret
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-align 16
-_less_than_256:
-
-	; check if there is enough buffer to be able to fold 16B at a time
-	cmp	arg3, 32
-	jl	_less_than_32
-	movdqa xmm11, [SHUF_MASK]
-
-	; if there is, load the constants
-	movdqa	xmm10, [rk1]	; rk1 and rk2 in xmm10
-
-	movq	xmm0, arg1	; get the initial crc value
-	pslldq	xmm0, 8	; align it to its correct place
-	movdqu	xmm7, [arg2]	; load the plaintext
-	pshufb	xmm7, xmm11	; byte-reflect the plaintext
-	pxor	xmm7, xmm0
-
-
-	; update the buffer pointer
-	add	arg2, 16
-
-	; update the counter. subtract 32 instead of 16 to save one instruction from the loop
-	sub	arg3, 32
-
-	jmp	_16B_reduction_loop
-align 16
-_less_than_32:
-	; mov initial crc to the return value. this is necessary for zero-length buffers.
-	mov	rax, arg1
-	test	arg3, arg3
-	je	_cleanup
-
-	movdqa xmm11, [SHUF_MASK]
-
-	movq	xmm0, arg1	; get the initial crc value
-	pslldq	xmm0, 8	; align it to its correct place
-
-	cmp	arg3, 16
-	je	_exact_16_left
-	jl	_less_than_16_left
-
-	movdqu	xmm7, [arg2]	; load the plaintext
-	pshufb	xmm7, xmm11	; byte-reflect the plaintext
-	pxor	xmm7, xmm0	; xor the initial crc value
-	add	arg2, 16
-	sub	arg3, 16
-	movdqa	xmm10, [rk1]	; rk1 and rk2 in xmm10
-	jmp	_get_last_two_xmms
-align 16
-_less_than_16_left:
-	; use stack space to load data less than 16 bytes, zero-out the 16B in memory first.
-	pxor	xmm1, xmm1
-	mov	r11, rsp
-	movdqa	[r11], xmm1
-
-	;	backup the counter value
-	mov	r9, arg3
-	cmp	arg3, 8
-	jl	_less_than_8_left
-
-	; load 8 Bytes
-	mov	rax, [arg2]
-	mov	[r11], rax
-	add	r11, 8
-	sub	arg3, 8
-	add	arg2, 8
-_less_than_8_left:
-
-	cmp	arg3, 4
-	jl	_less_than_4_left
-
-	; load 4 Bytes
-	mov	eax, [arg2]
-	mov	[r11], eax
-	add	r11, 4
-	sub	arg3, 4
-	add	arg2, 4
-_less_than_4_left:
-
-	cmp	arg3, 2
-	jl	_less_than_2_left
-
-	; load 2 Bytes
-	mov	ax, [arg2]
-	mov	[r11], ax
-	add	r11, 2
-	sub	arg3, 2
-	add	arg2, 2
-_less_than_2_left:
-	cmp     arg3, 1
-        jl      _zero_left
-
-	; load 1 Byte
-	mov	al, [arg2]
-	mov	[r11], al
-_zero_left:
-	movdqa	xmm7, [rsp]
-	pshufb	xmm7, xmm11
-	pxor	xmm7, xmm0	; xor the initial crc value
-
-	; shl r9, 4
-	lea	rax, [pshufb_shf_table + 16]
-	sub	rax, r9
-
-	cmp     r9, 8
-        jl      _end_1to7
-
-_end_8to15:
-	movdqu	xmm0, [rax]
-	pxor	xmm0, [mask1]
-
-	pshufb	xmm7, xmm0
-	jmp	_128_done
-
-_end_1to7:
-	; Right shift (8-length) bytes in XMM
-	add	rax, 8
-        movdqu  xmm0, [rax]
-        pshufb  xmm7,xmm0
-
-        jmp     _barrett
-align 16
-_exact_16_left:
-	movdqu	xmm7, [arg2]
-	pshufb	xmm7, xmm11
-	pxor	xmm7, xmm0	; xor the initial crc value
-
-	jmp	_128_done
-
-section .data
-
-; precomputed constants
-align 16
-
+%define FUNCTION_NAME crc64_jones_norm_by8
+%define USE_CONSTS
+%macro INCLUDE_CONSTS 0
 rk1:
 DQ 0x4445ed2750017038
 rk2:
@@ -544,36 +70,6 @@ rk19:
 DQ 0x96f2236e317179ee
 rk20:
 DQ 0xf00839aa0dd64bac
+%endm
 
-mask1:
-dq 0x8080808080808080, 0x8080808080808080
-mask2:
-dq 0xFFFFFFFFFFFFFFFF, 0x00000000FFFFFFFF
-mask3:
-dq 0x0000000000000000, 0xFFFFFFFFFFFFFFFF
-
-SHUF_MASK:
-dq 0x08090A0B0C0D0E0F, 0x0001020304050607
-
-pshufb_shf_table:
-; use these values for shift constants for the pshufb instruction
-; different alignments result in values as shown:
-;	dq 0x8887868584838281, 0x008f8e8d8c8b8a89 ; shl 15 (16-1) / shr1
-;	dq 0x8988878685848382, 0x01008f8e8d8c8b8a ; shl 14 (16-3) / shr2
-;	dq 0x8a89888786858483, 0x0201008f8e8d8c8b ; shl 13 (16-4) / shr3
-;	dq 0x8b8a898887868584, 0x030201008f8e8d8c ; shl 12 (16-4) / shr4
-;	dq 0x8c8b8a8988878685, 0x04030201008f8e8d ; shl 11 (16-5) / shr5
-;	dq 0x8d8c8b8a89888786, 0x0504030201008f8e ; shl 10 (16-6) / shr6
-;	dq 0x8e8d8c8b8a898887, 0x060504030201008f ; shl 9  (16-7) / shr7
-;	dq 0x8f8e8d8c8b8a8988, 0x0706050403020100 ; shl 8  (16-8) / shr8
-;	dq 0x008f8e8d8c8b8a89, 0x0807060504030201 ; shl 7  (16-9) / shr9
-;	dq 0x01008f8e8d8c8b8a, 0x0908070605040302 ; shl 6  (16-10) / shr10
-;	dq 0x0201008f8e8d8c8b, 0x0a09080706050403 ; shl 5  (16-11) / shr11
-;	dq 0x030201008f8e8d8c, 0x0b0a090807060504 ; shl 4  (16-12) / shr12
-;	dq 0x04030201008f8e8d, 0x0c0b0a0908070605 ; shl 3  (16-13) / shr13
-;	dq 0x0504030201008f8e, 0x0d0c0b0a09080706 ; shl 2  (16-14) / shr14
-;	dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
-dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
-dq 0x0706050403020100, 0x0f0e0d0c0b0a0908
-dq 0x8080808080808080, 0x0f0e0d0c0b0a0908
-dq 0x8080808080808080, 0x8080808080808080
+%include "crc64_iso_norm_by8.asm"
diff --git a/crc/crc64_jones_refl_by8.asm b/crc/crc64_jones_refl_by8.asm
index 88faa50..c7a8f18 100644
--- a/crc/crc64_jones_refl_by8.asm
+++ b/crc/crc64_jones_refl_by8.asm
@@ -27,450 +27,9 @@
 ;  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;       Function API:
-;       uint64_t crc64_jones_refl_by8(
-;               uint64_t init_crc, //initial CRC value, 64 bits
-;               const unsigned char *buf, //buffer pointer to calculate CRC on
-;               uint64_t len //buffer length in bytes (64-bit data)
-;       );
-;
-%include "reg_sizes.asm"
-
-%define	fetch_dist	1024
-
-[bits 64]
-default rel
-
-section .text
-
-
-%ifidn __OUTPUT_FORMAT__, win64
-        %xdefine        arg1 rcx
-        %xdefine        arg2 rdx
-        %xdefine        arg3 r8
-%else
-        %xdefine        arg1 rdi
-        %xdefine        arg2 rsi
-        %xdefine        arg3 rdx
-%endif
-
-%define TMP 16*0
-%ifidn __OUTPUT_FORMAT__, win64
-        %define XMM_SAVE 16*2
-        %define VARIABLE_OFFSET 16*10+8
-%else
-        %define VARIABLE_OFFSET 16*2+8
-%endif
-
-
-align 16
-mk_global crc64_jones_refl_by8, function
-crc64_jones_refl_by8:
-	endbranch
-        ; uint64_t c = crc ^ 0xffffffff,ffffffffL;
-	not arg1
-        sub     rsp, VARIABLE_OFFSET
-
-%ifidn __OUTPUT_FORMAT__, win64
-        ; push the xmm registers into the stack to maintain
-        movdqa  [rsp + XMM_SAVE + 16*0], xmm6
-        movdqa  [rsp + XMM_SAVE + 16*1], xmm7
-        movdqa  [rsp + XMM_SAVE + 16*2], xmm8
-        movdqa  [rsp + XMM_SAVE + 16*3], xmm9
-        movdqa  [rsp + XMM_SAVE + 16*4], xmm10
-        movdqa  [rsp + XMM_SAVE + 16*5], xmm11
-        movdqa  [rsp + XMM_SAVE + 16*6], xmm12
-        movdqa  [rsp + XMM_SAVE + 16*7], xmm13
-%endif
-
-        ; check if smaller than 256B
-        cmp     arg3, 256
-
-        ; for sizes less than 256, we can't fold 128B at a time...
-        jl      _less_than_256
-
-
-        ; load the initial crc value
-        movq    xmm10, arg1      ; initial crc
-      ; receive the initial 128B data, xor the initial crc value
-        movdqu  xmm0, [arg2+16*0]
-        movdqu  xmm1, [arg2+16*1]
-        movdqu  xmm2, [arg2+16*2]
-        movdqu  xmm3, [arg2+16*3]
-        movdqu  xmm4, [arg2+16*4]
-        movdqu  xmm5, [arg2+16*5]
-        movdqu  xmm6, [arg2+16*6]
-        movdqu  xmm7, [arg2+16*7]
-
-        ; XOR the initial_crc value
-        pxor    xmm0, xmm10
-        movdqa  xmm10, [rk3]    ;xmm10 has rk3 and rk4
-                                        ;imm value of pclmulqdq instruction will determine which constant to use
-        ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-        ; we subtract 256 instead of 128 to save one instruction from the loop
-        sub     arg3, 256
-
-        ; at this section of the code, there is 128*x+y (0<=y<128) bytes of buffer. The _fold_128_B_loop
-        ; loop will fold 128B at a time until we have 128+y Bytes of buffer
-
-
-        ; fold 128B at a time. This section of the code folds 8 xmm registers in parallel
-_fold_128_B_loop:
-
-        ; update the buffer pointer
-        add     arg2, 128
-
-	prefetchnta [arg2+fetch_dist+0]
-        movdqu  xmm9, [arg2+16*0]
-        movdqu  xmm12, [arg2+16*1]
-        movdqa  xmm8, xmm0
-        movdqa  xmm13, xmm1
-        pclmulqdq       xmm0, xmm10, 0x10
-        pclmulqdq       xmm8, xmm10 , 0x1
-        pclmulqdq       xmm1, xmm10, 0x10
-        pclmulqdq       xmm13, xmm10 , 0x1
-        pxor    xmm0, xmm9
-        xorps   xmm0, xmm8
-        pxor    xmm1, xmm12
-        xorps   xmm1, xmm13
-
-	prefetchnta [arg2+fetch_dist+32]
-        movdqu  xmm9, [arg2+16*2]
-        movdqu  xmm12, [arg2+16*3]
-        movdqa  xmm8, xmm2
-        movdqa  xmm13, xmm3
-        pclmulqdq       xmm2, xmm10, 0x10
-        pclmulqdq       xmm8, xmm10 , 0x1
-        pclmulqdq       xmm3, xmm10, 0x10
-        pclmulqdq       xmm13, xmm10 , 0x1
-        pxor    xmm2, xmm9
-        xorps   xmm2, xmm8
-        pxor    xmm3, xmm12
-        xorps   xmm3, xmm13
-
-	prefetchnta [arg2+fetch_dist+64]
-        movdqu  xmm9, [arg2+16*4]
-        movdqu  xmm12, [arg2+16*5]
-        movdqa  xmm8, xmm4
-        movdqa  xmm13, xmm5
-        pclmulqdq       xmm4, xmm10, 0x10
-        pclmulqdq       xmm8, xmm10 , 0x1
-        pclmulqdq       xmm5, xmm10, 0x10
-        pclmulqdq       xmm13, xmm10 , 0x1
-        pxor    xmm4, xmm9
-        xorps   xmm4, xmm8
-        pxor    xmm5, xmm12
-        xorps   xmm5, xmm13
-
-	prefetchnta [arg2+fetch_dist+96]
-        movdqu  xmm9, [arg2+16*6]
-        movdqu  xmm12, [arg2+16*7]
-        movdqa  xmm8, xmm6
-        movdqa  xmm13, xmm7
-        pclmulqdq       xmm6, xmm10, 0x10
-        pclmulqdq       xmm8, xmm10 , 0x1
-        pclmulqdq       xmm7, xmm10, 0x10
-        pclmulqdq       xmm13, xmm10 , 0x1
-        pxor    xmm6, xmm9
-        xorps   xmm6, xmm8
-        pxor    xmm7, xmm12
-        xorps   xmm7, xmm13
-
-        sub     arg3, 128
-
-        ; check if there is another 128B in the buffer to be able to fold
-        jge     _fold_128_B_loop
-        ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-        add     arg2, 128
-        ; at this point, the buffer pointer is pointing at the last y Bytes of the buffer, where 0 <= y < 128
-        ; the 128B of folded data is in 8 of the xmm registers: xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
-
-
-        ; fold the 8 xmm registers to 1 xmm register with different constants
-	; xmm0 to xmm7
-        movdqa  xmm10, [rk9]
-        movdqa  xmm8, xmm0
-        pclmulqdq       xmm0, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        xorps   xmm7, xmm0
-        ;xmm1 to xmm7
-        movdqa  xmm10, [rk11]
-        movdqa  xmm8, xmm1
-        pclmulqdq       xmm1, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        xorps   xmm7, xmm1
-
-        movdqa  xmm10, [rk13]
-        movdqa  xmm8, xmm2
-        pclmulqdq       xmm2, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        pxor    xmm7, xmm2
-
-        movdqa  xmm10, [rk15]
-        movdqa  xmm8, xmm3
-        pclmulqdq       xmm3, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        xorps   xmm7, xmm3
-
-        movdqa  xmm10, [rk17]
-        movdqa  xmm8, xmm4
-        pclmulqdq       xmm4, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        pxor    xmm7, xmm4
-
-        movdqa  xmm10, [rk19]
-        movdqa  xmm8, xmm5
-        pclmulqdq       xmm5, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        xorps   xmm7, xmm5
-	; xmm6 to xmm7
-        movdqa  xmm10, [rk1]
-        movdqa  xmm8, xmm6
-        pclmulqdq       xmm6, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        pxor    xmm7, xmm6
-
-
-        ; instead of 128, we add 128-16 to the loop counter to save 1 instruction from the loop
-        ; instead of a cmp instruction, we use the negative flag with the jl instruction
-        add     arg3, 128-16
-        jl      _final_reduction_for_128
-
-        ; now we have 16+y bytes left to reduce. 16 Bytes is in register xmm7 and the rest is in memory
-        ; we can fold 16 bytes at a time if y>=16
-        ; continue folding 16B at a time
-
-_16B_reduction_loop:
-        movdqa  xmm8, xmm7
-        pclmulqdq       xmm7, xmm10, 0x1
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        movdqu  xmm0, [arg2]
-        pxor    xmm7, xmm0
-        add     arg2, 16
-        sub     arg3, 16
-        ; instead of a cmp instruction, we utilize the flags with the jge instruction
-        ; equivalent of: cmp arg3, 16-16
-        ; check if there is any more 16B in the buffer to be able to fold
-        jge     _16B_reduction_loop
-
-        ;now we have 16+z bytes left to reduce, where 0<= z < 16.
-        ;first, we reduce the data in the xmm7 register
-
-
-_final_reduction_for_128:
-        add arg3, 16
-        je _128_done
-  ; here we are getting data that is less than 16 bytes.
-        ; since we know that there was data before the pointer, we can offset the input pointer before the actual point, to receive exactly 16 bytes.
-        ; after that the registers need to be adjusted.
-_get_last_two_xmms:
-
-
-        movdqa xmm2, xmm7
-        movdqu xmm1, [arg2 - 16 + arg3]
-
-        ; get rid of the extra data that was loaded before
-        ; load the shift constant
-        lea     rax, [pshufb_shf_table]
-        add     rax, arg3
-        movdqu  xmm0, [rax]
-
-
-        pshufb  xmm7, xmm0
-        pxor    xmm0, [mask3]
-        pshufb  xmm2, xmm0
-
-        pblendvb        xmm2, xmm1     ;xmm0 is implicit
-        ;;;;;;;;;;
-        movdqa  xmm8, xmm7
-        pclmulqdq       xmm7, xmm10, 0x1
-
-        pclmulqdq       xmm8, xmm10, 0x10
-        pxor    xmm7, xmm8
-        pxor    xmm7, xmm2
-
-_128_done:
-        ; compute crc of a 128-bit value
-        movdqa  xmm10, [rk5]
-        movdqa  xmm0, xmm7
-
-        ;64b fold
-        pclmulqdq       xmm7, xmm10, 0
-        psrldq  xmm0, 8
-        pxor    xmm7, xmm0
-
-        ;barrett reduction
-_barrett:
-        movdqa  xmm1, xmm7
-        movdqa  xmm10, [rk7]
-
-        pclmulqdq       xmm7, xmm10, 0
-        movdqa  xmm2, xmm7
-        pclmulqdq       xmm7, xmm10, 0x10
-        pslldq  xmm2, 8
-        pxor    xmm7, xmm2
-        pxor    xmm7, xmm1
-        pextrq  rax, xmm7, 1
-
-_cleanup:
-        ; return c ^ 0xffffffff, ffffffffL;
-        not     rax
-
-
-%ifidn __OUTPUT_FORMAT__, win64
-        movdqa  xmm6, [rsp + XMM_SAVE + 16*0]
-        movdqa  xmm7, [rsp + XMM_SAVE + 16*1]
-        movdqa  xmm8, [rsp + XMM_SAVE + 16*2]
-        movdqa  xmm9, [rsp + XMM_SAVE + 16*3]
-        movdqa  xmm10, [rsp + XMM_SAVE + 16*4]
-        movdqa  xmm11, [rsp + XMM_SAVE + 16*5]
-        movdqa  xmm12, [rsp + XMM_SAVE + 16*6]
-        movdqa  xmm13, [rsp + XMM_SAVE + 16*7]
-%endif
-        add     rsp, VARIABLE_OFFSET
-        ret
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-align 16
-_less_than_256:
-
-        ; check if there is enough buffer to be able to fold 16B at a time
-        cmp     arg3, 32
-        jl      _less_than_32
-
-        ; if there is, load the constants
-        movdqa  xmm10, [rk1]    ; rk1 and rk2 in xmm10
-
-        movq    xmm0, arg1       ; get the initial crc value
-        movdqu  xmm7, [arg2]            ; load the plaintext
-        pxor    xmm7, xmm0
-
-        ; update the buffer pointer
-        add     arg2, 16
-
-        ; update the counter. subtract 32 instead of 16 to save one instruction from the loop
-        sub     arg3, 32
-
-        jmp     _16B_reduction_loop
-
-align 16
-_less_than_32:
-        ; mov initial crc to the return value. this is necessary for zero-length buffers.
-        mov     rax, arg1
-        test    arg3, arg3
-        je      _cleanup
-
-        movq    xmm0, arg1       ; get the initial crc value
-
-        cmp     arg3, 16
-        je      _exact_16_left
-        jl      _less_than_16_left
-
-        movdqu  xmm7, [arg2]            ; load the plaintext
-        pxor    xmm7, xmm0              ; xor the initial crc value
-        add     arg2, 16
-        sub     arg3, 16
-        movdqa  xmm10, [rk1]    ; rk1 and rk2 in xmm10
-        jmp     _get_last_two_xmms
-
-
-align 16
-_less_than_16_left:
-        ; use stack space to load data less than 16 bytes, zero-out the 16B in memory first.
-
-        pxor    xmm1, xmm1
-        mov     r11, rsp
-        movdqa  [r11], xmm1
-
-        ;       backup the counter value
-        mov     r9, arg3
-        cmp     arg3, 8
-        jl      _less_than_8_left
-
-        ; load 8 Bytes
-        mov     rax, [arg2]
-        mov     [r11], rax
-        add     r11, 8
-        sub     arg3, 8
-        add     arg2, 8
-_less_than_8_left:
-
-        cmp     arg3, 4
-        jl      _less_than_4_left
-
-        ; load 4 Bytes
-        mov     eax, [arg2]
-        mov     [r11], eax
-        add     r11, 4
-        sub     arg3, 4
-        add     arg2, 4
-_less_than_4_left:
-
-        cmp     arg3, 2
-        jl      _less_than_2_left
-
-        ; load 2 Bytes
-        mov     ax, [arg2]
-        mov     [r11], ax
-        add     r11, 2
-        sub     arg3, 2
-        add     arg2, 2
-_less_than_2_left:
-        cmp     arg3, 1
-        jl      _zero_left
-
-        ; load 1 Byte
-        mov     al, [arg2]
-        mov     [r11], al
-
-_zero_left:
-        movdqa  xmm7, [rsp]
-        pxor    xmm7, xmm0      ; xor the initial crc value
-
-        lea rax,[pshufb_shf_table]
-
-	cmp     r9, 8
-        jl      _end_1to7
-
-_end_8to15:
-        movdqu  xmm0, [rax + r9]
-        pshufb  xmm7,xmm0
-        jmp     _128_done
-
-_end_1to7:
-	; Left shift (8-length) bytes in XMM
-        movdqu  xmm0, [rax + r9 + 8]
-        pshufb  xmm7,xmm0
-
-        jmp     _barrett
-
-align 16
-_exact_16_left:
-        movdqu  xmm7, [arg2]
-        pxor    xmm7, xmm0      ; xor the initial crc value
-
-        jmp     _128_done
-
-section .data
-
-; precomputed constants
-align 16
-; rk7 = floor(2^128/Q)
-; rk8 = Q
+%define FUNCTION_NAME crc64_jones_refl_by8
+%define USE_CONSTS
+%macro INCLUDE_CONSTS 0
 rk1:
 DQ 0x381d0015c96f4444
 rk2:
@@ -511,32 +70,6 @@ rk19:
 DQ 0xef3d1d18ed889ed2
 rk20:
 DQ 0x6ba4d760ab38201e
+%endm
 
-pshufb_shf_table:
-; use these values for shift constants for the pshufb instruction
-; different alignments result in values as shown:
-;       dq 0x8887868584838281, 0x008f8e8d8c8b8a89 ; shl 15 (16-1) / shr1
-;       dq 0x8988878685848382, 0x01008f8e8d8c8b8a ; shl 14 (16-3) / shr2
-;       dq 0x8a89888786858483, 0x0201008f8e8d8c8b ; shl 13 (16-4) / shr3
-;       dq 0x8b8a898887868584, 0x030201008f8e8d8c ; shl 12 (16-4) / shr4
-;       dq 0x8c8b8a8988878685, 0x04030201008f8e8d ; shl 11 (16-5) / shr5
-;       dq 0x8d8c8b8a89888786, 0x0504030201008f8e ; shl 10 (16-6) / shr6
-;       dq 0x8e8d8c8b8a898887, 0x060504030201008f ; shl 9  (16-7) / shr7
-;       dq 0x8f8e8d8c8b8a8988, 0x0706050403020100 ; shl 8  (16-8) / shr8
-;       dq 0x008f8e8d8c8b8a89, 0x0807060504030201 ; shl 7  (16-9) / shr9
-;       dq 0x01008f8e8d8c8b8a, 0x0908070605040302 ; shl 6  (16-10) / shr10
-;       dq 0x0201008f8e8d8c8b, 0x0a09080706050403 ; shl 5  (16-11) / shr11
-;       dq 0x030201008f8e8d8c, 0x0b0a090807060504 ; shl 4  (16-12) / shr12
-;       dq 0x04030201008f8e8d, 0x0c0b0a0908070605 ; shl 3  (16-13) / shr13
-;       dq 0x0504030201008f8e, 0x0d0c0b0a09080706 ; shl 2  (16-14) / shr14
-;       dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
-dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
-dq 0x0706050403020100, 0x000e0d0c0b0a0908
-
-
-mask:
-dq     0xFFFFFFFFFFFFFFFF, 0x0000000000000000
-mask2:
-dq     0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFF
-mask3:
-dq     0x8080808080808080, 0x8080808080808080
+%include "crc64_iso_refl_by8.asm"