Skip to content

Use standard __asm__ blocks instead of asm (from CryptX PR) #652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2024
Merged

Use standard __asm__ blocks instead of asm (from CryptX PR) #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ciphers/aes/aes_desc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ static LTC_INLINE int s_aesni_is_supported(void)
a = 1;
c = 0;

asm volatile ("cpuid"
__asm__ volatile ("cpuid"
:"=a"(a), "=b"(b), "=c"(c), "=d"(d)
:"a"(a), "c"(c)
);
Expand Down
6 changes: 3 additions & 3 deletions src/encauth/gcm/gcm_mult_h.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ void gcm_mult_h(const gcm_state *gcm, unsigned char *I)
#ifdef LTC_GCM_TABLES
int x;
#ifdef LTC_GCM_TABLES_SSE2
asm("movdqa (%0),%%xmm0"::"r"(&gcm->PC[0][I[0]][0]));
__asm__("movdqa (%0),%%xmm0"::"r"(&gcm->PC[0][I[0]][0]));
for (x = 1; x < 16; x++) {
asm("pxor (%0),%%xmm0"::"r"(&gcm->PC[x][I[x]][0]));
__asm__("pxor (%0),%%xmm0"::"r"(&gcm->PC[x][I[x]][0]));
}
asm("movdqa %%xmm0,(%0)"::"r"(&T));
__asm__("movdqa %%xmm0,(%0)"::"r"(&T));
#else
int y;
XMEMCPY(T, &gcm->PC[0][I[0]][0], 16);
Expand Down
24 changes: 12 additions & 12 deletions src/headers/tomcrypt_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ do { XMEMCPY (&(x), (y), 4); \
#elif !defined(LTC_NO_BSWAP) && (defined(INTEL_CC) || (defined(__GNUC__) && (defined(__DJGPP__) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__i386__) || defined(__x86_64__))))

#define STORE32H(x, y) \
asm __volatile__ ( \
__asm__ volatile ( \
"bswapl %0 \n\t" \
"movl %0,(%1)\n\t" \
"bswapl %0 \n\t" \
::"r"(x), "r"(y): "memory");

#define LOAD32H(x, y) \
asm __volatile__ ( \
__asm__ volatile ( \
"movl (%1),%0\n\t" \
"bswapl %0\n\t" \
:"=r"(x): "r"(y): "memory");
Expand Down Expand Up @@ -109,14 +109,14 @@ do { XMEMCPY (&(x), (y), 8); \
#elif !defined(LTC_NO_BSWAP) && (defined(__GNUC__) && defined(__x86_64__))

#define STORE64H(x, y) \
asm __volatile__ ( \
__asm__ volatile ( \
"bswapq %0 \n\t" \
"movq %0,(%1)\n\t" \
"bswapq %0 \n\t" \
::"r"(x), "r"(y): "memory");

#define LOAD64H(x, y) \
asm __volatile__ ( \
__asm__ volatile ( \
"movq (%1),%0\n\t" \
"bswapq %0\n\t" \
:"=r"(x): "r"(y): "memory");
Expand Down Expand Up @@ -263,15 +263,15 @@ do { x = (((ulong64)((y)[7] & 255))<<56)|(((ulong64)((y)[6] & 255))<<48) | \

static inline ulong32 ROL(ulong32 word, int i)
{
asm ("roll %%cl,%0"
__asm__ ("roll %%cl,%0"
:"=r" (word)
:"0" (word),"c" (i));
return word;
}

static inline ulong32 ROR(ulong32 word, int i)
{
asm ("rorl %%cl,%0"
__asm__ ("rorl %%cl,%0"
:"=r" (word)
:"0" (word),"c" (i));
return word;
Expand Down Expand Up @@ -308,15 +308,15 @@ static inline ulong32 ROR(ulong32 word, int i)

static inline ulong32 ROL(ulong32 word, int i)
{
asm ("rotlw %0,%0,%2"
__asm__ ("rotlw %0,%0,%2"
:"=r" (word)
:"0" (word),"r" (i));
return word;
}

static inline ulong32 ROR(ulong32 word, int i)
{
asm ("rotlw %0,%0,%2"
__asm__ ("rotlw %0,%0,%2"
:"=r" (word)
:"0" (word),"r" (32-i));
return word;
Expand All @@ -326,15 +326,15 @@ static inline ulong32 ROR(ulong32 word, int i)

static inline ulong32 ROLc(ulong32 word, const int i)
{
asm ("rotlwi %0,%0,%2"
__asm__ ("rotlwi %0,%0,%2"
:"=r" (word)
:"0" (word),"I" (i));
return word;
}

static inline ulong32 RORc(ulong32 word, const int i)
{
asm ("rotrwi %0,%0,%2"
__asm__ ("rotrwi %0,%0,%2"
:"=r" (word)
:"0" (word),"I" (i));
return word;
Expand Down Expand Up @@ -381,15 +381,15 @@ static inline ulong32 RORc(ulong32 word, const int i)

static inline ulong64 ROL64(ulong64 word, int i)
{
asm("rolq %%cl,%0"
__asm__("rolq %%cl,%0"
:"=r" (word)
:"0" (word),"c" (i));
return word;
}

static inline ulong64 ROR64(ulong64 word, int i)
{
asm("rorq %%cl,%0"
__asm__("rorq %%cl,%0"
:"=r" (word)
:"0" (word),"c" (i));
return word;
Expand Down