mirror of
https://github.com/GOSTSec/sgminer
synced 2025-01-22 04:24:19 +00:00
Some other minor fixes from theLosers106
This commit is contained in:
elbandi
parent
186b75d51c
commit
17f2478edd
@ -943,8 +943,6 @@ static algorithm_settings_t algos[] = {
|
||||
A_CREDITS("credits"),
|
||||
#undef A_CREDITS
|
||||
|
||||
|
||||
|
||||
#define A_YESCRYPT(a) \
|
||||
{ a, ALGO_YESCRYPT, "", 1, 65536, 65536, 0, 0, 0xFF, 0xFFFF000000000000ULL, 0x0000ffffUL, 0, -1, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE, yescrypt_regenhash, queue_yescrypt_kernel, gen_hash, append_neoscrypt_compiler_options}
|
||||
A_YESCRYPT("yescrypt"),
|
||||
@ -1004,7 +1002,7 @@ static algorithm_settings_t algos[] = {
|
||||
#undef A_FUGUE
|
||||
|
||||
{ "whirlcoin", ALGO_WHIRL, "", 1, 1, 1, 0, 0, 0xFF, 0xFFFFULL, 0x0000ffffUL, 3, 8 * 16 * 4194304, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE, whirlcoin_regenhash, queue_whirlcoin_kernel, sha256, NULL },
|
||||
{ "whirlpoolx", ALGO_WHIRLPOOLX, "", 1, 1, 1, 0, 0, 0xFFU, 0xFFFFULL, 0x0000FFFFUL, 0, 0, 0, whirlpoolx_regenhash, queue_whirlpoolx_kernel, gen_hash, NULL },
|
||||
{ "whirlpoolx", ALGO_WHIRLPOOLX, "", 1, 1, 1, 0, 0, 0xFF, 0xFFFFULL, 0x0000FFFFUL, 0, 0, 0, whirlpoolx_regenhash, queue_whirlpoolx_kernel, gen_hash, NULL },
|
||||
|
||||
// Terminator (do not remove)
|
||||
{ NULL, ALGO_UNK, "", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL }
|
||||
|
||||
@ -99,7 +99,7 @@ alloc_region(yescrypt_region_t * region, size_t size)
|
||||
if (size + 63 < size) {
|
||||
errno = ENOMEM;
|
||||
}
|
||||
else if ((base = malloc(size + 63)) != NULL) {
|
||||
else if ((base = (uint8_t *)malloc(size + 63)) != NULL) {
|
||||
aligned = base + 63;
|
||||
aligned -= (uintptr_t)aligned & 63;
|
||||
}
|
||||
@ -520,7 +520,7 @@ smix1(uint64_t * B, size_t r, uint64_t N, yescrypt_flags_t flags,
|
||||
uint64_t * XY, uint64_t * S)
|
||||
{
|
||||
void (*blockmix)(const uint64_t *, uint64_t *, uint64_t *, size_t) = (S ? blockmix_pwxform : blockmix_salsa8);
|
||||
const uint64_t * VROM = shared->shared1.aligned;
|
||||
const uint64_t * VROM = (uint64_t *)shared->shared1.aligned;
|
||||
uint32_t VROM_mask = shared->mask1;
|
||||
size_t s = 16 * r;
|
||||
uint64_t * X = V;
|
||||
@ -671,7 +671,7 @@ smix2(uint64_t * B, size_t r, uint64_t N, uint64_t Nloop,
|
||||
|
||||
void (*blockmix)(const uint64_t *, uint64_t *, uint64_t *, size_t) =
|
||||
(S ? blockmix_pwxform : blockmix_salsa8);
|
||||
const uint64_t * VROM = shared->shared1.aligned;
|
||||
const uint64_t * VROM = (uint64_t *)shared->shared1.aligned;
|
||||
uint32_t VROM_mask = shared->mask1 | 1;
|
||||
size_t s = 16 * r;
|
||||
yescrypt_flags_t rw = flags & YESCRYPT_RW;
|
||||
@ -835,7 +835,7 @@ smix(uint64_t * B, size_t r, uint64_t N, uint32_t p, uint32_t t,
|
||||
uint64_t * Sp = S ? &S[i * S_SIZE_ALL] : S;
|
||||
|
||||
if (Sp)
|
||||
smix1(Bp, 1, S_SIZE_ALL / 16, flags & ~YESCRYPT_PWXFORM,Sp, NROM, shared, XYp, NULL);
|
||||
smix1(Bp, 1, S_SIZE_ALL / 16, (yescrypt_flags_t)flags & ~YESCRYPT_PWXFORM,Sp, NROM, shared, XYp, NULL);
|
||||
|
||||
|
||||
|
||||
|
||||
2
api.c
2
api.c
@ -1334,7 +1334,7 @@ static void apiversion(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __m
|
||||
io_open = io_add(io_data, isjson ? COMSTR JSON_VERSION : _VERSION COMSTR);
|
||||
|
||||
root = api_add_string(root, "Miner", PACKAGE " " VERSION, false);
|
||||
root = api_add_string(root, "CGMiner", CGMINER_VERSION, false);
|
||||
root = api_add_string(root, "SGMiner", CGMINER_VERSION, false);
|
||||
root = api_add_const(root, "API", APIVERSION, false);
|
||||
|
||||
root = print_data(root, buf, isjson, false);
|
||||
|
||||
2
ocl.c
2
ocl.c
@ -187,7 +187,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize, algorithm_t *alg
|
||||
cl_platform_id platform = NULL;
|
||||
struct cgpu_info *cgpu = &gpus[gpu];
|
||||
_clState *clState = (_clState *)calloc(1, sizeof(_clState));
|
||||
cl_uint preferred_vwidth, slot = 0, cpnd = 0, numDevices = clDevicesNum();
|
||||
cl_uint preferred_vwidth, numDevices = clDevicesNum();
|
||||
cl_device_id *devices = (cl_device_id *)alloca(numDevices * sizeof(cl_device_id));
|
||||
build_kernel_data *build_data = (build_kernel_data *)alloca(sizeof(struct _build_kernel_data));
|
||||
char **pbuff = (char **)alloca(sizeof(char *) * numDevices), filename[256];
|
||||
|
||||
@ -263,6 +263,7 @@
|
||||
<ClCompile Include="..\algorithm.c" />
|
||||
<ClCompile Include="..\algorithm\animecoin.c" />
|
||||
<ClCompile Include="..\algorithm\bitblock.c" />
|
||||
<ClCompile Include="..\algorithm\credits.c" />
|
||||
<ClCompile Include="..\algorithm\lyra2.c" />
|
||||
<ClCompile Include="..\algorithm\lyra2re.c" />
|
||||
<ClCompile Include="..\algorithm\lyra2rev2.c" />
|
||||
@ -329,12 +330,14 @@
|
||||
<ClInclude Include="..\algorithm.h" />
|
||||
<ClInclude Include="..\algorithm\animecoin.h" />
|
||||
<ClInclude Include="..\algorithm\bitblock.h" />
|
||||
<ClInclude Include="..\algorithm\credits.h" />
|
||||
<ClInclude Include="..\algorithm\lyra2.h" />
|
||||
<ClInclude Include="..\algorithm\lyra2re.h" />
|
||||
<ClInclude Include="..\algorithm\lyra2rev2.h" />
|
||||
<ClInclude Include="..\algorithm\neoscrypt.h" />
|
||||
<ClInclude Include="..\algorithm\pluck.h" />
|
||||
<ClInclude Include="..\algorithm\sponge.h" />
|
||||
<ClInclude Include="..\algorithm\sysendian.h" />
|
||||
<ClInclude Include="..\algorithm\talkcoin.h" />
|
||||
<ClInclude Include="..\algorithm\whirlpoolx.h" />
|
||||
<ClInclude Include="..\algorithm\x14.h" />
|
||||
@ -367,6 +370,7 @@
|
||||
<ClInclude Include="..\algorithm\qubitcoin.h" />
|
||||
<ClInclude Include="..\algorithm\scrypt.h" />
|
||||
<ClInclude Include="..\algorithm\sifcoin.h" />
|
||||
<ClInclude Include="..\sph\sha256_Y.h" />
|
||||
<ClInclude Include="..\sph\sph_blake.h" />
|
||||
<ClInclude Include="..\sph\sph_bmw.h" />
|
||||
<ClInclude Include="..\sph\sph_cubehash.h" />
|
||||
|
||||
@ -221,6 +221,9 @@
|
||||
<ClCompile Include="..\algorithm\lyra2rev2.c">
|
||||
<Filter>Source Files\algorithm</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\algorithm\credits.c">
|
||||
<Filter>Source Files\algorithm</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\adl.h">
|
||||
@ -421,6 +424,15 @@
|
||||
<ClInclude Include="..\algorithm\lyra2rev2.h">
|
||||
<Filter>Header Files\algorithm</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\algorithm\credits.h">
|
||||
<Filter>Header Files\algorithm</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\sph\sha256_Y.h">
|
||||
<Filter>Header Files\sph</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\algorithm\sysendian.h">
|
||||
<Filter>Header Files\algorithm</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="README.txt" />
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user