Browse Source

s/__SSE__/__SSE2__/

nfactor-troky
Jeff Garzik 14 years ago committed by Jeff Garzik
parent
commit
500759cea1
  1. 6
      cpu-miner.c
  2. 4
      sha256_4way.c

6
cpu-miner.c

@ -63,7 +63,7 @@ static struct option_help options_help[] = {
{ "algo XXX", { "algo XXX",
"(-a XXX) Specify sha256 implementation:\n" "(-a XXX) Specify sha256 implementation:\n"
"\tc\t\tLinux kernel sha256, implemented in C (default)" "\tc\t\tLinux kernel sha256, implemented in C (default)"
#ifdef __SSE__ #ifdef __SSE2__
"\n\t4way\t\ttcatm's 4-way SSE2 implementation (EXPERIMENTAL)" "\n\t4way\t\ttcatm's 4-way SSE2 implementation (EXPERIMENTAL)"
#endif #endif
}, },
@ -304,7 +304,7 @@ static void *miner_thread(void *thr_id_int)
if (opt_algo == ALGO_C) if (opt_algo == ALGO_C)
rc = scanhash(work.midstate, work.data + 64, rc = scanhash(work.midstate, work.data + 64,
work.hash1, work.hash, &hashes_done); work.hash1, work.hash, &hashes_done);
#ifdef __SSE__ #ifdef __SSE2__
else { else {
unsigned int rc4 = unsigned int rc4 =
ScanHash_4WaySSE2(work.midstate, work.data + 64, ScanHash_4WaySSE2(work.midstate, work.data + 64,
@ -347,7 +347,7 @@ static void parse_arg (int key, char *arg)
case 'a': case 'a':
if (!strcmp(arg, "c")) if (!strcmp(arg, "c"))
opt_algo = ALGO_C; opt_algo = ALGO_C;
#ifdef __SSE__ #ifdef __SSE2__
else if (!strcmp(arg, "4way")) else if (!strcmp(arg, "4way"))
opt_algo = ALGO_4WAY; opt_algo = ALGO_4WAY;
#endif #endif

4
sha256_4way.c

@ -4,7 +4,7 @@
// tcatm's 4-way 128-bit SSE2 SHA-256 // tcatm's 4-way 128-bit SSE2 SHA-256
#ifdef __SSE__ #ifdef __SSE2__
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
@ -467,4 +467,4 @@ static void DoubleBlockSHA256(const void* pin, void* pad, const void *pre, unsig
} }
#endif /* __SSE__ */ #endif /* __SSE2__ */

Loading…
Cancel
Save