From b7fd68b90f13c7c54547c0a9431efdd5c4da4ead Mon Sep 17 00:00:00 2001
From: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
Date: Fri, 11 Jun 2021 07:55:24 -0400
Subject: [PATCH] Update K scalar to 0.9.2

---
 new_instructions_support.h   |  2 +-
 new_instructions_support_k.h | 64 ++++++++++++++++++------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/new_instructions_support.h b/new_instructions_support.h
index 6751d87..bda6f10 100644
--- a/new_instructions_support.h
+++ b/new_instructions_support.h
@@ -27,7 +27,7 @@ typedef uint32_t uint_xlen_t;
 	       : "r" (rs1), "r" (rs2));					\
     return r;								\
   }
-// binary (destructive, e.g. aes32esmi from K)
+// binary (destructive, UNUSED [K removed it in 0.9.2])
 #define FUN2F(NAME, ASNAME)						\
   static inline uint32_t NAME(uint32_t rs1, uint32_t rs2) {		\
     uint32_t r = rs1;							\
diff --git a/new_instructions_support_k.h b/new_instructions_support_k.h
index 51b1b17..ab9b7e6 100644
--- a/new_instructions_support_k.h
+++ b/new_instructions_support_k.h
@@ -3,38 +3,38 @@
 
 #include "new_instructions_support.h" // for support macros
 
-ASM2FMACRO(AES32ESMI0,0x36000033)
-ASM2FMACRO(AES32ESMI1,0x76000033)
-ASM2FMACRO(AES32ESMI2,0xb6000033)
-ASM2FMACRO(AES32ESMI3,0xf6000033)
-ASM2FMACRO(AES32ESI0,0x32000033)
-ASM2FMACRO(AES32ESI1,0x72000033)
-ASM2FMACRO(AES32ESI2,0xb2000033)
-ASM2FMACRO(AES32ESI3,0xf2000033)
-FUN2F(aes32esmi0,AES32ESMI0)
-FUN2F(aes32esmi1,AES32ESMI1)
-FUN2F(aes32esmi2,AES32ESMI2)
-FUN2F(aes32esmi3,AES32ESMI3)
-FUN2F(aes32esi0,AES32ESI0)
-FUN2F(aes32esi1,AES32ESI1)
-FUN2F(aes32esi2,AES32ESI2)
-FUN2F(aes32esi3,AES32ESI3)
-ASM2FMACRO(AES32DSMI0,0x3e000033)
-ASM2FMACRO(AES32DSMI1,0x7e000033)
-ASM2FMACRO(AES32DSMI2,0xbe000033)
-ASM2FMACRO(AES32DSMI3,0xfe000033)
-ASM2FMACRO(AES32DSI0,0x3a000033)
-ASM2FMACRO(AES32DSI1,0x7a000033)
-ASM2FMACRO(AES32DSI2,0xba000033)
-ASM2FMACRO(AES32DSI3,0xfa000033)
-FUN2F(aes32dsmi0,AES32DSMI0)
-FUN2F(aes32dsmi1,AES32DSMI1)
-FUN2F(aes32dsmi2,AES32DSMI2)
-FUN2F(aes32dsmi3,AES32DSMI3)
-FUN2F(aes32dsi0,AES32DSI0)
-FUN2F(aes32dsi1,AES32DSI1)
-FUN2F(aes32dsi2,AES32DSI2)
-FUN2F(aes32dsi3,AES32DSI3)
+ASM2MACRO(AES32ESMI0,0x36000033)
+ASM2MACRO(AES32ESMI1,0x76000033)
+ASM2MACRO(AES32ESMI2,0xb6000033)
+ASM2MACRO(AES32ESMI3,0xf6000033)
+ASM2MACRO(AES32ESI0,0x32000033)
+ASM2MACRO(AES32ESI1,0x72000033)
+ASM2MACRO(AES32ESI2,0xb2000033)
+ASM2MACRO(AES32ESI3,0xf2000033)
+FUN2(aes32esmi0,AES32ESMI0)
+FUN2(aes32esmi1,AES32ESMI1)
+FUN2(aes32esmi2,AES32ESMI2)
+FUN2(aes32esmi3,AES32ESMI3)
+FUN2(aes32esi0,AES32ESI0)
+FUN2(aes32esi1,AES32ESI1)
+FUN2(aes32esi2,AES32ESI2)
+FUN2(aes32esi3,AES32ESI3)
+ASM2MACRO(AES32DSMI0,0x3e000033)
+ASM2MACRO(AES32DSMI1,0x7e000033)
+ASM2MACRO(AES32DSMI2,0xbe000033)
+ASM2MACRO(AES32DSMI3,0xfe000033)
+ASM2MACRO(AES32DSI0,0x3a000033)
+ASM2MACRO(AES32DSI1,0x7a000033)
+ASM2MACRO(AES32DSI2,0xba000033)
+ASM2MACRO(AES32DSI3,0xfa000033)
+FUN2(aes32dsmi0,AES32DSMI0)
+FUN2(aes32dsmi1,AES32DSMI1)
+FUN2(aes32dsmi2,AES32DSMI2)
+FUN2(aes32dsmi3,AES32DSMI3)
+FUN2(aes32dsi0,AES32DSI0)
+FUN2(aes32dsi1,AES32DSI1)
+FUN2(aes32dsi2,AES32DSI2)
+FUN2(aes32dsi3,AES32DSI3)
 
 ASM1MACRO(SHA256SIG0,0x10201013)
 ASM1MACRO(SHA256SIG1,0x10301013)