diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2013-05-30 15:37:52 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2013-05-30 15:37:52 +0000 |
| commit | 572ef3eb9aeb512bd0c839d57784d0a6fc9110ba (patch) | |
| tree | 03a0ce7e7dce2979d8d1ae90a104d5a4b6e135fe /sys | |
| parent | d24e1572f3bd9a71dcf6955093fab6aac91dce61 (diff) | |
Switch to using unhyphenated VIA padlock mnemonics. VIA abandoned the
hyphen in their official programming guide sometime between 2003 and
2005, and Clang's integrated assembler does not support hyphenated
mnemonics.
ok jsg, deraadt
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/via.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/via.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/via.c b/sys/arch/amd64/amd64/via.c index b6ac5c47522..7fa8bfb8963 100644 --- a/sys/arch/amd64/amd64/via.c +++ b/sys/arch/amd64/amd64/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.12 2012/01/13 09:53:24 mikeb Exp $ */ +/* $OpenBSD: via.c,v 1.13 2013/05/30 15:37:51 matthew Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -327,7 +327,7 @@ viac3_cbc(void *cw, void *src, void *dst, void *key, int rep, /* Do the deed */ __asm __volatile("pushfq; popfq"); - __asm __volatile("rep xcrypt-cbc" : + __asm __volatile("rep xcryptcbc" : : "b" (key), "a" (iv), "c" (rep), "d" (cw), "S" (src), "D" (dst) : "memory", "cc"); @@ -534,7 +534,7 @@ viac3_rnd(void *v) * sure that we turn on maximum whitening (%edx[0,1] == "11"), so * that we get the best random data possible. */ - __asm __volatile("rep xstore-rng" + __asm __volatile("rep xstorerng" : "=a" (rv) : "d" (3), "D" (buffer), "c" (len*sizeof(int)) : "memory", "cc"); diff --git a/sys/arch/i386/i386/via.c b/sys/arch/i386/i386/via.c index 534257fbc7a..97f90b54b07 100644 --- a/sys/arch/i386/i386/via.c +++ b/sys/arch/i386/i386/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.29 2012/01/13 09:53:24 mikeb Exp $ */ +/* $OpenBSD: via.c,v 1.30 2013/05/30 15:37:51 matthew Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -328,7 +328,7 @@ viac3_cbc(void *cw, void *src, void *dst, void *key, int rep, /* Do the deed */ __asm __volatile("pushfl; popfl"); - __asm __volatile("rep xcrypt-cbc" : + __asm __volatile("rep xcryptcbc" : : "a" (iv), "b" (key), "c" (rep), "d" (cw), "S" (src), "D" (dst) : "memory", "cc"); @@ -535,7 +535,7 @@ viac3_rnd(void *v) * sure that we turn on maximum whitening (%edx[0,1] == "11"), so * that we get the best random data possible. */ - __asm __volatile("rep xstore-rng" + __asm __volatile("rep xstorerng" : "=a" (rv) : "d" (3), "D" (buffer), "c" (len*sizeof(int)) : "memory", "cc"); |