Explicitly use (u)int64_t for PoW internals

TODO: clarify all occurrences on signed/unsigned usage
DLTcollab · Mar 23, 2018 · 4643fee · 4643fee
1 parent bbd694a
commit 4643fee
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 26 deletions.
diff --git a/src/pow_avx.c b/src/pow_avx.c
@@ -16,7 +16,7 @@
 
 static pthread_mutex_t *pow_avx_mutex;
 static int *stopAVX;
-static long long int *countAVX;
+static int64_t *countAVX;
 
 static const int indices[] = {
     0,   364, 728, 363, 727, 362, 726, 361, 725, 360, 724, 359, 723, 358, 722,
@@ -142,8 +142,8 @@ static void seri256(__m256i *low, __m256i *high, int n, char *r)
     n = n % 64;
 
     for (int i = HASH_LENGTH - NONCE_LENGTH; i < HASH_LENGTH; i++) {
-        unsigned long long ll = (low[i][index] >> n) & 1;
-        unsigned long long hh = (high[i][index] >> n) & 1;
+        uint64_t ll = (low[i][index] >> n) & 1;
+        uint64_t hh = (high[i][index] >> n) & 1;
         if (hh == 0 && ll == 1) {
             r[i + NONCE_LENGTH - HASH_LENGTH] = -1;
         }
@@ -237,7 +237,7 @@ static int loop256(__m256i *lmid, __m256i *hmid, int m, char *nonce, int id)
     return -i * 256 - 1;
 }
 
-static long long int pwork256(char mid[], int mwm, char nonce[], int n, int id)
+static int64_t pwork256(char mid[], int mwm, char nonce[], int n, int id)
 {
     __m256i lmid[STATE_LENGTH], hmid[STATE_LENGTH];
     int offset = HASH_LENGTH - NONCE_LENGTH;
@@ -339,7 +339,7 @@ int pow_avx_init(int num_task)
     pow_avx_mutex =
         (pthread_mutex_t *) malloc(sizeof(pthread_mutex_t) * num_task);
     stopAVX = (int *) malloc(sizeof(int) * num_task);
-    countAVX = (long long int *) malloc(sizeof(long long int) * num_task);
+    countAVX = (int64_t *) malloc(sizeof(int64_t) * num_task);
 
     if (!pow_avx_mutex || !stopAVX || !countAVX)
         return 0;

diff --git a/src/pow_avx.h b/src/pow_avx.h
@@ -12,7 +12,7 @@ struct _pwork_struct {
     int8_t *nonce;
     int n;
     int index;
-    long long int ret;
+    int64_t ret;
 };
 
 int8_t *PowAVX(int8_t *trytes, int mwm, int index);

diff --git a/src/pow_sse.c b/src/pow_sse.c
@@ -7,16 +7,16 @@
 
 #include "pow_sse.h"
 #include <pthread.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include "curl.h"
 #include "constants.h"
-#include <stdint.h>
 #include "cpu-utils.h"
+#include "curl.h"
 
 static pthread_mutex_t *pow_sse_mutex;
 static int *stopSSE;
-static long long int *countSSE;
+static int64_t *countSSE;
 
 static const int indices[] = {
     0,   364, 728, 363, 727, 362, 726, 361, 725, 360, 724, 359, 723, 358, 722,
@@ -131,8 +131,8 @@ static void seri128(__m128i *low, __m128i *high, int n, int8_t *r)
     }
 
     for (int i = HASH_LENGTH - NONCE_LENGTH; i < HASH_LENGTH; i++) {
-        unsigned long long ll = (low[i][index] >> n) & 1;
-        unsigned long long hh = (high[i][index] >> n) & 1;
+        uint64_t ll = (low[i][index] >> n) & 1;
+        uint64_t hh = (high[i][index] >> n) & 1;
         if (hh == 0 && ll == 1) {
             r[i + NONCE_LENGTH - HASH_LENGTH] = -1;
         }
@@ -165,14 +165,14 @@ static int check128(__m128i *l, __m128i *h, int m)
     return -2;
 }
 
-static long long int loop128(__m128i *lmid,
-                             __m128i *hmid,
-                             int m,
-                             int8_t *nonce,
-                             int id)
+static int64_t loop128(__m128i *lmid,
+                       __m128i *hmid,
+                       int m,
+                       int8_t *nonce,
+                       int id)
 {
     int n = 0;
-    long long int i = 0;
+    int64_t i = 0;
     __m128i lcpy[STATE_LENGTH * 2], hcpy[STATE_LENGTH * 2];
 
     for (i = 0; !incr128(lmid, hmid) && !stopSSE[id]; i++) {
@@ -225,11 +225,7 @@ static void incrN128(int n, __m128i *mid_low, __m128i *mid_high)
     }
 }
 
-static long long int pwork128(int8_t mid[],
-                              int mwm,
-                              int8_t nonce[],
-                              int n,
-                              int id)
+static int64_t pwork128(int8_t mid[], int mwm, int8_t nonce[], int n, int id)
 {
     __m128i lmid[STATE_LENGTH], hmid[STATE_LENGTH];
     para128(mid, lmid, hmid);
@@ -330,7 +326,7 @@ int pow_sse_init(int num_task)
     pow_sse_mutex =
         (pthread_mutex_t *) malloc(sizeof(pthread_mutex_t) * num_task);
     stopSSE = (int *) malloc(sizeof(int) * num_task);
-    countSSE = (long long int *) malloc(sizeof(long long int) * num_task);
+    countSSE = (int64_t *) malloc(sizeof(int64_t) * num_task);
 
     if (!pow_sse_mutex || !stopSSE || !countSSE)
         return 0;
@@ -361,8 +357,7 @@ int8_t *PowSSE(int8_t *trytes, int mwm, int index)
     if (!threads)
         return NULL;
 
-    Pwork_struct *pitem =
-        (Pwork_struct *) malloc(sizeof(Pwork_struct) * nproc);
+    Pwork_struct *pitem = (Pwork_struct *) malloc(sizeof(Pwork_struct) * nproc);
     if (!pitem)
         return NULL;
 

diff --git a/src/pow_sse.h b/src/pow_sse.h
@@ -12,7 +12,7 @@ struct _pwork_struct {
     int8_t *nonce;
     int n;
     int index;
-    long long int ret;
+    int64_t ret;
 };
 
 int8_t *PowSSE(int8_t *trytes, int mwm, int index);