From b22ec0369eb5cf7a22487312bc40513a0fe35cf1 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 1 Jun 2021 17:58:55 +0800 Subject: [PATCH] xous: asm: add aes calls for vexriscv VexRiscv has accelerated AES instructions. This adds ASM hooks for these instructions so they can be called from Rust. Signed-off-by: Sean Cross --- xous-rs/bin/riscv32i-unknown-none-elf.a | Bin 2250 -> 4058 bytes xous-rs/bin/riscv32imac-unknown-none-elf.a | Bin 2266 -> 4042 bytes xous-rs/bin/riscv32imac-unknown-xous-elf.a | Bin 2278 -> 0 bytes xous-rs/bin/riscv32imc-unknown-none-elf.a | Bin 2266 -> 4042 bytes xous-rs/bin/riscv64gc-unknown-none-elf.a | Bin 3342 -> 5758 bytes xous-rs/bin/riscv64imac-unknown-none-elf.a | Bin 3342 -> 5758 bytes xous-rs/src/asm.S | 80 +++++++++++++++++++++ 7 files changed, 80 insertions(+) delete mode 100644 xous-rs/bin/riscv32imac-unknown-xous-elf.a diff --git a/xous-rs/bin/riscv32i-unknown-none-elf.a b/xous-rs/bin/riscv32i-unknown-none-elf.a index 0af7945fd572728dab9a824b26443603bbb54805..4eb32a794bea9bac188113850a00c4f2bb052ed9 100644 GIT binary patch literal 4058 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 diff --git a/xous-rs/bin/riscv32imc-unknown-none-elf.a b/xous-rs/bin/riscv32imc-unknown-none-elf.a index e9e31da1ba57734b4bfc46065e32825d2422027c..44d65f411584722d3a85fa8479303407df9a6f86 100644 GIT binary patch literal 4042 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 LtMP4DqI>^89P|OG delta 644 zcmeyT(lr{2B1jS% zP&P>!v!LG}nTOnxHx3lwxh=8PGW6j`T>S$V=5 zoEab+fS_vfd|`901uPJr2GisR!e&g57$!@I*fE`8n;aox$0#s)x`;ia!Q|^A_Dlur zlO;s$I1@mA00N`Q@uKETlNcw@5VaFM02SN;axf6^0kQPt*P_~76;R{V873=;nQ>lV N2g@_`PL>yz2LRABRnGtb diff --git a/xous-rs/bin/riscv64imac-unknown-none-elf.a b/xous-rs/bin/riscv64imac-unknown-none-elf.a index aa1433070a5f582b7e624ba7de4dad884ce9ccfd..e9d7fb9f3a008f4b8c650f2b59fbb117a044e502 100644 GIT binary patch literal 5758 zcmeH~U1%It6vyvmn=~IbP10IFYIWLe)2Qusvq?j!T9R5@DzOxU5+%5q-Hc5%U+!#T z>IcRMQXj-8vEYja(IVCdMbIZj5emMjs1H60zW5{xzWCz#-#Mpy=I#zcsc&AIbI<(l zfBtjl-n(~hci$aU$}>mX5BbT`KU63j9vm$6=Y604QPI)&2MYzhVXEC2(_@VH+qL*B zt}ZS|#pqmA4(8@e;;L9#j;dxQTrCD+R16o&#o6g%-Ua}Etv9l?&dt&~ zOG|6M)1lKh1~oSZH6sRf9!}p_=JZX|I!o@G!NBGgYxA5o!~OaE(9n?YA1>sF<0+nM zf8oBd6HT5+6CD@N{Ap@eLXDZ|l6GT8Y&v4P%vKXozJ4tG)`rP$d}Olkd}*@pes8iD ze=*tj|1jAPn!N0XJ>L3SNAoAf#x5Iu8}l}9vT?hOdu<%FvB}0B8~4~)u(8F)9X9sb zIJCa@6ZIowe2Sj;cjp$0_NC}myr@z(CWz*9aiXB@N!8cKP>WmQA*&xa;hUTrgtw${Y>B#vzEeZWh12$#D8hFnXia}} z3ddOLB0hUGq+ED!3dj8GBKm@clnWnD;YU;W@f3c43O|#=A5P(uDZG@zXHxh=3a_T{ zXHxiD3V%6;pLaMeGsazQweff5GB2)A%sX5;&tr#ayly+p-nu)`pVkHx-2Ju0vW&q_ zRbMiuzCTc9%yo5Qj6fInRyS@>;rp5QX))zkukgt^{1o#+hd;{vh{K;`KH~5fnV)d@ z8_dTXeu?>m4*!bzgu{Pe{+PpmWj^ijznDMa@XfR!Fb+!&-^F~z;RDQ{bNDId>kc=$ zvAmx=#U-!)Khs4;eR``qA==Yh>Y45!k2k(_`d4=sbL{*2+b+D<(T^&<-erVCuYFD` z{btTl35Q<$Jir?CNADWKq1Qg+O0Rbf;m~WJN0eUgVZx!;K1HS1yN___wNI$@dRGz- zz4pPrfP(kkVzW31hhFqY@6i_W6c2(C^|Lm2l{_&v&eWUY}uwL$7^)RQlUEM4Qret}fW+HRtJx8gG9;OMIqpA-0G1yU{NCUD8oEawsMeE?i^KYf8z z|670Ht@|VW#B+52O)fe&UkyrBS1WNnBUv?Et(x3)Pz_A36h$Ui3Fm^`bXZzGTb!F+ z2oqp-;qgTh+s2?&s)Q?v=AaTRoDIn%R?s7;8UNkO1=VV0wzOQO#%oZp<}ijbZelsY z$$0@>W8QSZ*x>$*hLm4+uH_P1U9e_a>F;Xq@27iRPx#C8f5wF>uJ!=6;k!SgG)OP- z$F8qAZosz#I`kDq*2gi*T~D-cFm%tyuJ#_%HhTUS{PDR6Gb(sK=E!~iX=1J?A@eOm zy+?z)+Mof0?spdEaiNO*js)TViH-U{!ym&b7NY+cQn&w0#PBHhIX*8mmrMVpewOZ~ zwF8?(Im7qgo}l&b4<@v{S+)00K|M5=l+J(_D3yacGKq}6q{iZj%|1yu? LtMP4DqI>^89P|OG delta 644 zcmeyT(lr{2B1jS% zP&P>!v!LG}nTOnxHx3lwxh=8PGW6j`T>S$V=5 zoEab+fS_vfd|`901uPJr2GisR!e&g57$!@I*fE`8n;aox$0#s)x`;ia!Q|^A_Dlur zlO;s$I1@mA00N`Q@uKETlNcw@5VaFM02SN;axf6^0kQPt*P_~76;R{V873=;nQ>lV N2g@_`PL>yz2LRABRnGtb diff --git a/xous-rs/src/asm.S b/xous-rs/src/asm.S index 9843c9934..75e434c87 100644 --- a/xous-rs/src/asm.S +++ b/xous-rs/src/asm.S @@ -18,3 +18,83 @@ _xous_syscall: sw a6, 6*REGBYTES(t0) sw a7, 7*REGBYTES(t0) ret + +.global vex_aes_enc_id_0 +vex_aes_enc_id_0: + .word 0x00b5050b // vex_aes_enc_id a0, a1, a0, #0 + ret + +.global vex_aes_enc_id_1 +vex_aes_enc_id_1: + .word 0x10b5050b // vex_aes_enc_id a0, a1, a0, #1 + ret + +.global vex_aes_enc_id_2 +vex_aes_enc_id_2: + .word 0x20b5050b // vex_aes_enc_id a0, a1, a0, #2 + ret + +.global vex_aes_enc_id_3 +vex_aes_enc_id_3: + .word 0x30b5050b // vex_aes_enc_id a0, a1, a0, #3 + ret + +.global vex_aes_enc_id_last_0 +vex_aes_enc_id_last_0: + .word 0x04b5050b // vex_aes_enc_id_last a0, a1, a0, #0 + ret + +.global vex_aes_enc_id_last_1 +vex_aes_enc_id_last_1: + .word 0x14b5050b // vex_aes_enc_id_last a0, a1, a0, #1 + ret + +.global vex_aes_enc_id_last_2 +vex_aes_enc_id_last_2: + .word 0x24b5050b // vex_aes_enc_id_last a0, a1, a0, #2 + ret + +.global vex_aes_enc_id_last_3 +vex_aes_enc_id_last_3: + .word 0x34b5050b // vex_aes_enc_id_last a0, a1, a0, #3 + ret + +.global vex_aes_dec_id_0 +vex_aes_dec_id_0: + .word 0x02b5050b // vex_aes_dec_id a0, a1, a0, #0 + ret + +.global vex_aes_dec_id_1 +vex_aes_dec_id_1: + .word 0x12b5050b // vex_aes_dec_id a0, a1, a0, #1 + ret + +.global vex_aes_dec_id_2 +vex_aes_dec_id_2: + .word 0x22b5050b // vex_aes_dec_id a0, a1, a0, #2 + ret + +.global vex_aes_dec_id_3 +vex_aes_dec_id_3: + .word 0x32b5050b // vex_aes_dec_id a0, a1, a0, #3 + ret + +.global vex_aes_dec_id_last_0 +vex_aes_dec_id_last_0: + .word 0x06b5050b // vex_aes_dec_id_last a0, a1, a0, #0 + ret + +.global vex_aes_dec_id_last_1 +vex_aes_dec_id_last_1: + .word 0x16b5050b // vex_aes_dec_id_last a0, a1, a0, #1 + ret + +.global vex_aes_dec_id_last_2 +vex_aes_dec_id_last_2: + .word 0x26b5050b // vex_aes_dec_id_last a0, a1, a0, #2 + ret + +.global vex_aes_dec_id_last_3 +vex_aes_dec_id_last_3: + .word 0x36b5050b // vex_aes_dec_id_last a0, a1, a0, #3 + ret