VERY experimental Nintendo Switch 2 emulator
C++
[dynarmic] inline SM4 ARM operation (#3474)
lizzie9c685c144947
diff --git a/src/dynarmic/src/dynarmic/CMakeLists.txt b/src/dynarmic/src/dynarmic/CMakeLists.txtindex 8b55a864a3..477de82fa9 100644--- a/src/dynarmic/src/dynarmic/CMakeLists.txt+++ b/src/dynarmic/src/dynarmic/CMakeLists.txt@@ -15,8 +15,6 @@ add_library(dynarmic STATICcommon/crypto/aes.hcommon/crypto/crc32.cppcommon/crypto/crc32.h- common/crypto/sm4.cpp- common/crypto/sm4.hcommon/fp/fpcr.hcommon/fp/fpsr.hcommon/fp/fused.cppdiff --git a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_sm4.cpp b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_sm4.cppindex e121e3119e..fc30c0e158 100644--- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64_sm4.cpp+++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64_sm4.cpp@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later/* This file is part of the dynarmic project.@@ -8,17 +8,54 @@#include "dynarmic/backend/x64/block_of_code.h"#include "dynarmic/backend/x64/emit_x64.h"-#include "dynarmic/common/crypto/sm4.h"#include "dynarmic/ir/microinstruction.h"namespace Dynarmic::Backend::X64 {+alignas(64) static constexpr std::array<u8, 256> substitution_box = {+ 0xD6, 0x90, 0xE9, 0xFE, 0xCC, 0xE1, 0x3D, 0xB7,+ 0x16, 0xB6, 0x14, 0xC2, 0x28, 0xFB, 0x2C, 0x05,+ 0x2B, 0x67, 0x9A, 0x76, 0x2A, 0xBE, 0x04, 0xC3,+ 0xAA, 0x44, 0x13, 0x26, 0x49, 0x86, 0x06, 0x99,+ 0x9C, 0x42, 0x50, 0xF4, 0x91, 0xEF, 0x98, 0x7A,+ 0x33, 0x54, 0x0B, 0x43, 0xED, 0xCF, 0xAC, 0x62,+ 0xE4, 0xB3, 0x1C, 0xA9, 0xC9, 0x08, 0xE8, 0x95,+ 0x80, 0xDF, 0x94, 0xFA, 0x75, 0x8F, 0x3F, 0xA6,+ 0x47, 0x07, 0xA7, 0xFC, 0xF3, 0x73, 0x17, 0xBA,+ 0x83, 0x59, 0x3C, 0x19, 0xE6, 0x85, 0x4F, 0xA8,+ 0x68, 0x6B, 0x81, 0xB2, 0x71, 0x64, 0xDA, 0x8B,+ 0xF8, 0xEB, 0x0F, 0x4B, 0x70, 0x56, 0x9D, 0x35,+ 0x1E, 0x24, 0x0E, 0x5E, 0x63, 0x58, 0xD1, 0xA2,+ 0x25, 0x22, 0x7C, 0x3B, 0x01, 0x21, 0x78, 0x87,+ 0xD4, 0x00, 0x46, 0x57, 0x9F, 0xD3, 0x27, 0x52,+ 0x4C, 0x36, 0x02, 0xE7, 0xA0, 0xC4, 0xC8, 0x9E,+ 0xEA, 0xBF, 0x8A, 0xD2, 0x40, 0xC7, 0x38, 0xB5,+ 0xA3, 0xF7, 0xF2, 0xCE, 0xF9, 0x61, 0x15, 0xA1,+ 0xE0, 0xAE, 0x5D, 0xA4, 0x9B, 0x34, 0x1A, 0x55,+ 0xAD, 0x93, 0x32, 0x30, 0xF5, 0x8C, 0xB1, 0xE3,+ 0x1D, 0xF6, 0xE2, 0x2E, 0x82, 0x66, 0xCA, 0x60,+ 0xC0, 0x29, 0x23, 0xAB, 0x0D, 0x53, 0x4E, 0x6F,+ 0xD5, 0xDB, 0x37, 0x45, 0xDE, 0xFD, 0x8E, 0x2F,+ 0x03, 0xFF, 0x6A, 0x72, 0x6D, 0x6C, 0x5B, 0x51,+ 0x8D, 0x1B, 0xAF, 0x92, 0xBB, 0xDD, 0xBC, 0x7F,+ 0x11, 0xD9, 0x5C, 0x41, 0x1F, 0x10, 0x5A, 0xD8,+ 0x0A, 0xC1, 0x31, 0x88, 0xA5, 0xCD, 0x7B, 0xBD,+ 0x2D, 0x74, 0xD0, 0x12, 0xB8, 0xE5, 0xB4, 0xB0,+ 0x89, 0x69, 0x97, 0x4A, 0x0C, 0x96, 0x77, 0x7E,+ 0x65, 0xB9, 0xF1, 0x09, 0xC5, 0x6E, 0xC6, 0x84,+ 0x18, 0xF0, 0x7D, 0xEC, 0x3A, 0xDC, 0x4D, 0x20,+ 0x79, 0xEE, 0x5F, 0x3E, 0xD7, 0xCB, 0x39, 0x48+};+void EmitX64::EmitSM4AccessSubstitutionBox(EmitContext& ctx, IR::Inst* inst) {auto args = ctx.reg_alloc.GetArgumentInfo(inst);-- ctx.reg_alloc.HostCall(code, inst, args[0]);- code.CallFunction(&Common::Crypto::SM4::AccessSubstitutionBox);- code.movzx(code.ABI_RETURN.cvt32(), code.ABI_RETURN.cvt8());+ const Xbyak::Reg64 tmp0 = ctx.reg_alloc.UseScratchGpr(code, args[0]);+ const Xbyak::Reg tmp1 = ctx.reg_alloc.ScratchGpr(code);+ // return subtitution_box[index * 1];+ code.movzx(tmp0.cvt32(), tmp0.cvt8());+ code.lea(tmp1, code.ptr[std::addressof(substitution_box)]);+ code.movzx(tmp1, code.byte[tmp1 + tmp0 * 1]);+ ctx.reg_alloc.DefineValue(code, inst, tmp1);}} // namespace Dynarmic::Backend::X64diff --git a/src/dynarmic/src/dynarmic/common/crypto/sm4.cpp b/src/dynarmic/src/dynarmic/common/crypto/sm4.cppdeleted file mode 100644index d775e1bf6d..0000000000--- a/src/dynarmic/src/dynarmic/common/crypto/sm4.cpp+++ /dev/null@@ -1,57 +0,0 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project-// SPDX-License-Identifier: GPL-3.0-or-later--/* This file is part of the dynarmic project.- * Copyright (c) 2018 MerryMage- * SPDX-License-Identifier: 0BSD- */--#include "dynarmic/common/crypto/sm4.h"--#include <array>--#include "dynarmic/common/common_types.h"--namespace Dynarmic::Common::Crypto::SM4 {--using SubstitutionTable = std::array<u8, 256>;--constexpr SubstitutionTable substitution_box{- {0xD6, 0x90, 0xE9, 0xFE, 0xCC, 0xE1, 0x3D, 0xB7,- 0x16, 0xB6, 0x14, 0xC2, 0x28, 0xFB, 0x2C, 0x05,- 0x2B, 0x67, 0x9A, 0x76, 0x2A, 0xBE, 0x04, 0xC3,- 0xAA, 0x44, 0x13, 0x26, 0x49, 0x86, 0x06, 0x99,- 0x9C, 0x42, 0x50, 0xF4, 0x91, 0xEF, 0x98, 0x7A,- 0x33, 0x54, 0x0B, 0x43, 0xED, 0xCF, 0xAC, 0x62,- 0xE4, 0xB3, 0x1C, 0xA9, 0xC9, 0x08, 0xE8, 0x95,- 0x80, 0xDF, 0x94, 0xFA, 0x75, 0x8F, 0x3F, 0xA6,- 0x47, 0x07, 0xA7, 0xFC, 0xF3, 0x73, 0x17, 0xBA,- 0x83, 0x59, 0x3C, 0x19, 0xE6, 0x85, 0x4F, 0xA8,- 0x68, 0x6B, 0x81, 0xB2, 0x71, 0x64, 0xDA, 0x8B,- 0xF8, 0xEB, 0x0F, 0x4B, 0x70, 0x56, 0x9D, 0x35,- 0x1E, 0x24, 0x0E, 0x5E, 0x63, 0x58, 0xD1, 0xA2,- 0x25, 0x22, 0x7C, 0x3B, 0x01, 0x21, 0x78, 0x87,- 0xD4, 0x00, 0x46, 0x57, 0x9F, 0xD3, 0x27, 0x52,- 0x4C, 0x36, 0x02, 0xE7, 0xA0, 0xC4, 0xC8, 0x9E,- 0xEA, 0xBF, 0x8A, 0xD2, 0x40, 0xC7, 0x38, 0xB5,- 0xA3, 0xF7, 0xF2, 0xCE, 0xF9, 0x61, 0x15, 0xA1,- 0xE0, 0xAE, 0x5D, 0xA4, 0x9B, 0x34, 0x1A, 0x55,- 0xAD, 0x93, 0x32, 0x30, 0xF5, 0x8C, 0xB1, 0xE3,- 0x1D, 0xF6, 0xE2, 0x2E, 0x82, 0x66, 0xCA, 0x60,- 0xC0, 0x29, 0x23, 0xAB, 0x0D, 0x53, 0x4E, 0x6F,- 0xD5, 0xDB, 0x37, 0x45, 0xDE, 0xFD, 0x8E, 0x2F,- 0x03, 0xFF, 0x6A, 0x72, 0x6D, 0x6C, 0x5B, 0x51,- 0x8D, 0x1B, 0xAF, 0x92, 0xBB, 0xDD, 0xBC, 0x7F,- 0x11, 0xD9, 0x5C, 0x41, 0x1F, 0x10, 0x5A, 0xD8,- 0x0A, 0xC1, 0x31, 0x88, 0xA5, 0xCD, 0x7B, 0xBD,- 0x2D, 0x74, 0xD0, 0x12, 0xB8, 0xE5, 0xB4, 0xB0,- 0x89, 0x69, 0x97, 0x4A, 0x0C, 0x96, 0x77, 0x7E,- 0x65, 0xB9, 0xF1, 0x09, 0xC5, 0x6E, 0xC6, 0x84,- 0x18, 0xF0, 0x7D, 0xEC, 0x3A, 0xDC, 0x4D, 0x20,- 0x79, 0xEE, 0x5F, 0x3E, 0xD7, 0xCB, 0x39, 0x48}};--u8 AccessSubstitutionBox(u8 index) {- return substitution_box[index];-}--} // namespace Dynarmic::Common::Crypto::SM4diff --git a/src/dynarmic/src/dynarmic/common/crypto/sm4.h b/src/dynarmic/src/dynarmic/common/crypto/sm4.hdeleted file mode 100644index af7a67f871..0000000000--- a/src/dynarmic/src/dynarmic/common/crypto/sm4.h+++ /dev/null@@ -1,17 +0,0 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project-// SPDX-License-Identifier: GPL-3.0-or-later--/* This file is part of the dynarmic project.- * Copyright (c) 2018 MerryMage- * SPDX-License-Identifier: 0BSD- */--#pragma once--#include "dynarmic/common/common_types.h"--namespace Dynarmic::Common::Crypto::SM4 {--u8 AccessSubstitutionBox(u8 index);--} // namespace Dynarmic::Common::Crypto::SM4