The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-08 21:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12782 from brad0/openbsd_arm64

Browse Source 
Add OpenBSD/arm64 support.
This commit is contained in:
Admiral H. Curtiss 2024-05-23 21:38:57 +02:00 committed by GitHub
commit 222a393080
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Source/Core/Common/ArmCPUDetect.cpp
View File

@ -15,11 +15,16 @@
#include <Windows.h> #include <Windows.h>
#include <arm64intr.h> #include <arm64intr.h>
#include "Common/WindowsRegistry.h" #include "Common/WindowsRegistry.h"
#else #elif defined(__linux__)
#ifndef __FreeBSD__
#include <asm/hwcap.h> #include <asm/hwcap.h>
#endif
#include <sys/auxv.h> #include <sys/auxv.h>
#elif defined(__FreeBSD__)
#include <sys/auxv.h>
#elif defined(__OpenBSD__)
#include <machine/armreg.h>
#include <machine/cpu.h>
#include <sys/sysctl.h>
#include <sys/types.h>
#endif #endif
#include <fmt/format.h> #include <fmt/format.h>
@ -183,7 +188,7 @@ static bool Read_MIDR_EL1(u64* value)
#endif #endif
#ifndef __APPLE__ #if defined(_WIN32) || defined(__linux__) || defined(__FreeBSD__)
static std::string MIDRToString(u64 midr) static std::string MIDRToString(u64 midr)
{ {
@ -248,7 +253,7 @@ void CPUInfo::Detect()
{ {
cpu_id = MIDRToString(reg); cpu_id = MIDRToString(reg);
} }
#else #elif defined(__linux__) || defined(__FreeBSD__)
// Linux, Android, and FreeBSD // Linux, Android, and FreeBSD
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
@ -277,6 +282,33 @@ void CPUInfo::Detect()
{ {
cpu_id = MIDRToString(midr); cpu_id = MIDRToString(midr);
} }
#elif defined(__OpenBSD__)
// OpenBSD
int mib[2];
size_t len;
char hwmodel[256];
uint64_t isar0;
mib[0] = CTL_HW;
mib[1] = HW_MODEL;
len = std::size(hwmodel);
if (sysctl(mib, 2, &hwmodel, &len, nullptr, 0) != -1)
model_name = std::string(hwmodel, len - 1);
mib[0] = CTL_MACHDEP;
mib[1] = CPU_ID_AA64ISAR0;
len = sizeof(isar0);
if (sysctl(mib, 2, &isar0, &len, nullptr, 0) != -1)
{
if (ID_AA64ISAR0_AES(isar0) >= ID_AA64ISAR0_AES_BASE)
bAES = true;
if (ID_AA64ISAR0_SHA1(isar0) >= ID_AA64ISAR0_SHA1_BASE)
bSHA1 = true;
if (ID_AA64ISAR0_SHA2(isar0) >= ID_AA64ISAR0_SHA2_BASE)
bSHA2 = true;
if (ID_AA64ISAR0_CRC32(isar0) >= ID_AA64ISAR0_CRC32_BASE)
bCRC32 = true;
}
#endif #endif
model_name = ReplaceAll(model_name, ",", "_"); model_name = ReplaceAll(model_name, ",", "_");

5
Source/Core/Core/MachineContext.h
View File

@ -157,6 +157,11 @@ typedef ucontext_t SContext;
#define CTX_R14 sc_r14 #define CTX_R14 sc_r14
#define CTX_R15 sc_r15 #define CTX_R15 sc_r15
#define CTX_RIP sc_rip #define CTX_RIP sc_rip
#elif _M_ARM_64
#define CTX_REG(x) sc_x[x]
#define CTX_LR sc_lr
#define CTX_SP sc_sp
#define CTX_PC sc_elr
#else #else
#error No context definition for architecture #error No context definition for architecture
#endif #endif