fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed align.h macro

Browse source
This commit is contained in:
BenDroid 2018-03-15 21:44:21 +01:00
parent 68a2397f57
commit 9433498a86
5 changed files with 4 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/3rdparty/align.h vendored
View file

@ -1,33 +0,0 @@
/* XMRig
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2016-2017 XMRig <support@xmrig.com>
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __ALIGN_H__
#define __ALIGN_H__
#ifdef _MSC_VER
# define VAR_ALIGN(x, decl) __declspec(align(x)) decl
#else
# define VAR_ALIGN(x, decl) decl __attribute__ ((aligned(x)))
#endif
#endif /* __ALIGN_H__ */

3
src/Mem.h
View file

@ -31,7 +31,6 @@
#include <cstdint> #include <cstdint>
#include <bitset> #include <bitset>
#include "align.h"
#include "Options.h" #include "Options.h"
struct cryptonight_ctx; struct cryptonight_ctx;
@ -69,7 +68,7 @@ private:
static int m_flags; static int m_flags;
static ThreadBitSet m_multiHashThreadMask; static ThreadBitSet m_multiHashThreadMask;
static size_t m_memorySize; static size_t m_memorySize;
VAR_ALIGN(16, static uint8_t *m_memory); alignas(16) static uint8_t *m_memory;
}; };

5
src/crypto/CryptoNight.h
View file

@ -28,15 +28,14 @@
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include "align.h"
#include "Options.h" #include "Options.h"
#define MEMORY 2097152 /* 2 MiB */ #define MEMORY 2097152 /* 2 MiB */
#define MEMORY_LITE 1048576 /* 1 MiB */ #define MEMORY_LITE 1048576 /* 1 MiB */
struct cryptonight_ctx { struct cryptonight_ctx {
VAR_ALIGN(16, uint8_t state[MAX_NUM_HASH_BLOCKS][208]); // 208 instead of 200 to maintain aligned to 16 byte boundaries alignas(16) uint8_t state[MAX_NUM_HASH_BLOCKS][208]; // 208 instead of 200 to maintain aligned to 16 byte boundaries
VAR_ALIGN(16, uint8_t* memory); alignas(16) uint8_t* memory;
}; };

3
src/net/Job.h
View file

@ -29,7 +29,6 @@
#include <stdint.h> #include <stdint.h>
#include "align.h"
#include "net/JobId.h" #include "net/JobId.h"
@ -70,7 +69,7 @@ public:
bool operator==(const Job &other) const; bool operator==(const Job &other) const;
private: private:
VAR_ALIGN(16, uint8_t m_blob[84]); // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk. alignas(16) uint8_t m_blob[84]; // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk.
bool m_nicehash; bool m_nicehash;
int m_poolId; int m_poolId;

1
src/workers/MultiWorker.h
View file

@ -26,7 +26,6 @@
#define __MULTIWORKER_H__ #define __MULTIWORKER_H__
#include "align.h"
#include "net/Job.h" #include "net/Job.h"
#include "net/JobResult.h" #include "net/JobResult.h"
#include "workers/Worker.h" #include "workers/Worker.h"