Browse Source

Fix double definition of A0 B0 to zeroA zeroB.

nfactor-troky
Con Kolivas 13 years ago
parent
commit
52bb99c3ea
  1. 4
      device-gpu.c
  2. 4
      findnonce.c
  3. 2
      miner.h

4
device-gpu.c

@ -764,8 +764,8 @@ static cl_int queue_diakgcn_kernel(_clState *clState, dev_blk_ctx *blk)
CL_SET_BLKARG(ctx_g); CL_SET_BLKARG(ctx_g);
CL_SET_BLKARG(ctx_h); CL_SET_BLKARG(ctx_h);
CL_SET_BLKARG(A0); CL_SET_BLKARG(zeroA);
CL_SET_BLKARG(B0); CL_SET_BLKARG(zeroB);
CL_SET_ARG(clState->outputBuffer); CL_SET_ARG(clState->outputBuffer);

4
findnonce.c

@ -120,8 +120,8 @@ void precalc_hash(dev_blk_ctx *blk, uint32_t *state, uint32_t *data) {
blk->W16addK16 = blk->W16 + SHA256_K[16]; blk->W16addK16 = blk->W16 + SHA256_K[16];
blk->W17addK17 = blk->W17 + SHA256_K[17]; blk->W17addK17 = blk->W17 + SHA256_K[17];
blk->A0 = blk->ctx_a + 0x98c7e2a2; blk->zeroA = blk->ctx_a + 0x98c7e2a2;
blk->B0 = blk->ctx_a + 0xfc08884d; blk->zeroB = blk->ctx_a + 0xfc08884d;
} }
#define P(t) (W[(t)&0xF] = W[(t-16)&0xF] + (rotate(W[(t-15)&0xF], 25) ^ rotate(W[(t-15)&0xF], 14) ^ (W[(t-15)&0xF] >> 3)) + W[(t-7)&0xF] + (rotate(W[(t-2)&0xF], 15) ^ rotate(W[(t-2)&0xF], 13) ^ (W[(t-2)&0xF] >> 10))) #define P(t) (W[(t)&0xF] = W[(t-16)&0xF] + (rotate(W[(t-15)&0xF], 25) ^ rotate(W[(t-15)&0xF], 14) ^ (W[(t-15)&0xF] >> 3)) + W[(t-7)&0xF] + (rotate(W[(t-2)&0xF], 15) ^ rotate(W[(t-2)&0xF], 13) ^ (W[(t-2)&0xF] >> 10)))

2
miner.h

@ -618,7 +618,7 @@ typedef struct {
/* For diakgcn */ /* For diakgcn */
cl_uint B1addK6, PreVal0addK7, W16addK16, W17addK17; cl_uint B1addK6, PreVal0addK7, W16addK16, W17addK17;
cl_uint A0, B0; cl_uint zeroA, zeroB;
} dev_blk_ctx; } dev_blk_ctx;
#else #else
typedef struct { typedef struct {

Loading…
Cancel
Save