Browse Source

move nep definition outside of a header file

remotes/1785372757367212240/tmp_refs/heads/variable-page-size
Exverge 4 weeks ago
parent
commit
596719eed3
No known key found for this signature in database GPG Key ID: DAD399BCC5FB77E4
  1. 7
      src/core/hle/kernel/k_thread.cpp
  2. 11
      src/core/hle/kernel/k_thread.h

7
src/core/hle/kernel/k_thread.cpp

@ -21,6 +21,7 @@
#include "common/logging.h"
#include "common/settings.h"
#include "common/random.h"
#include "core/arm/nce/arm_nce.h"
#include "core/core.h"
#include "core/cpu_manager.h"
#include "core/hardware_properties.h"
@ -110,7 +111,11 @@ namespace Kernel {
} // namespace
KThread::KThread(KernelCore& kernel)
: KAutoObjectWithSlabHeapAndContainer{kernel}, m_activity_pause_lock{kernel} {}
: KAutoObjectWithSlabHeapAndContainer{kernel}, m_activity_pause_lock{kernel} {
#ifdef HAS_NCE
m_native_execution_parameters = std::make_unique<Core::NativeExecutionParameters>();
#endif
}
KThread::~KThread() = default;
Result KThread::Initialize(KernelCore& kernel, KThreadFunction func, uintptr_t arg, KProcessAddress user_stack_top,

11
src/core/hle/kernel/k_thread.h

@ -33,15 +33,12 @@
#include "core/hle/kernel/svc_types.h"
#include "core/hle/result.h"
#ifdef HAS_NCE
#include "core/arm/nce/arm_nce.h"
#endif
namespace Common {
class Fiber;
}
namespace Core {
struct NativeExecutionParameters;
namespace Memory {
class Memory;
}
@ -670,8 +667,8 @@ public:
}
#ifdef HAS_NCE
Core::NativeExecutionParameters& GetNativeExecutionParameters() {
return m_native_execution_parameters;
Core::NativeExecutionParameters& GetNativeExecutionParameters() const {
return *m_native_execution_parameters;
}
#endif
@ -932,7 +929,7 @@ private:
uintptr_t m_argument{};
KProcessAddress m_stack_top{};
#ifdef HAS_NCE
Core::NativeExecutionParameters m_native_execution_parameters{};
std::unique_ptr<Core::NativeExecutionParameters> m_native_execution_parameters;
#endif
public:

Loading…
Cancel
Save