summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authormarcfedorow <mark.fedorov@cloudbear.ru>2022-07-19 19:15:44 +0300
committerHugo Landau <hlandau@openssl.org>2022-07-21 07:25:06 +0100
commit48b6776678d794406c625dcb5767102b73081962 (patch)
treee43205c5bbee7041798b1e7eaf637ca953f50bc5 /include
parentb6fbef1159c9aeb1590c116a9426e169d2203506 (diff)
Emit rev8 on __riscv_zbkb as on __riscv_zbb
Also add early clobber for two-insn bswap. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18827)
Diffstat (limited to 'include')
-rw-r--r--include/crypto/modes.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/crypto/modes.h b/include/crypto/modes.h
index f98b705655..90c9861011 100644
--- a/include/crypto/modes.h
+++ b/include/crypto/modes.h
@@ -74,13 +74,13 @@ typedef unsigned char u8;
asm ("rev %0,%1" \
: "=r"(ret_) : "r"((u32)(x))); \
ret_; })
-# elif defined(__riscv_zbb) && __riscv_xlen == 64
+# elif (defined(__riscv_zbb) || defined(__riscv_zbkb)) && __riscv_xlen == 64
# define BSWAP8(x) ({ u64 ret_=(x); \
asm ("rev8 %0,%0" \
: "+r"(ret_)); ret_; })
# define BSWAP4(x) ({ u32 ret_=(x); \
asm ("rev8 %0,%0; srli %0,%0,32"\
- : "+r"(ret_)); ret_; })
+ : "+&r"(ret_)); ret_; })
# endif
# elif defined(_MSC_VER)
# if _MSC_VER>=1300