diff --git a/src/cfg/vs/vs-inc.props b/src/cfg/vs/vs-inc.props deleted file mode 100644 index 19a94b9c13825..0000000000000 --- a/src/cfg/vs/vs-inc.props +++ /dev/null @@ -1,5 +0,0 @@ - - - $(MSBuildThisFileDirectory)..\..\..\src\include;$(MSBuildThisFileDirectory)..\..\..\src;$(MSBuildThisFileDirectory)..\..\..\foreign;$(IncludePath); - - diff --git a/src/cfg/vs/vs-ver.props b/src/cfg/vs/vs-ver.props deleted file mode 100644 index 9a006e68c0295..0000000000000 --- a/src/cfg/vs/vs-ver.props +++ /dev/null @@ -1,30 +0,0 @@ - - - true - - - v141 - - 10.0.14393.0 - 10.0.14393.0 - - $(MSBuildThisFileDirectory)..\..\..\tools\ - - - - $(SolutionDir)\obj\$(ProjectName)\$(PlatformShortName)_$(Configuration)\ - $(SolutionDir)$(PlatformShortName)_$(Configuration)\ - - - - ProgramDatabase - false - $(IntDir)\%(RelativeDir) - - - true - 5.01 - 5.2 - - - diff --git a/src/cfg/vs/vsyasm.props b/src/cfg/vs/vsyasm.props deleted file mode 100755 index 77a414ed496f2..0000000000000 --- a/src/cfg/vs/vsyasm.props +++ /dev/null @@ -1,27 +0,0 @@ - - - - Midl - CustomBuild - - - _SelectedFiles;$(YASMDependsOn) - - - $(VCInstallDir)bin\ - - - - False - $(IntDir)%(FileName).obj - 0 - 0 - "$(YasmPath)"vsyasm.exe -Xvc -f $(Platform.ToLower()) [AllOptions] [AdditionalOptions] [Inputs] - %(ObjectFile) - Assembling %(Filename)%(Extension) - false - - - \ No newline at end of file diff --git a/src/cfg/vs/vsyasm.targets b/src/cfg/vs/vsyasm.targets deleted file mode 100755 index 525601e5574b2..0000000000000 --- a/src/cfg/vs/vsyasm.targets +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - _YASM - - - - $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml - - - - - - - - @(YASM, '|') - - - - - - - - - $(ComputeLinkInputsTargets); - ComputeYASMOutput; - - - $(ComputeLibInputsTargets); - ComputeYASMOutput; - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/cfg/vs/vsyasm.xml b/src/cfg/vs/vsyasm.xml deleted file mode 100755 index 403bc252cac59..0000000000000 --- a/src/cfg/vs/vsyasm.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - General - - - - - - Symbols - - - - - - Files - - - - - - Command Line - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Execute Before - - - Specifies the targets for the build customization to run before. - - - - - - - - - - - - Execute After - - - Specifies the targets for the build customization to run after. - - - - - - - - - - - - - - - - - - Additional Options - - - Additional Options - - - - - - - - \ No newline at end of file diff --git a/src/compat/vc_compat.cpp b/src/compat/vc_compat.cpp deleted file mode 100755 index 873ff7c84f26c..0000000000000 --- a/src/compat/vc_compat.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include - -extern "C" { - -tm * __cdecl gmtime_r(const time_t *timer, tm *result) { - __time64_t t64 = *timer; - if (!_gmtime64_s(result, &t64)) - return result; - return 0; -} - -} diff --git a/src/el/LICENSE b/src/el/LICENSE deleted file mode 100755 index cdddf6ea22cb8..0000000000000 --- a/src/el/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ -License: Public Domain - -Files - el/bignum/x86x64/bignum-x86x64.asm - el/bignum/x86x64/montgomery_mul_x86x64.asm - -are placed in the Public Domain diff --git a/src/el/bignum/x86x64/bignum-x86x64.asm b/src/el/bignum/x86x64/bignum-x86x64.asm deleted file mode 100755 index 1641d16989fb1..0000000000000 --- a/src/el/bignum/x86x64/bignum-x86x64.asm +++ /dev/null @@ -1,516 +0,0 @@ -;/*###### Copyright (c) 2001-2015 Ufasoft http://ufasoft.com mailto:support@ufasoft.com, Sergey Pavlov mailto:dev@ufasoft.com #### -;# # -;# See LICENSE for licensing information # -;#####################################################################################################################################*/ - - - -INCLUDE el/x86x64.inc - - -;OPTION PROLOGUE:None -;OPTION EPILOGUE:None - -IF X64 -ELSE -.XMM -ENDIF - -IF X64 - ImpAddBignums PROC PUBLIC USES ZBX ZSI ZDI - mov ZSI, RCX ; a - mov ZDI, R8 ; d - mov ZBX, RDX ; b - mov ZCX, R9 ; siz -ELSE - ImpAddBignums PROC stdcall PUBLIC USES ZBX ZSI ZDI, a:DWORD, b:DWORD , d:DWORD, siz:DWORD - mov ZSI, a - mov ZDI, d - mov ZBX, b - mov ZCX, siz -ENDIF - sub ZBX, ZDI - clc -@@x: lodsZ - adc ZAX, [ZBX+ZDI] - stosZ - loop @@x - setnge CL - neg ZCX - mov [ZDI], ZCX - ret -ImpAddBignums ENDP - -IF X64 - ImpAddBignumsEx PROC PUBLIC USES ZBX ZSI ZDI - mov ZDI, RCX ; u - mov ZSI, RDX ; b - mov ZCX, R8 ; siz -ELSE - ImpAddBignumsEx PROC stdcall PUBLIC USES ZBX ZSI ZDI, u:DWORD, v:DWORD , siz:DWORD - mov ZSI, v - mov ZDI, u - mov ZCX, siz -ENDIF - clc -@@x: lodsZ - adc ZAX, [ZDI] - stosZ - loop @@x - adc ZWORD_PTR [ZDI], ZCX - ret -ImpAddBignumsEx ENDP - -IF X64 - ImpSubBignums PROC PUBLIC USES ZBX ZSI ZDI - mov ZSI, RCX ; a - mov ZDI, R8 ; d - mov ZBX, RDX ; b - mov ZCX, R9 ; siz -ELSE - ImpSubBignums PROC stdcall PUBLIC USES ZBX ZSI ZDI, a:DWORD, b:DWORD , d:DWORD, siz:DWORD - mov ZSI, a - mov ZDI, d - mov ZBX, b - mov ZCX, siz -ENDIF - sub ZBX, ZDI - clc -@@x: lodsZ - sbb ZAX, [ZBX+ZDI] - stosZ - loop @@x - setnge CL - neg ZCX - mov [ZDI], ZCX - ret -ImpSubBignums ENDP - - -IF X64 - ImpNegBignum PROC PUBLIC USES ZBX ZSI ZDI - mov ZSI, ZCX ; a - mov ZDI, R8 ; d - mov ZCX, RDX ; siz -ELSE - ImpNegBignum PROC stdcall PUBLIC USES ZBX ZSI ZDI, a:DWORD, siz:DWORD, d:DWORD - mov ESI, a - mov EDI, d - mov ECX, siz -ENDIF - clc -@@x: lodsZ - mov ZBX, 0 - sbb ZBX, ZAX - xchg ZAX, ZBX - stosZ - loop @@x - setnge CL - neg ZCX - mov [ZDI], ZCX - ret -ImpNegBignum ENDP - -IF X64 - ImpShld PROC PUBLIC USES ZBX ZSI ZDI ZBP - mov RSI, ZCX ; s - mov RDI, ZDX ; d - mov RCX, R9 ; amt - mov RBX, R8 ; siz -ELSE - ImpShld PROC stdcall PUBLIC USES ZBX ZSI ZDI ZBP, s:DWORD, d:DWORD, siz:DWORD , amt:DWORD - mov ESI, s - mov EDI, d - mov ECX, amt - mov EBX, siz -ENDIF - xor ZBP, ZBP -@@x: mov ZDX, ZBP - lodsZ - mov ZBP, ZAX - shld ZAX, ZDX, CL - stosZ - dec ZBX - jnz @@x - xchg ZAX, ZBP - cZY - shld ZDX, ZAX, CL - mov [ZDI], ZDX - ret -ImpShld ENDP - -IF X64 - ImpShrd PROC PUBLIC USES ZBX ZSI ZDI, s:QWORD, d:QWORD, siz:QWORD, amt:QWORD, prev:QWORD - mov s, RCX - mov d, RDX - mov siz, R8 - mov amt, R9 - mov RSI, ZCX ; s - mov RDI, ZDX ; d - mov RCX, R9 ; amt - mov RBX, R8 ; siz -ELSE - ImpShrd PROC stdcall PUBLIC USES ZBX ZSI ZDI, s:DWORD, d:DWORD, siz:DWORD , amt:DWORD, prev: DWORD - mov ESI, s - mov EDI, d - mov ECX, amt - mov EBX, siz -ENDIF - dec ZBX - shl ZBX, ZWORD_BITS-3 - add ZSI, ZBX - add ZDI, ZBX - mov ZBX, siz - push ZBP - mov ZDX, prev - std -@@x: lodsZ - mov ZBP, ZAX - shrd ZAX, ZDX, CL - stosZ - mov ZDX, ZBP - dec ZBX - jnz @@x - pop ZBP - cld - ret -ImpShrd ENDP - -IF X64 - ImpRcl PROC PUBLIC -ELSE - ImpRcl PROC stdcall PUBLIC USES ZBX, siz:DWORD, p:DWORD - mov EDX, p - mov ECX, siz -ENDIF - clc -@@x: rcl ZWORD_PTR [ZBX], 1 - lahf - add ZDX, ZWORD_SIZE - sahf - loop @@x - setc AL - ret -ImpRcl ENDP - - -IF X64 - ImpBT PROC PUBLIC - mov ZBX, ZCX - mov ZAX, ZDX -ELSE - ImpBT PROC C PUBLIC, p:DWORD, i:DWORD - mov ZBX, p - mov ZAX, i -ENDIF - bt [ZBX], ZAX - setc AL - ret -ImpBT ENDP - -IF X64 - ImpMulBignums PROC PUBLIC USES ZBX ZSI ZDI, a:QWORD, m:QWORD, b:QWORD, n: QWORD, d:QWORD - mov a, RCX - mov m, RDX - mov b, R8 - mov n, R9 -ELSE - ImpMulBignums PROC stdcall PUBLIC USES ZBX ZSI ZDI, a:DWORD, m:DWORD, b:DWORD, n:DWORD, d:DWORD -ENDIF - mov ZCX, m - add ZCX, n - mov ZDI, d - xor ZAX, ZAX - rep stosZ - mov ZSI, b - mov ZDI, d - mov ZCX, n -@@x: lodsZ - push ZCX - push ZSI - push ZDI - push ZBP - xchg ZAX, ZBX - mov ZSI, a - mov ZCX, m - xor ZDX, ZDX -@@y: lodsZ - mov ZBP, ZDX - mul ZBX - add ZAX, ZBP - adc ZDX, 0 - add [ZDI], ZAX - lea zdi, [ZDI+ZWORD_SIZE] - adc ZDX, 0 - loop @@y - mov [ZDI], ZDX - pop ZBP - pop ZDI - add ZDI, ZWORD_SIZE - pop ZSI - pop ZCX - loop @@x - ret -ImpMulBignums ENDP - - -EXTRN g_bHasSse2:PTR BYTE - -IF X64 - ImpMulAddBignums PROC PUBLIC USES ZBX ZSI ZDI, r:QWORD, a:QWORD, n:QWORD, w: QWORD - mov r, RCX - mov a, RDX - mov n, R8 - mov w, R9 -ELSE - ImpMulAddBignums PROC PUBLIC USES ZBX ZSI ZDI, r:DWORD, a:DWORD, n:DWORD, w:DWORD -ENDIF - mov ZSI, a - mov ZCX, n - mov ZDI, r - mov ZBX, w -IF X64 -ELSE - cmp BYTE PTR g_bHasSse2, 0 - je LAB_BeginMulAddBignums - - pxor xmm2, xmm2 ; carry - mov zdx, zcx - xor zax, zax - and zdx, 3 - shr zcx, 2 - jz @@b - movd xmm7, zbx - pshufd xmm7, xmm7, 0 - pxor xmm0, xmm0 ; const zero -@@c: movdqu xmm5, [zsi+zax] ; xmm5 = (a[3] a[2] a[1] a[0]) - movdqu xmm6, [zdi+zax] ; xmm6 = (r[3] r[2] r[1] r[0]) - - pshufd xmm1, xmm5, 000010000b ; xmm1 = (? a[1] ? a[0]) - pmuludq xmm1, xmm7 ; xmm1 = ({a[1]*w} {a[0]*w}) - - movdqa xmm3, xmm6 - unpcklps xmm3, xmm0 ; xmm3 = (0 r[1] 0 r[0]) - paddq xmm1, xmm3 - paddq xmm1, xmm2 ; xmm1 = ({a[1]*w+r[1]} {a[0]*w+r[0]+prevCarry}) - - unpckhpd xmm2, xmm1 ; xmm2 = ({a[1]*w+r[1]} 0 0) - unpcklps xmm1, xmm0 ; xmm1 = (0 high({a[0]*w+r[0]+prevCarry} 0 low({a[0]*w+r[0]+prevCarry}) - paddq xmm2, xmm1 - pshufd xmm4, xmm2, 010000000b ; xmm4 = (d1 d0 ? ?) - pshufd xmm2, xmm2, 001010111b ; xmm2 = (0 0 0 carry) - - pshufd xmm1, xmm5, 000110010b ; xmm1 = (? a[3] ? a[2]) - pmuludq xmm1, xmm7 ; xmm1 = ({a[3]*w} {a[2]*w}) - - unpckhps xmm6, xmm0 ; xmm6 = (0 r[3] 0 r[2]) - paddq xmm1, xmm6 - paddq xmm1, xmm2 ; xmm1 = ({a[3]*w+r[3]} {a[2]*w+r[2]+prevCarry}) - - unpckhpd xmm2, xmm1 ; xmm2 = ({a[3]*w+r[3]} 0 0) - unpcklps xmm1, xmm0 ; xmm1 = (0 high({a[2]*w+r[2]+prevCarry} 0 low({a[2]*w+r[2]+prevCarry}) - paddq xmm2, xmm1 - pshufd xmm1, xmm2, 010000000b - unpckhpd xmm4, xmm1 ; xmm4 = (d3 d2 d1 d0) - pshufd xmm2, xmm2, 001010111b ; xmm2 = (0 0 0 carry) - - movdqu [zdi+zax], xmm4 - add zax, 16 - loop @@c -@@b: add zcx, zdx - jnz @@d - movd zax, xmm2 - ret -@@d: add zsi, zax - add zdi, zax - push zbp - movd zdx, xmm2 - jmp LAB_ContinueMulAddBignums -ENDIF - -LAB_BeginMulAddBignums: - push zbp - xor zdx, zdx -LAB_ContinueMulAddBignums: -@@a: lodsZ - mov zbp, zdx - mul zbx - add zax, zbp - adc zdx, 0 - add zax, [zdi] - adc zdx, 0 - stosZ - loop @@a - mov zax, zdx - pop zbp - ret -ImpMulAddBignums ENDP - - -IF X64 - ImpMulSubBignums PROC PUBLIC USES ZBX ZSI ZDI, u:QWORD, v:QWORD, n:QWORD, q: QWORD - mov u, RCX - mov v, RDX ;!!!? was n - mov n, R8 - mov q, R9 -ELSE - ImpMulSubBignums PROC stdcall PUBLIC USES ZBX ZSI ZDI, u:DWORD, v:DWORD, n:DWORD, q:DWORD -ENDIF - mov ZSI, v ;!!! Contract: lowest bit of u is 0, TODO: change thit to ECX as in ImpMulAdd - mov ZCX, n - mov ZDI, u - mov ZBX, q - push ZBP - xor ZBP, ZBP - clc - rcr ZDI, 1 -@@a: lodsZ - mul ZBX - add ZAX, ZBP - adc ZDX, 0 - ; CF=0 here - rcl ZDI, 1 - sbb [ZDI], ZAX - rcr ZDI, 1 - mov ZBP, ZDX - add ZDI, ZWORD_SIZE/2 - loop @@a - ; CF=0 here - rcl ZDI, 1 - sbb [ZDI], ZBP - setc AL - pop ZBP - ret -ImpMulSubBignums ENDP - - -IF X64 - ImpShortDiv PROC PUBLIC USES ZBX ZSI ZDI, s:QWORD, d:QWORD, siz:QWORD, q: QWORD - mov s, RCX - mov d, RDX - mov siz, R8 - mov q, R9 -ELSE - ImpShortDiv PROC stdcall PUBLIC USES ZBX ZSI ZDI, s:DWORD, d:DWORD, siz:DWORD, q: DWORD -ENDIF - mov ZCX, siz - lea ZSI, [ZCX*ZWORD_SIZE-ZWORD_SIZE] - mov ZDI, ZSI - add ZSI, s - add ZDI, d - mov ZBX, q - mov ZDX, [ZSI+ZWORD_SIZE] - std -@@a: lodsZ - div ZBX - stosZ - loop @@a - cld - mov ZAX, ZDX - ret -ImpShortDiv ENDP - - -IF X64 - ImpDivBignums PROC PUBLIC USES ZBX ZSI ZDI, a:QWORD, b:QWORD, d:QWORD, n: QWORD - mov a, RCX - mov b, RDX - mov d, R8 - mov n, R9 -ELSE - ImpDivBignums PROC stdcall PUBLIC USES ZBX ZSI ZDI, a:DWORD, b:DWORD, d:DWORD, n: DWORD -ENDIF - mov ZCX, n - shl ZCX, ZWORD_BITS-2 - sub ZSP, ZCX - shr ZCX, ZWORD_BITS-3 - mov ZDI, ZSP - xor EAX, EAX - rep stosZ - mov ZCX, n - shl ZCX, ZWORD_BITS-3 - sub ZDI, ZCX - mov ZDX, n - shl ZDX, ZWORD_BITS - clc - mov ZSI, ZSP -@@x: mov ZCX, n - mov ZBX, a -@@y: rcl ZWORD_PTR [ZBX], 1 - lahf - add ZBX, ZWORD_SIZE - sahf - loop @@y - dec ZDX - mov ZCX, n - js @@t - push ZSI -@@z: rcl ZWORD_PTR [ZSI], 1 - lodsZ - loop @@z - pop ZSI - mov ZCX, n - clc - push ZSI - push ZDI - mov ZBX, b -@@w: lodsZ - sbb ZAX, [ZBX] - stosZ - lahf - add ZBX, ZWORD_SIZE - sahf - loop @@w - pop ZDI - pop ZSI - cmc - jnc @@x - xchg ZSI, ZDI - jmp @@x -@@t: mov ZDI, d - rep movsZ - lea ZSP, [ZBP-3*ZWORD_SIZE] - ret -ImpDivBignums ENDP - -extrn memcpy: NEAR - -IF X64 -ELSE - MemcpySse PROC PUBLIC - push ecx - push esi - push edi - mov edi, [esp+4*4] ; dst - mov esi, [esp+5*4] ; src - mov ecx, [esp+6*4] ; cnt - jecxz LAB_MEMCPY - test ecx, 127 - jnz LAB_MEMCPY - mov eax, esi - or eax, edi - test eax, 0Fh - jnz LAB_MEMCPY - shr ecx, 7 - mov eax, edi -LAB_LOOP: - dotimes_i_8 < movdqa xmm_i, [esi+i*16] > - dotimes_i_8 < movntps [edi+i*16], xmm_i > - add esi, 128 - add edi, 128 - loop LAB_LOOP - pop edi - pop esi - pop ecx - ret -LAB_MEMCPY: - pop edi - pop esi - pop ecx - jmp memcpy -MemcpySse ENDP -ENDIF - - - END - \ No newline at end of file diff --git a/src/el/bignum/x86x64/montgomery_mul_x86x64.asm b/src/el/bignum/x86x64/montgomery_mul_x86x64.asm deleted file mode 100755 index 9d992f9699ffa..0000000000000 --- a/src/el/bignum/x86x64/montgomery_mul_x86x64.asm +++ /dev/null @@ -1,160 +0,0 @@ -;/*###### Copyright (c) 2013-2015 Ufasoft http://ufasoft.com mailto:support@ufasoft.com, Sergey Pavlov mailto:dev@ufasoft.com #### -;# # -;# See LICENSE for licensing information # -;#####################################################################################################################################*/ - -; Montgomery Multiplication algorithm using SSE2 -; http://en.wikipedia.org/wiki/Montgomery_reduction - -INCLUDE el/x86x64.inc - - -IF X64 -ELSE - -.XMM - -MontgomeryMul32_SSE PROC PUBLIC USES ZBX ZCX ZDX ZSI ZDI, pr:DWORD, pa:DWORD, pb:DWORD, pn:DWORD, pn0:DWORD, num:DWORD - LOCAL i:DWORD - - mov ecx, num - add ecx, 2 - xor eax, eax -$ZeroT: - push eax - loop $ZeroT - mov esi, esp ; esi = t (reversed) zeroed - - mov edi, pn - mov ebx, pb - and esp, NOT 0Fh ; (.... n2 n3 b2 b3 n0 n1 b0 b1), [esp+ecx*8] in loops will be 16-aligned - mov ecx, num - inc ecx - jmp $StartFillNB -$FillNBLoop: - push DWORD PTR [ebx+4] - push DWORD PTR [ebx] - push DWORD PTR [edi+4] - push DWORD PTR [edi] - add edi, 8 - add ebx, 8 -$StartFillNB: - sub ecx, 2 - ja $FillNBLoop - jb $EndNBLoop - push DWORD PTR [edi] - push DWORD PTR [ebx] ; (bLast nLast) -$EndNBLoop: - sub esp, 8 - - pxor xmm5, xmm5 ; xmm5 = (0 0 0 0) - mov eax, -1 - movd xmm6, eax ; const mask xmm6 = (-1 0 0 0) - mov ebx, pn0 - mov ebx, [ebx] ; ebx = n'[0] - mov i, 0 - mov edi, pa - mov edx, i - mov ecx, num -$Loop: - mov eax, [edi+edx*4] ; a[i] - inc edx - mov i, edx - movd xmm2, eax ; xmm2 = (a[i] 0 0 0) - pshufd xmm2, xmm2, 011001111b ; xmm2 = (0 0 a[i] 0) - - mul DWORD PTR [esp+ecx*8] ; *= b0 - add eax, [esi+ecx*4-4] - mul ebx ; eax = mul2 - movd xmm1, eax - por xmm2, xmm1 ; xmm2 = (mul2 ? a[i] ?) - pxor xmm7, xmm7 ; carry xmm7 = 0 - - inc ecx - jmp $StartLoop -$Loop2: - movdqa xmm1, [esp+ecx*8] ; xmm1 = (n0 n1 b0 b1) - movq xmm3, QWORD PTR [esi+ecx*4-4] - pshufd xmm0, xmm1, 0110001b ; xmm0 = (n1 x b1 x) - pshufd xmm4, xmm3, 011111100b ; xmm4 = (t1 0 0 0) - pshufd xmm3, xmm3, 011111101b ; xmm3 = (t0 0 0 0) - pmuludq xmm1, xmm2 - pmuludq xmm0, xmm2 - paddq xmm1, xmm3 - paddq xmm0, xmm4 - - paddq xmm1, xmm7 ; xmm1 = (maxsum1 sum2) - pshufd xmm7, xmm1, 001001110b ; xmm7 = (sum2 maxsum1) - pand xmm1, xmm6 ; xmm1 = (Low(maxsum1) 0 0 0) - paddq xmm7, xmm1 ; xmm7 = (sum2+Low(maxsum1) maxsum1) - movd DWORD PTR [esi+ecx*4+4], xmm7 - psrlq xmm7, 32 ; xmm7 = (c0 0 c1 0) - - paddq xmm0, xmm7 ; xmm0 = (maxsum1 sum2) - pshufd xmm7, xmm0, 001001110b ; xmm7 = (sum2 maxsum1) - pand xmm0, xmm6 ; xmm0 = (Low(maxsum1) 0 0 0) - paddq xmm7, xmm0 ; xmm7 = (sum2+Low(maxsum1) maxsum1) - movd DWORD PTR [esi+ecx*4], xmm7 - psrlq xmm7, 32 ; xmm7 = (c0 0 c1 0) -$StartLoop: - sub ecx, 2 - ja $Loop2 - jb $EndLoop - - pshufd xmm1, [esp], 000100011b ; xmm1 = (x x bLast nLast) - movd xmm3, DWORD PTR [esi] - pmuludq xmm1, xmm2 - paddq xmm7, xmm3 - paddq xmm1, xmm7 ; xmm1 = (maxsum1 sum2) - pshufd xmm7, xmm1, 001001110b ; xmm7 = (sum2 maxsum1) - pand xmm1, xmm6 ; xmm1 = (Low(maxsum1) 0 0 0) - paddq xmm7, xmm1 ; xmm7 = (sum2+Low(maxsum1) maxsum1) - movd DWORD PTR [esi+4], xmm7 - psrlq xmm7, 32 ; xmm7 = (c0 0 c1 0) -$EndLoop: - paddq xmm5, xmm7 - pshufd xmm7, xmm7, 011111110b ; xmm7 = (c1 0 0 0) - paddq xmm5, xmm7 - movd DWORD PTR [esi], xmm5 - pshufd xmm5, xmm5, 011111101b - mov edx, i - mov ecx, num - cmp edx, ecx - jb $Loop - - mov ebx, pn - movd eax, xmm5 - cmp eax, 0 - mov edi, pr - ja $SubLoop - push esi -$Cmp: - lodsd - cmp eax, [ebx+ecx*4-4] - loope $Cmp - pop esi - mov ecx, num - jb $Mov -$SubLoop: ; CF==0 at iteration 0 - mov eax, [esi+ecx*4-4] - sbb eax, [ebx] - lea ebx, [ebx+4] - stosd - loop $SubLoop - jmp $Ret -$Mov: - mov eax, [esi+ecx*4-4] - stosd - loop $Mov -$Ret: - mov eax, 1 - lea esp, [ebp-6*4] - ret -MontgomeryMul32_SSE ENDP - -ENDIF ; X64 - - END - - - diff --git a/src/el/x86x64.inc b/src/el/x86x64.inc deleted file mode 100755 index a23af4ab0154e..0000000000000 --- a/src/el/x86x64.inc +++ /dev/null @@ -1,95 +0,0 @@ -;/*###### Copyright (c) 2001-2015 Ufasoft http://ufasoft.com mailto:support@ufasoft.com, Sergey Pavlov mailto:dev@ufasoft.com #### -;# # -;# See LICENSE for licensing information # -;#####################################################################################################################################*/ - - -IFNDEF __JWASM__ - IFNDEF @CPU - X64 EQU 1 - ELSE - X64 EQU 0 - ENDIF -ENDIF - -IFNDEF X64 - X64 EQU 0 -ENDIF - -IF X64 - IFDEF __JWASM__ - OPTION_LANGUAGE_C EQU OPTION LANGUAGE: C - ELSE - OPTION_LANGUAGE_C EQU - - ENDIF - - ZAX EQU RAX - ZBX EQU RBX - ZCX EQU RCX - ZDX EQU RDX - ZSI EQU RSI - ZDI EQU RDI - ZSP EQU RSP - ZBP EQU RBP - - ZWORD EQU QWORD - ZWORD_SIZE EQU 8 - ZWORD_BITS EQU 6 - ZWORD_PTR EQU QWORD PTR - - cZY EQU cqo - - lodsZ EQU lodsq - stosZ EQU stosq - movsZ EQU movsq - - jzcxz EQU jrcxz - -ELSE - OPTION_LANGUAGE_C EQU OPTION LANGUAGE: C - - ZAX EQU EAX - ZBX EQU EBX - ZCX EQU ECX - ZDX EQU EDX - ZSI EQU ESI - ZDI EQU EDI - ZSP EQU ESP - ZBP EQU EBP - - cZY EQU cdq - - ZWORD EQU DWORD - ZWORD_SIZE EQU 4 - ZWORD_BITS EQU 5 - ZWORD_PTR EQU DWORD PTR - - lodsZ EQU lodsd - stosZ EQU stosd - movsZ EQU movsd - - jzcxz EQU jecxz - - .686P - .MODEL FLAT -ENDIF - -dotimes_i_8 MACRO cmd - FOR i, <0, 1, 2, 3, 4, 5, 6, 7> - xmm_i CATSTR , %i - cmd - ENDM -ENDM - -dotimes_i_12 MACRO cmd - FOR i, <0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11> - xmm_i CATSTR , %i - cmd - ENDM -ENDM - -OPTION_LANGUAGE_C - -.CODE - diff --git a/src/groestlcoin-cli-res.rc b/src/groestlcoin-cli-res.rc index 61ac109b2d4c0..75ddfd828cc35 100644 --- a/src/groestlcoin-cli-res.rc +++ b/src/groestlcoin-cli-res.rc @@ -1,4 +1,3 @@ -#include "grs-config.h" #include // needed for VERSIONINFO #include "clientversion.h" // holds the needed client version information diff --git a/src/groestlcoin-tx-res.rc b/src/groestlcoin-tx-res.rc index c5b969f0cf02d..2a6cc4962ede0 100644 --- a/src/groestlcoin-tx-res.rc +++ b/src/groestlcoin-tx-res.rc @@ -1,4 +1,3 @@ -#include "grs-config.h" #include // needed for VERSIONINFO #include "clientversion.h" // holds the needed client version information diff --git a/src/groestlcoin-util-res.rc b/src/groestlcoin-util-res.rc index bb9a2e0929908..09df5954349af 100644 --- a/src/groestlcoin-util-res.rc +++ b/src/groestlcoin-util-res.rc @@ -1,4 +1,3 @@ -#include "grs-config.h" #include // needed for VERSIONINFO #include "clientversion.h" // holds the needed client version information diff --git a/src/groestlcoin-wallet-res.rc b/src/groestlcoin-wallet-res.rc index 9cb4146218295..f2682da1abdaf 100644 --- a/src/groestlcoin-wallet-res.rc +++ b/src/groestlcoin-wallet-res.rc @@ -1,4 +1,3 @@ -#include "grs-config.h" #include // needed for VERSIONINFO #include "clientversion.h" // holds the needed client version information diff --git a/src/groestlcoind-res.rc b/src/groestlcoind-res.rc index 8d15905861b65..ff5bd18858a09 100644 --- a/src/groestlcoind-res.rc +++ b/src/groestlcoind-res.rc @@ -1,4 +1,3 @@ -#include "grs-config.h" #include // needed for VERSIONINFO #include "clientversion.h" // holds the needed client version information diff --git a/src/grs-config.h b/src/grs-config.h index 2b47a650a25e6..f0149b8330e32 100644 --- a/src/grs-config.h +++ b/src/grs-config.h @@ -34,13 +34,3 @@ #define HAVE_WORKING_BOOST_SLEEP_FOR 1 #define BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT noexcept - -#define QT_STATIC -#define MINIUPNP_STATICLIB - -#define ENABLE_WALLET -#define USE_QRCODE -#define USE_UPNP 1 - -#define ENABLE_ZMQ 1 -#define ZMQ_STATIC diff --git a/src/qt/moc.proj b/src/qt/moc.proj deleted file mode 100755 index dadc69a8a38a4..0000000000000 --- a/src/qt/moc.proj +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index 3c9fa5278b077..a114000ff6715 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -1,7 +1,6 @@ IDI_ICON1 ICON DISCARDABLE "icons/groestlcoin.ico" IDI_ICON2 ICON DISCARDABLE "icons/groestlcoin_testnet.ico" -#include "../../grs-config.h" #include // needed for VERSIONINFO #include "../../clientversion.h" // holds the needed client version information #define PACKAGE_NAME "Groestlcoin Core"