Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(aes): fix decode logic and exception check for aes64ks1i. #646

Merged
merged 1 commit into from
Nov 8, 2024
Merged

fix(aes): fix decode logic and exception check for aes64ks1i. #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/isa/riscv64/instr/rvi/decode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
*
* See the Mulan PSL v2 for more details.
***************************************************************************************/
#ifndef RVI_DECODE_H
#define RVI_DECODE_H

static int table_c_addi_dispatch(Decode *s);
static int table_c_addiw_dispatch(Decode *s);
Expand Down Expand Up @@ -77,6 +79,10 @@ static inline def_DHelper(S) {
decode_op_r(s, id_dest, s->isa.instr.s.rs2, true);
}

#ifdef CONFIG_RVK
#include "../rvk/decode.h"
#endif // CONFIG_RVK

static inline def_SubDHelper(load, I, {
print_Dop(id_src1->str, OP_STR_SIZE, "%ld(%s)", id_src2->imm, reg_name(s->isa.instr.i.rs1, 4));
})
Expand Down Expand Up @@ -166,7 +172,7 @@ def_THelper(op_imm) {
#endif
#ifdef CONFIG_RVK
def_INSTR_TAB("0011000 00000 ????? 001 ????? ????? ??", aes64im);
def_INSTR_TAB("0011000 1???? ????? 001 ????? ????? ??", aes64ks1i);
def_INSTR_IDTAB("0011000 1???? ????? 001 ????? ????? ??", aes64ks1i, aes64ks1i);
def_INSTR_TAB("0001000 00000 ????? 001 ????? ????? ??", sha256sum0);
def_INSTR_TAB("0001000 00001 ????? 001 ????? ????? ??", sha256sum1);
def_INSTR_TAB("0001000 00010 ????? 001 ????? ????? ??", sha256sig0);
Expand Down Expand Up @@ -324,3 +330,4 @@ def_THelper(mem_fence) {
def_INSTR_TAB("??????? ????? ????? 001 ????? ????? ??", fence_i);
return EXEC_ID_inv;
}
#endif // RVI_DECODE_H
6 changes: 5 additions & 1 deletion src/isa/riscv64/instr/rvk/crypto_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <limits.h>
#include "aes_common.h"
#include "sm4_common.h"

#include "../local-include/intr.h"

int32_t sha256sum0 (int32_t rs1) { return _rv32_ror(rs1, 2) ^ _rv32_ror(rs1, 13) ^ _rv32_ror(rs1, 22); }
int32_t sha256sum1 (int32_t rs1) { return _rv32_ror(rs1, 6) ^ _rv32_ror(rs1, 11) ^ _rv32_ror(rs1, 25); }
Expand Down Expand Up @@ -91,6 +91,10 @@ int64_t aes64im (int64_t rs1)

int64_t aes64ks1i (int64_t rs1, int64_t rs2)
{
if (!(rs2 >= 0x0 && rs2 <= 0xA)) {
// Note that rnum must be in the range 0x0..0xA. The values 0xB..0xF are reserved.
longjmp_exception(EX_II);
}
uint8_t round_consts [10] = {
0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36
};
Expand Down
26 changes: 26 additions & 0 deletions src/isa/riscv64/instr/rvk/decode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/***************************************************************************************
* Copyright (c) 2014-2021 Zihao Yu, Nanjing University
* Copyright (c) 2020-2022 Institute of Computing Technology, Chinese Academy of Sciences
*
* NEMU is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
*
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
*
* See the Mulan PSL v2 for more details.
***************************************************************************************/

#ifndef RVK_DECODE_H
#define RVK_DECODE_H
#include <cpu/decode.h>
#include "../rvi/decode.h"

static inline def_DHelper(aes64ks1i) {
sword_t simm = BITS(s->isa.instr.i.simm11_0, 3, 0);
decode_op_i(s, id_src2, simm, false);
}
#endif // RVK_DECODE_H