diff options
| author | lloyd <[email protected]> | 2006-08-15 11:34:48 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2006-08-15 11:34:48 +0000 |
| commit | 12a48f7ffac24d0342a9572d489b0b543fa46df7 (patch) | |
| tree | 201b5a9ff4f1b356be784e22ebbcae2bc8057901 /modules/alg_ia32/asm_macr.h | |
| parent | beb7706fde4cd40ed74e5526a8e9dd51aa1531b0 (diff) | |
Implement the Serpent key schedule in assembly as well, so the C++
versions of the Sboxes can be removed.
Add some parens inside the asm macros
Diffstat (limited to 'modules/alg_ia32/asm_macr.h')
| -rw-r--r-- | modules/alg_ia32/asm_macr.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/alg_ia32/asm_macr.h b/modules/alg_ia32/asm_macr.h index 8643e0768..8e930ef96 100644 --- a/modules/alg_ia32/asm_macr.h +++ b/modules/alg_ia32/asm_macr.h @@ -55,10 +55,10 @@ func_name: /************************************************* * Memory Access Operations * *************************************************/ -#define ARRAY1(REG, NUM) NUM(REG) -#define ARRAY4(REG, NUM) 4*NUM(REG) -#define ARRAY4_INDIRECT(BASE, OFFSET, NUM) 4*NUM(BASE,OFFSET,4) -#define ARG(NUM) 4*PUSHED + ARRAY4(ESP, NUM) +#define ARRAY1(REG, NUM) (NUM)(REG) +#define ARRAY4(REG, NUM) 4*(NUM)(REG) +#define ARRAY4_INDIRECT(BASE, OFFSET, NUM) 4*(NUM)(BASE,OFFSET,4) +#define ARG(NUM) 4*(PUSHED) + ARRAY4(ESP, NUM) #define ASSIGN(TO, FROM) movl FROM, TO #define ASSIGN_BYTE(TO, FROM) movzbl FROM, TO |