Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
#include <asm/i387.h>
|
||||
|
||||
struct crypto_fpu_ctx {
|
||||
|
@@ -22,7 +22,7 @@
|
||||
|
||||
#include <asm/asm-offsets.h>
|
||||
|
||||
/* return adress at 0 */
|
||||
/* return address at 0 */
|
||||
|
||||
#define in_blk 12 /* input byte array address parameter*/
|
||||
#define out_blk 8 /* output byte array address parameter*/
|
||||
@@ -230,8 +230,8 @@ twofish_enc_blk:
|
||||
push %edi
|
||||
|
||||
mov tfm + 16(%esp), %ebp /* abuse the base pointer: set new base bointer to the crypto tfm */
|
||||
add $crypto_tfm_ctx_offset, %ebp /* ctx adress */
|
||||
mov in_blk+16(%esp),%edi /* input adress in edi */
|
||||
add $crypto_tfm_ctx_offset, %ebp /* ctx address */
|
||||
mov in_blk+16(%esp),%edi /* input address in edi */
|
||||
|
||||
mov (%edi), %eax
|
||||
mov b_offset(%edi), %ebx
|
||||
@@ -286,8 +286,8 @@ twofish_dec_blk:
|
||||
|
||||
|
||||
mov tfm + 16(%esp), %ebp /* abuse the base pointer: set new base bointer to the crypto tfm */
|
||||
add $crypto_tfm_ctx_offset, %ebp /* ctx adress */
|
||||
mov in_blk+16(%esp),%edi /* input adress in edi */
|
||||
add $crypto_tfm_ctx_offset, %ebp /* ctx address */
|
||||
mov in_blk+16(%esp),%edi /* input address in edi */
|
||||
|
||||
mov (%edi), %eax
|
||||
mov b_offset(%edi), %ebx
|
||||
|
@@ -221,11 +221,11 @@
|
||||
twofish_enc_blk:
|
||||
pushq R1
|
||||
|
||||
/* %rdi contains the crypto tfm adress */
|
||||
/* %rsi contains the output adress */
|
||||
/* %rdx contains the input adress */
|
||||
add $crypto_tfm_ctx_offset, %rdi /* set ctx adress */
|
||||
/* ctx adress is moved to free one non-rex register
|
||||
/* %rdi contains the crypto tfm address */
|
||||
/* %rsi contains the output address */
|
||||
/* %rdx contains the input address */
|
||||
add $crypto_tfm_ctx_offset, %rdi /* set ctx address */
|
||||
/* ctx address is moved to free one non-rex register
|
||||
as target for the 8bit high operations */
|
||||
mov %rdi, %r11
|
||||
|
||||
@@ -274,11 +274,11 @@ twofish_enc_blk:
|
||||
twofish_dec_blk:
|
||||
pushq R1
|
||||
|
||||
/* %rdi contains the crypto tfm adress */
|
||||
/* %rsi contains the output adress */
|
||||
/* %rdx contains the input adress */
|
||||
add $crypto_tfm_ctx_offset, %rdi /* set ctx adress */
|
||||
/* ctx adress is moved to free one non-rex register
|
||||
/* %rdi contains the crypto tfm address */
|
||||
/* %rsi contains the output address */
|
||||
/* %rdx contains the input address */
|
||||
add $crypto_tfm_ctx_offset, %rdi /* set ctx address */
|
||||
/* ctx address is moved to free one non-rex register
|
||||
as target for the 8bit high operations */
|
||||
mov %rdi, %r11
|
||||
|
||||
|
Reference in New Issue
Block a user