~mdw
/
catacomb
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
09734e5
)
**/*.S: Arrange assembler preambles consistently.
author
Mark Wooding
<mdw@distorted.org.uk>
Sat, 2 Mar 2019 13:11:25 +0000
(13:11 +0000)
committer
Mark Wooding
<mdw@distorted.org.uk>
Sun, 8 Sep 2019 10:37:37 +0000
(11:37 +0100)
math/mpx-mul4-amd64-sse2.S
patch
|
blob
|
blame
|
history
math/mpx-mul4-x86-sse2.S
patch
|
blob
|
blame
|
history
symm/chacha-arm-neon.S
patch
|
blob
|
blame
|
history
symm/chacha-arm64.S
patch
|
blob
|
blame
|
history
symm/chacha-x86ish-sse2.S
patch
|
blob
|
blame
|
history
symm/rijndael-arm-crypto.S
patch
|
blob
|
blame
|
history
symm/rijndael-arm64-crypto.S
patch
|
blob
|
blame
|
history
symm/rijndael-x86ish-aesni.S
patch
|
blob
|
blame
|
history
symm/salsa20-arm-neon.S
patch
|
blob
|
blame
|
history
symm/salsa20-arm64.S
patch
|
blob
|
blame
|
history
symm/salsa20-x86ish-sse2.S
patch
|
blob
|
blame
|
history
diff --git
a/math/mpx-mul4-amd64-sse2.S
b/math/mpx-mul4-amd64-sse2.S
index
29939c1
..
03e466c
100644
(file)
--- a/
math/mpx-mul4-amd64-sse2.S
+++ b/
math/mpx-mul4-amd64-sse2.S
@@
-25,15
+25,13
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
-///--------------------------------------------------------------------------
-/// Prologue.
-
.arch pentium4
.arch pentium4
+
.text
///--------------------------------------------------------------------------
.text
///--------------------------------------------------------------------------
diff --git
a/math/mpx-mul4-x86-sse2.S
b/math/mpx-mul4-x86-sse2.S
index
11aadc9
..
5265a64
100644
(file)
--- a/
math/mpx-mul4-x86-sse2.S
+++ b/
math/mpx-mul4-x86-sse2.S
@@
-24,15
+24,13
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
-///--------------------------------------------------------------------------
-/// Prologue.
-
.arch pentium4
.arch pentium4
+
.text
///--------------------------------------------------------------------------
.text
///--------------------------------------------------------------------------
diff --git
a/symm/chacha-arm-neon.S
b/symm/chacha-arm-neon.S
index
af53cfd
..
a900db7
100644
(file)
--- a/
symm/chacha-arm-neon.S
+++ b/
symm/chacha-arm-neon.S
@@
-25,18
+25,19
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
-///--------------------------------------------------------------------------
-/// Main.code.
-
.arch armv7-a
.fpu neon
.arch armv7-a
.fpu neon
+
.text
.text
+///--------------------------------------------------------------------------
+/// Main.code.
+
FUNC(chacha_core_arm_neon)
// Arguments are in registers.
FUNC(chacha_core_arm_neon)
// Arguments are in registers.
diff --git
a/symm/chacha-arm64.S
b/symm/chacha-arm64.S
index
a423e9e
..
61ac51a
100644
(file)
--- a/
symm/chacha-arm64.S
+++ b/
symm/chacha-arm64.S
@@
-25,17
+25,18
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
-///--------------------------------------------------------------------------
-/// Main.code.
-
.arch armv8-a
.arch armv8-a
+
.text
.text
+///--------------------------------------------------------------------------
+/// Main.code.
+
FUNC(chacha_core_arm64)
// Arguments are in registers.
FUNC(chacha_core_arm64)
// Arguments are in registers.
diff --git
a/symm/chacha-x86ish-sse2.S
b/symm/chacha-x86ish-sse2.S
index
77047eb
..
3b00963
100644
(file)
--- a/
symm/chacha-x86ish-sse2.S
+++ b/
symm/chacha-x86ish-sse2.S
@@
-25,16
+25,16
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
+ .text
+
///--------------------------------------------------------------------------
/// Main code.
///--------------------------------------------------------------------------
/// Main code.
- .text
-
FUNC(chacha_core_x86ish_avx)
.arch .avx
vzeroupper
FUNC(chacha_core_x86ish_avx)
.arch .avx
vzeroupper
diff --git
a/symm/rijndael-arm-crypto.S
b/symm/rijndael-arm-crypto.S
index
8a5484c
..
1df81d9
100644
(file)
--- a/
symm/rijndael-arm-crypto.S
+++ b/
symm/rijndael-arm-crypto.S
@@
-25,20
+25,22
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
+ .arch armv8-a
+ .fpu crypto-neon-fp-armv8
+
.extern F(abort)
.extern F(rijndael_rcon)
.extern F(abort)
.extern F(rijndael_rcon)
+ .text
+
///--------------------------------------------------------------------------
/// Main code.
///--------------------------------------------------------------------------
/// Main code.
- .arch armv8-a
- .fpu crypto-neon-fp-armv8
-
/// The ARM crypto extension implements a little-endian version of AES
/// (though the manual doesn't actually spell this out and you have to
/// experiment), but Catacomb's internal interface presents as big-endian so
/// The ARM crypto extension implements a little-endian version of AES
/// (though the manual doesn't actually spell this out and you have to
/// experiment), but Catacomb's internal interface presents as big-endian so
diff --git
a/symm/rijndael-arm64-crypto.S
b/symm/rijndael-arm64-crypto.S
index
8739c19
..
f2d3f45
100644
(file)
--- a/
symm/rijndael-arm64-crypto.S
+++ b/
symm/rijndael-arm64-crypto.S
@@
-25,19
+25,21
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
+ .arch armv8-a+crypto
+
.extern F(abort)
.extern F(rijndael_rcon)
.extern F(abort)
.extern F(rijndael_rcon)
+ .text
+
///--------------------------------------------------------------------------
/// Main code.
///--------------------------------------------------------------------------
/// Main code.
- .arch armv8-a+crypto
-
/// The ARM crypto extension implements a little-endian version of AES
/// (though the manual doesn't actually spell this out and you have to
/// experiment), but Catacomb's internal interface presents as big-endian so
/// The ARM crypto extension implements a little-endian version of AES
/// (though the manual doesn't actually spell this out and you have to
/// experiment), but Catacomb's internal interface presents as big-endian so
diff --git
a/symm/rijndael-x86ish-aesni.S
b/symm/rijndael-x86ish-aesni.S
index
dc80f4d
..
6d9b3b2
100644
(file)
--- a/
symm/rijndael-x86ish-aesni.S
+++ b/
symm/rijndael-x86ish-aesni.S
@@
-25,20
+25,21
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
+ .arch .aes
+
.extern F(abort)
.extern F(rijndael_rcon)
.extern F(abort)
.extern F(rijndael_rcon)
+ .text
+
///--------------------------------------------------------------------------
/// Main code.
///--------------------------------------------------------------------------
/// Main code.
- .arch .aes
- .text
-
/// The AESNI instructions implement a little-endian version of AES, but
/// Catacomb's internal interface presents as big-endian so as to work better
/// with things like GCM. We therefore maintain the round keys in
/// The AESNI instructions implement a little-endian version of AES, but
/// Catacomb's internal interface presents as big-endian so as to work better
/// with things like GCM. We therefore maintain the round keys in
diff --git
a/symm/salsa20-arm-neon.S
b/symm/salsa20-arm-neon.S
index
80ed8f0
..
3b6beb0
100644
(file)
--- a/
symm/salsa20-arm-neon.S
+++ b/
symm/salsa20-arm-neon.S
@@
-25,18
+25,19
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
-///--------------------------------------------------------------------------
-/// Main.code.
-
.arch armv7-a
.fpu neon
.arch armv7-a
.fpu neon
+
.text
.text
+///--------------------------------------------------------------------------
+/// Main.code.
+
FUNC(salsa20_core_arm_neon)
// Arguments are in registers.
FUNC(salsa20_core_arm_neon)
// Arguments are in registers.
diff --git
a/symm/salsa20-arm64.S
b/symm/salsa20-arm64.S
index
821548e
..
864c63c
100644
(file)
--- a/
symm/salsa20-arm64.S
+++ b/
symm/salsa20-arm64.S
@@
-25,17
+25,18
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
-///--------------------------------------------------------------------------
-/// Main.code.
-
.arch armv8-a
.arch armv8-a
+
.text
.text
+///--------------------------------------------------------------------------
+/// Main.code.
+
FUNC(salsa20_core_arm64)
// Arguments are in registers.
FUNC(salsa20_core_arm64)
// Arguments are in registers.
diff --git
a/symm/salsa20-x86ish-sse2.S
b/symm/salsa20-x86ish-sse2.S
index
06ba3d2
..
56746e5
100644
(file)
--- a/
symm/salsa20-x86ish-sse2.S
+++ b/
symm/salsa20-x86ish-sse2.S
@@
-25,16
+25,16
@@
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
/// MA 02111-1307, USA.
///--------------------------------------------------------------------------
-///
External definition
s.
+///
Preliminarie
s.
#include "config.h"
#include "asm-common.h"
#include "config.h"
#include "asm-common.h"
+ .text
+
///--------------------------------------------------------------------------
/// Main code.
///--------------------------------------------------------------------------
/// Main code.
- .text
-
FUNC(salsa20_core_x86ish_avx)
.arch .avx
vzeroupper
FUNC(salsa20_core_x86ish_avx)
.arch .avx
vzeroupper