diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-31 12:11:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-31 12:11:51 -0700 |
| commit | 7cff82f5f42a938a1b633e121a41d29c81de18bb (patch) | |
| tree | 80b07a1886e7f4b8caf547e9963245ca4ce75f1b /arch/sparc/crypto/camellia_asm.S | |
| parent | 4e71bb49f256e4efc94a9fdaaa430d906cd88e6b (diff) | |
| download | blackbird-obmc-linux-7cff82f5f42a938a1b633e121a41d29c81de18bb.tar.gz blackbird-obmc-linux-7cff82f5f42a938a1b633e121a41d29c81de18bb.zip | |
sparc64: Avoid code duplication in crypto assembler.
Put the opcode macros in a common header
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/crypto/camellia_asm.S')
| -rw-r--r-- | arch/sparc/crypto/camellia_asm.S | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/arch/sparc/crypto/camellia_asm.S b/arch/sparc/crypto/camellia_asm.S index b0ddb5bcfe5f..d3ef9c7bbd02 100644 --- a/arch/sparc/crypto/camellia_asm.S +++ b/arch/sparc/crypto/camellia_asm.S @@ -1,27 +1,7 @@ #include <linux/linkage.h> #include <asm/visasm.h> -#define F3F(x,y,z) (((x)<<30)|((y)<<19)|((z)<<5)) - -#define FPD_ENCODE(x) (((x) >> 5) | ((x) & ~(0x20))) - -#define RS1(x) (FPD_ENCODE(x) << 14) -#define RS2(x) (FPD_ENCODE(x) << 0) -#define RS3(x) (FPD_ENCODE(x) << 9) -#define RD(x) (FPD_ENCODE(x) << 25) -#define IMM5(x) ((x) << 0) - -#define CAMELLIA_F(a,b,c,d) \ - .word (F3F(2, 0x19, 0x00c)|RS1(a)|RS2(b)|RS3(c)|RD(d)); -#define CAMELLIA_FL(a,b,c) \ - .word (F3F(2, 0x36, 0x13c)|RS1(a)|RS2(b)|RD(c)); -#define CAMELLIA_FLI(a,b,c) \ - .word (F3F(2, 0x36, 0x13d)|RS1(a)|RS2(b)|RD(c)); - -#define MOVDTOX_F0_O4 \ - .word 0x99b02200 -#define MOVDTOX_F2_O5 \ - .word 0x9bb02202 +#include "opcodes.h" #define CAMELLIA_6ROUNDS(KEY_BASE, I0, I1) \ CAMELLIA_F(KEY_BASE + 0, I1, I0, I1) \ |
