GOSTSec/ccminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/ccminer synced 2025-02-04 10:54:28 +00:00
Code Issues Releases Wiki Activity

renamed gost to gostd

Browse Source
This commit is contained in:
orignal 2017-04-28 09:30:09 -04:00
parent 581aa3079b
commit 2cb4a3e0ed
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
algos.h
View File

@ -18,7 +18,7 @@ enum sha_algos {
ALGO_DMD_GR,
ALGO_FRESH,
ALGO_FUGUE256, /* Fugue256 */
ALGO_GOST,
ALGO_GOSTD,
ALGO_GROESTL,
ALGO_HEAVY, /* Heavycoin hash */
ALGO_HMQ1725,
@ -79,7 +79,7 @@ static const char *algo_names[] = {
"dmd-gr",
"fresh",
"fugue256",
"gost",
"gostd",
"groestl",
"heavy",
"hmq1725",
@ -159,6 +159,8 @@ static inline int algo_to_int(char* arg)
i = ALGO_SHA256D;
else if (!strcasecmp("sha256", arg))
i = ALGO_SHA256D;
else if (!strcasecmp("gost", arg))
i = ALGO_GOSTD;
else if (!strcasecmp("thorsriddle", arg))
i = ALGO_VELTOR;
else if (!strcasecmp("whirl", arg))

8
ccminer.cpp
View File

@ -236,7 +236,7 @@ Options:\n\
dmd-gr Diamond-Groestl\n\
fresh Freshcoin (shavite 80)\n\
fugue256 Fuguecoin\n\
gost GOST\n\
gostd GOSTd (GOSTcoin)\n\
groestl Groestlcoin\n\
heavy Heavycoin\n\
hmq1725 Doubloons / Espers\n\
@ -2111,7 +2111,7 @@ static void *miner_thread(void *userdata)
case ALGO_DECRED:
case ALGO_SHA256D:
case ALGO_SHA256T:
case ALGO_GOST:
case ALGO_GOSTD:
//case ALGO_WHIRLPOOLX:
minmax = 0x40000000U;
break;
@ -2325,8 +2325,8 @@ static void *miner_thread(void *userdata)
case ALGO_SIB:
rc = scanhash_sib(thr_id, &work, max_nonce, &hashes_done);
break;
case ALGO_GOST:
rc = scanhash_gost(thr_id, &work, max_nonce, &hashes_done);
case ALGO_GOSTD:
rc = scanhash_gostd(thr_id, &work, max_nonce, &hashes_done);
break;
case ALGO_S3:
rc = scanhash_s3(thr_id, &work, max_nonce, &hashes_done);

8
gost/gost.cu
View File

@ -11,7 +11,7 @@ extern "C" {
#define NBN 2
// GOST CPU Hash
extern "C" void gosthash(void *output, const void *input)
extern "C" void gostd_hash(void *output, const void *input)
{
unsigned char _ALIGN(64) hash[64];
@ -32,7 +32,7 @@ extern void gostd_free(int thr_id);
extern void gostd_setBlock_80(uint32_t *pdata, uint32_t *ptarget);
extern void gostd_hash_80(int thr_id, uint32_t threads, uint32_t startNonce, uint32_t *resNonces);
extern "C" int scanhash_gost(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done)
extern "C" int scanhash_gostd(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done)
{
uint32_t _ALIGN(64) endiandata[20];
uint32_t *pdata = work->data;
@ -76,7 +76,7 @@ extern "C" int scanhash_gost(int thr_id, struct work* work, uint32_t max_nonce,
uint32_t _ALIGN(64) vhash[8];
endiandata[19] = swab32 (work->nonces[0]);
gosthash(vhash, endiandata);
gostd_hash(vhash, endiandata);
if (swab32(vhash[0]) <= ptarget[7] /*&& fulltest(vhash, ptarget)*/)
{
work->valid_nonces = 1;
@ -84,7 +84,7 @@ extern "C" int scanhash_gost(int thr_id, struct work* work, uint32_t max_nonce,
if (work->nonces[1] != UINT32_MAX)
{
endiandata[19] = swab32 (work->nonces[1]);
gosthash(vhash, endiandata);
gostd_hash(vhash, endiandata);
if (swab32(vhash[0]) <= ptarget[7] /*&& fulltest(vhash, ptarget)*/)
{
work->valid_nonces++;

4
miner.h
View File

@ -304,7 +304,7 @@ extern int scanhash_sha256d(int thr_id, struct work *work, uint32_t max_nonce, u
extern int scanhash_sha256t(int thr_id, struct work *work, uint32_t max_nonce, unsigned long *hashes_done);
extern int scanhash_sia(int thr_id, struct work *work, uint32_t max_nonce, unsigned long *hashes_done);
extern int scanhash_sib(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done);
extern int scanhash_gost(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done);
extern int scanhash_gostd(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done);
extern int scanhash_skeincoin(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done);
extern int scanhash_skein2(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done);
extern int scanhash_s3(int thr_id, struct work* work, uint32_t max_nonce, unsigned long *hashes_done);
@ -885,7 +885,7 @@ void scryptjane_hash(void* output, const void* input);
void sha256d_hash(void *output, const void *input);
void sha256t_hash(void *output, const void *input);
void sibhash(void *output, const void *input);
void gosthash(void *output, const void *input);
void gostd_hash(void *output, const void *input);
void skeincoinhash(void *output, const void *input);
void skein2hash(void *output, const void *input);
void s3hash(void *output, const void *input);

2
util.cpp
View File

@ -2240,7 +2240,7 @@ void print_hash_tests(void)
sibhash(&hash[0], &buf[0]);
printpfx("sib", hash);
gosthash(&hash[0], &buf[0]);
gostd_hash(&hash[0], &buf[0]);
printpfx("gost", hash);
skeincoinhash(&hash[0], &buf[0]);