Merge pull request #76 from DaGenix/fix-windows

Fix windows

Author: cosmycoder

.gitignore

@@ -19,7 +19,9 @@ bin
 
 # Output files
 rust-crypto-test
+rust-crypto-test.exe
 rust-crypto-util
+rust-crypto-util.exe
 
 # mvn build files
 tools/rust-crypto-tester/target/

rust.mk

@@ -56,6 +56,7 @@ clean-$$($(1)_rust_crate_name):
 	@rm -f $$($(1)_rust_crate_out)
 	@rm -f $$($(1)_rust_crate_main).d
 	@rm -f $$($(1)_rust_crate_name)-test
+	@rm -f $$($(1)_rust_crate_name)-test.exe
 	@rm -f $$($(1)_rust_crate_test).d
 	@rm -f $$($(1)_rust_crate_dir)/*.o
 endif

src/rust-crypto/aesni.rs

@@ -448,33 +448,33 @@ fn encrypt_block_aseni(rounds: uint, input: &[u8], round_keys: &[u8], output: &m
 
         asm!(
         "
-            /* Copy the data to encrypt to xmm15 */
-            movdqu ($2), %xmm15
+            /* Copy the data to encrypt to xmm1 */
+            movdqu ($2), %xmm1
 
             /* Perform round 0 - the whitening step */
             movdqu ($1), %xmm0
             add $$0x10, $1
-            pxor %xmm0, %xmm15
+            pxor %xmm0, %xmm1
 
             /* Perform all remaining rounds (except the final one) */
             enc_round:
             movdqu ($1), %xmm0
             add $$0x10, $1
-            aesenc %xmm0, %xmm15
+            aesenc %xmm0, %xmm1
             sub $$0x01, $0
             cmp $$0x01, $0
             jne enc_round
 
             /* Perform the last round */
             movdqu ($1), %xmm0
-            aesenclast %xmm0, %xmm15
+            aesenclast %xmm0, %xmm1
 
-            /* Finally, move the result from xmm15 to outp */
-            movdqu %xmm15, ($3)
+            /* Finally, move the result from xmm1 to outp */
+            movdqu %xmm1, ($3)
         "
         : "=r" (rounds), "=r" (round_keysp) // outputs
         : "r" (inp), "r" (outp), "0" (rounds), "1" (round_keysp) // inputs
-        : "xmm0", "xmm15", "memory", "cc" // clobbers
+        : "xmm0", "xmm1", "memory", "cc" // clobbers
         : "volatile" // options
         );
     }
@@ -491,33 +491,33 @@ fn decrypt_block_aseni(rounds: uint, input: &[u8], round_keys: &[u8], output: &m
 
         asm!(
         "
-            /* Copy the data to decrypt to xmm15 */
-            movdqu ($2), %xmm15
+            /* Copy the data to decrypt to xmm1 */
+            movdqu ($2), %xmm1
 
             /* Perform round 0 - the whitening step */
             movdqu ($1), %xmm0
             sub $$0x10, $1
-            pxor %xmm0, %xmm15
+            pxor %xmm0, %xmm1
 
             /* Perform all remaining rounds (except the final one) */
             dec_round:
             movdqu ($1), %xmm0
             sub $$0x10, $1
-            aesdec %xmm0, %xmm15
+            aesdec %xmm0, %xmm1
             sub $$0x01, $0
             cmp $$0x01, $0
             jne dec_round
 
             /* Perform the last round */
             movdqu ($1), %xmm0
-            aesdeclast %xmm0, %xmm15
+            aesdeclast %xmm0, %xmm1
 
-            /* Finally, move the result from xmm15 to outp */
-            movdqu %xmm15, ($3)
+            /* Finally, move the result from xmm1 to outp */
+            movdqu %xmm1, ($3)
         "
         : "=r" (rounds), "=r" (round_keysp) // outputs
         : "r" (inp), "r" (outp), "0" (rounds), "1" (round_keysp) // inputs
-        : "xmm0", "xmm15", "memory", "cc" // clobbers
+        : "xmm0", "xmm1", "memory", "cc" // clobbers
         : "volatile" // options
         );
     }

src/rust-crypto/util.rs

@@ -4,38 +4,26 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// This should go in either 'sys' or 'os'
 #[cfg(target_arch = "x86")]
 #[cfg(target_arch = "x86_64")]
-#[allow(dead_assignment)]
-fn cpuid(func: u32) -> (u32, u32, u32, u32) {
-    let mut a = 0u32;
-    let mut b = 0u32;
-    let mut c = 0u32;
-    let mut d = 0u32;
-
+pub fn supports_aesni() -> bool {
+	let mut flags: u32;
     unsafe {
         asm!(
         "
-        mov $4, %eax;
+        mov $$1, %eax;
         cpuid;
-        mov %eax, $0;
-        mov %ebx, $1;
-        mov %ecx, $2;
-        mov %edx, $3;
+		mov %ecx, $0;
         "
-        : "=r" (a), "=r" (b), "=r" (c), "=r" (d)
-        : "r" (func)
-        : "eax", "ebx", "ecx", "edx"
+        : "=r" (flags) // output
+        : // input
+        : "eax", "ebx", "ecx", "edx" // clobbers
         )
+		// No idea why, but on 32-bit targets, the compiler complains
+		// about not having enough registers. Adding in this dummy
+		// section, however, seems to fix it.
+        asm!("")
     }
 
-    return (a, b, c, d);
-}
-
-#[cfg(target_arch = "x86")]
-#[cfg(target_arch = "x86_64")]
-pub fn supports_aesni() -> bool {
-    let (_, _, c, _) = cpuid(1);
-    return (c & 0x02000000) != 0;
+    return (flags & 0x02000000) != 0;
 }