[Ggnfs-commits] SF.net SVN: ggnfs:[422] trunk/src/experimental/lasieve4_64/x64

[<brg...@us...>]

Revision: 422
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=422&view=rev
Author:   brgladman
Date:     2011-10-23 19:58:39 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
More Windows x64 assembler errors

Modified Paths:
--------------
    trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm
    trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm
    trunk/src/experimental/lasieve4_64/x64/siever-config.h

Modified: trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm	2011-10-23 16:20:46 UTC (rev 421)
+++ trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm	2011-10-23 19:58:39 UTC (rev 422)
@@ -248,6 +248,9 @@
         movdqa  xmm2, xmm11
         pmuludq xmm11, xmm8
         sub     rsp, 32
+        mov     r8, rdx
+        mov     rdx, rsi
+        mov     rcx, rdi
         call    get_recurrence_info
         add     rsp, 32
         mov     esi, r15d
@@ -256,6 +259,9 @@
         pmuludq xmm11, xmm2
         movdqa  xmm0, xmm8
         sub     rsp, 32
+        mov     r8, rdx
+        mov     rdx, rsi
+        mov     rcx, rdi
         call    get_recurrence_info
         add     rsp, 32
         cmp     r14, r12

Modified: trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm	2011-10-23 16:20:46 UTC (rev 421)
+++ trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm	2011-10-23 19:58:39 UTC (rev 422)
@@ -259,6 +259,9 @@
         movdqa  xmm2, xmm11
         pmuludq xmm11, xmm8
         sub     rsp, 32        
+        mov     r8, rdx
+        mov     rdx, rsi
+        mov     rcx, rdi
         call    get_recurrence_info
         add     rsp, 32
         mov     esi, ebx
@@ -267,6 +270,9 @@
         pmuludq xmm11, xmm2
         movdqa  xmm0, xmm8
         sub     rsp, 32
+        mov     r8, rdx
+        mov     rdx, rsi
+        mov     rcx, rdi
         call    get_recurrence_info
         add     rsp, 32
         cmp     r14, r12

Modified: trunk/src/experimental/lasieve4_64/x64/siever-config.h
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/siever-config.h	2011-10-23 16:20:46 UTC (rev 421)
+++ trunk/src/experimental/lasieve4_64/x64/siever-config.h	2011-10-23 19:58:39 UTC (rev 422)
@@ -32,8 +32,14 @@
 typedef int i32_t;
 typedef short int i16_t;
 typedef unsigned short u16_t;
+#ifdef _WIN32
+typedef unsigned long long u64_t;
+typedef long long i64_t;
+#else
 typedef unsigned long u64_t;
 typedef long int i64_t;
+#endif
+
 #define U32_MAX 0xffffffff
 #define I32_MAX INT_MAX
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.