Merge https://github.com/KlausT/ccminer-cryptonight

tsiv · Oct 10, 2016 · a052d4a · a052d4a
2 parents 408a885 + 12b36b5
commit a052d4a
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,6 @@ Thumbs.db
 *.sbr
 obj/
 [Rr]elease*/
+*.db
+*.opendb
+
diff --git a/ccminer.vcxproj b/ccminer.vcxproj
@@ -51,7 +51,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 6.5.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 8.0.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -178,7 +178,7 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
     <CudaCompile>
       <PtxAsOptionV>true</PtxAsOptionV>
       <Keep>true</Keep>
-      <CodeGeneration>compute_20,sm_20;compute_20,sm_21;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_52,sm_52;compute_52,compute_52</CodeGeneration>
+      <CodeGeneration>compute_20,sm_20;compute_20,sm_21;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_52,sm_52;compute_60,sm_60;compute_60,sm_61;</CodeGeneration>
       <Include>
       </Include>
       <Optimization>O2</Optimization>
@@ -226,7 +226,7 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
     <CudaCompile>
       <PtxAsOptionV>true</PtxAsOptionV>
       <Keep>true</Keep>
-      <CodeGeneration>compute_20,sm_20;compute_20,sm_21;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_52,sm_52;compute_52,compute_52</CodeGeneration>
+      <CodeGeneration>compute_20,sm_20;compute_20,sm_21;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_52,sm_52;compute_60,sm_60;compute_60,sm_61;</CodeGeneration>
       <Include>
       </Include>
       <TargetMachinePlatform>64</TargetMachinePlatform>
@@ -347,6 +347,6 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 6.5.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 8.0.targets" />
   </ImportGroup>
 </Project>
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([ccminer-cryptonight], [1.02])
+AC_INIT([ccminer-cryptonight], [1.03])
 
 AC_PREREQ([2.59c])
 AC_CANONICAL_SYSTEM

diff --git a/cpu-miner.c b/cpu-miner.c
@@ -2036,7 +2036,7 @@ static int msver(void)
 	return version;
 }
 
-#define PROGRAM_VERSION "1.02"
+#define PROGRAM_VERSION "1.03"
 int main(int argc, char *argv[])
 {
 	struct thr_info *thr;

diff --git a/cpuminer-config.h b/cpuminer-config.h
@@ -152,7 +152,7 @@
 #define PACKAGE_NAME "ccminer-cryptonight"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ccminer-cryptonight 1.02"
+#define PACKAGE_STRING "ccminer-cryptonight 1.03"
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
@@ -161,7 +161,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.02"
+#define PACKAGE_VERSION "1.03"
 
 /* Version number of package */
 #undef VERSION

diff --git a/crypto/c_blake256.c b/crypto/c_blake256.c
@@ -147,7 +147,7 @@ void blake256_update(state *S, const uint8_t *data, uint64_t datalen) {
     }
 
     if (datalen > 0) {
-        memcpy((void *) (S->buf + left), (void *) data, datalen >> 3);
+        memcpy((void *) (S->buf + left), (void *) data, (size_t)datalen >> 3);
         S->buflen = (left << 3) + (int)datalen;
     } else {
         S->buflen = 0;

diff --git a/crypto/c_jh.c b/crypto/c_jh.c
@@ -261,16 +261,16 @@ static HashReturn Update(hashState *state, const BitSequence *data, DataLength d
       /*There is data in the buffer, but the incoming data is insufficient for a full block*/
       if ( (state->datasize_in_buffer > 0 ) && (( state->datasize_in_buffer + databitlen) < 512)  ) {
             if ( (databitlen & 7) == 0 ) {
-                 memcpy(state->buffer + (state->datasize_in_buffer >> 3), data, 64-(state->datasize_in_buffer >> 3)) ;
+                 memcpy(state->buffer + (state->datasize_in_buffer >> 3), data, (size_t)(64-(state->datasize_in_buffer >> 3))) ;
 		    }
-            else memcpy(state->buffer + (state->datasize_in_buffer >> 3), data, 64-(state->datasize_in_buffer >> 3)+1) ;
+            else memcpy(state->buffer + (state->datasize_in_buffer >> 3), data, (size_t)(64-(state->datasize_in_buffer >> 3)+1)) ;
             state->datasize_in_buffer += databitlen;
             databitlen = 0;
       }
 
       /*There is data in the buffer, and the incoming data is sufficient for a full block*/
       if ( (state->datasize_in_buffer > 0 ) && (( state->datasize_in_buffer + databitlen) >= 512)  ) {
-	        memcpy( state->buffer + (state->datasize_in_buffer >> 3), data, 64-(state->datasize_in_buffer >> 3) ) ;
+	        memcpy( state->buffer + (state->datasize_in_buffer >> 3), data, (size_t)(64-(state->datasize_in_buffer >> 3)) ) ;
 	        index = 64-(state->datasize_in_buffer >> 3);
 	        databitlen = databitlen - (512 - state->datasize_in_buffer);
 	        F8(state);
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,3 +25,6 @@ Thumbs.db @@
     *.sbr
     obj/
     [Rr]elease*/
+    *.db
+    *.opendb