nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2025-01-03 11:11:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm64.hpp => arch.hpp, add GetCurrentCoreContextInstance

Browse source
This commit is contained in:
TuxSH 2018-11-09 12:33:51 +01:00 committed by Michael Scire
parent 195da2e599
commit b6bbc4f3e5
6 changed files with 56 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mesosphere/include/mesosphere/arch/arch.hpp Normal file
View file

@ -0,0 +1,11 @@
#pragma once
#if 1 //defined MESOSPHERE_ARCH_ARM64
#include <mesosphere/arch/arm64/arch.hpp>
#else
//#error "No arch defined"
#endif

16
mesosphere/include/mesosphere/arch/arm64/KInterruptMaskGuard.hpp
View file

@ -1,7 +1,7 @@
#pragma once
#include <mesosphere/core/util.hpp>
#include <mesosphere/arch/arm64/arm64.hpp>
#include <mesosphere/arch/arm64/arch.hpp>
namespace mesosphere
{
@ -27,25 +27,13 @@ class KInterruptMaskGuard final {
RestoreInterrupts(flags);
}
static FlagsType MaskInterrupts()
{
FlagsType flags = MESOSPHERE_READ_SYSREG(daif);
MESOSPHERE_WRITE_SYSREG(flags | PSR_I_BIT, daif);
return flags;
}
static void RestoreInterrupts(FlagsType flags)
{
MESOSPHERE_WRITE_SYSREG(MESOSPHERE_READ_SYSREG(daif) | (flags & PSR_I_BIT), daif);
}
KInterruptMaskGuard(const KInterruptMaskGuard &) = delete;
KInterruptMaskGuard(KInterruptMaskGuard &&) = delete;
KInterruptMaskGuard &operator=(const KInterruptMaskGuard &) = delete;
KInterruptMaskGuard &operator=(KInterruptMaskGuard &&) = delete;
private:
FlagsType flags = 0;
u64 flags = 0;
};
}

36
mesosphere/include/mesosphere/arch/arm64/arm64.hpp → mesosphere/include/mesosphere/arch/arm64/arch.hpp
View file

@ -12,13 +12,16 @@
#define MESOSPHERE_WRITE_SYSREG(v, r) do { \
u64 __val = (u64)v; \
asm volatile("msr " BOOST_PP_STRINGIZE(r) ", %0" \
:: "r" (__val)); \
:: "r" (__val) : "memory"); \
} while (false)
#define MESOSPHERE_DAIF_BIT(v) (((u64)(v)) >> 6)
namespace mesosphere
{
class KCoreContext;
inline namespace arch
{
inline namespace arm64
@ -62,6 +65,37 @@ enum PsrBitGroup {
PSR_f = 0xFF000000u,
};
using InterruptFlagsType = u64;
static inline InterruptFlagsType MaskInterrupts()
{
InterruptFlagsType flags = MESOSPHERE_READ_SYSREG(daif);
MESOSPHERE_WRITE_SYSREG(flags | PSR_I_BIT, daif);
return flags;
}
static inline void RestoreInterrupts(InterruptFlagsType flags)
{
MESOSPHERE_WRITE_SYSREG(MESOSPHERE_READ_SYSREG(daif) | (flags & PSR_I_BIT), daif);
}
static inline KCoreContext &GetCurrentCoreContextInstance()
{
register KCoreContext *x18 asm ("x18");
return *x18;
}
static inline void ReloadCurrentCoreContextInstance()
{
asm volatile("mrs x18, tpidr_el1" ::: "x18", "memory");
}
static inline void SetCurrentCoreContextInstance(KCoreContext &cctx)
{
MESOSPHERE_WRITE_SYSREG((uiptr)&cctx, tpidr_el1);
ReloadCurrentCoreContextInstance();
}
}
}
}

2
mesosphere/include/mesosphere/board/common/arm/arm64/timer/KSystemClock.hpp
View file

@ -2,7 +2,7 @@
#include <chrono>
#include <mesosphere/core/util.hpp>
#include <mesosphere/arch/arm64/arm64.hpp>
#include <mesosphere/arch/arm64/arch.hpp>
#ifndef MESOSPHERE_SYSTEM_CLOCK_RATE // NEEDS to be defined; depends on cntfreq
#define MESOSPHERE_SYSTEM_CLOCK_RATE 192000000ull

3
mesosphere/include/mesosphere/core/KCoreContext.hpp
View file

@ -2,6 +2,7 @@
#include <array>
#include <mesosphere/core/util.hpp>
#include <mesosphere/arch/arch.hpp>
namespace mesosphere
{
@ -14,7 +15,7 @@ class KAlarm;
class KCoreContext {
public:
static KCoreContext &GetInstance(uint coreId) { return instances[coreId]; };
static KCoreContext &GetCurrentInstance() { return instances[0]; /* FIXME*/ };
static KCoreContext &GetCurrentInstance() { return GetCurrentCoreContextInstance(); };
KThread *GetCurrentThread() const { return currentThread; }
KProcess *GetCurrentProcess() const { return currentProcess; }

10
mesosphere/include/mesosphere/interrupts/KInterruptSpinLock.hpp
View file

@ -53,9 +53,9 @@ class KInterruptSpinLock<true> : public KSpinLock {
bool try_lock()
{
flags = KInterruptMaskGuard::MaskInterrupts();
flags = MaskInterrupts();
if (!KSpinLock::try_lock()) {
KInterruptMaskGuard::RestoreInterrupts(flags);
RestoreInterrupts(flags);
return false;
}
return true;
@ -63,14 +63,14 @@ class KInterruptSpinLock<true> : public KSpinLock {
void lock()
{
flags = KInterruptMaskGuard::MaskInterrupts();
flags = MaskInterrupts();
KSpinLock::lock();
}
void unlock()
{
KSpinLock::unlock();
KInterruptMaskGuard::RestoreInterrupts(flags);
RestoreInterrupts(flags);
}
KInterruptSpinLock() = default;
@ -80,7 +80,7 @@ class KInterruptSpinLock<true> : public KSpinLock {
KInterruptSpinLock &operator=(KInterruptSpinLock &&) = delete;
private:
typename KInterruptMaskGuard::FlagsType flags = 0;
InterruptFlagsType flags = 0;
};
}