Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel/x86_64: use C++11 atomics in X86PagingMethod64Bit

Browse Source
This commit is contained in:
Paweł Dziepak 2014-05-30 00:23:49 +02:00
parent 91e7f347f9
commit fb010e297f
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/system/kernel/arch/x86/paging/64bit/X86PagingMethod64Bit.h
View File

@ -1,4 +1,5 @@
/* /*
* Copyright 2014, Paweł Dziepak, pdziepak@quarnos.org.
* Copyright 2012, Alex Smith, alex@alex-smith.me.uk. * Copyright 2012, Alex Smith, alex@alex-smith.me.uk.
* Copyright 2010, Ingo Weinhold, ingo_weinhold@gmx.de. * Copyright 2010, Ingo Weinhold, ingo_weinhold@gmx.de.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
@ -7,6 +8,8 @@
#define KERNEL_ARCH_X86_PAGING_64BIT_X86_PAGING_METHOD_64BIT_H #define KERNEL_ARCH_X86_PAGING_64BIT_X86_PAGING_METHOD_64BIT_H
#include <atomic>
#include <KernelExport.h> #include <KernelExport.h>
#include <lock.h> #include <lock.h>
@ -84,13 +87,15 @@ public:
uint64* entry, phys_addr_t physicalAddress, uint64* entry, phys_addr_t physicalAddress,
uint32 attributes, uint32 memoryType, uint32 attributes, uint32 memoryType,
bool globalPage); bool globalPage);
static uint64 SetTableEntry(uint64* entry, uint64 newEntry); static void SetTableEntry(uint64_t* entry,
static uint64 SetTableEntryFlags(uint64* entry, uint64 flags); uint64_t newEntry);
static uint64_t SetTableEntryFlags(uint64_t* entryPointer,
uint64_t flags);
static uint64 TestAndSetTableEntry(uint64* entry, static uint64 TestAndSetTableEntry(uint64* entry,
uint64 newEntry, uint64 oldEntry); uint64 newEntry, uint64 oldEntry);
static uint64 ClearTableEntry(uint64* entry); static uint64_t ClearTableEntry(uint64_t* entryPointer);
static uint64 ClearTableEntryFlags(uint64* entry, static uint64_t ClearTableEntryFlags(uint64_t* entryPointer,
uint64 flags); uint64_t flags);
static uint64 MemoryTypeToPageTableEntryFlags( static uint64 MemoryTypeToPageTableEntryFlags(
uint32 memoryType); uint32 memoryType);
@ -106,6 +111,10 @@ private:
}; };
static_assert(sizeof(std::atomic<uint64_t>) == sizeof(uint64_t),
"Non-trivial representation of atomic uint64_t.");
/*static*/ inline X86PagingMethod64Bit* /*static*/ inline X86PagingMethod64Bit*
X86PagingMethod64Bit::Method() X86PagingMethod64Bit::Method()
{ {
@ -113,39 +122,43 @@ X86PagingMethod64Bit::Method()
} }
/*static*/ inline uint64 /*static*/ inline void
X86PagingMethod64Bit::SetTableEntry(uint64* entry, uint64 newEntry) X86PagingMethod64Bit::SetTableEntry(uint64_t* entryPointer, uint64_t newEntry)
{ {
return atomic_get_and_set64((int64*)entry, newEntry); auto& entry = *reinterpret_cast<std::atomic<uint64_t>*>(entryPointer);
entry.store(newEntry, std::memory_order_relaxed);
}
/*static*/ inline uint64_t
X86PagingMethod64Bit::SetTableEntryFlags(uint64_t* entryPointer, uint64_t flags)
{
auto& entry = *reinterpret_cast<std::atomic<uint64_t>*>(entryPointer);
return entry.fetch_or(flags);
} }
/*static*/ inline uint64 /*static*/ inline uint64
X86PagingMethod64Bit::SetTableEntryFlags(uint64* entry, uint64 flags) X86PagingMethod64Bit::TestAndSetTableEntry(uint64* entry, uint64 newEntry, uint64 oldEntry)
{
return atomic_or64((int64*)entry, flags);
}
/*static*/ inline uint64
X86PagingMethod64Bit::TestAndSetTableEntry(uint64* entry, uint64 newEntry,
uint64 oldEntry)
{ {
return atomic_test_and_set64((int64*)entry, newEntry, oldEntry); return atomic_test_and_set64((int64*)entry, newEntry, oldEntry);
} }
/*static*/ inline uint64 /*static*/ inline uint64_t
X86PagingMethod64Bit::ClearTableEntry(uint64* entry) X86PagingMethod64Bit::ClearTableEntry(uint64_t* entryPointer)
{ {
return SetTableEntry(entry, 0); auto& entry = *reinterpret_cast<std::atomic<uint64_t>*>(entryPointer);
return entry.exchange(0);
} }
/*static*/ inline uint64 /*static*/ inline uint64_t
X86PagingMethod64Bit::ClearTableEntryFlags(uint64* entry, uint64 flags) X86PagingMethod64Bit::ClearTableEntryFlags(uint64_t* entryPointer,
uint64_t flags)
{ {
return atomic_and64((int64*)entry, ~flags); auto& entry = *reinterpret_cast<std::atomic<uint64_t>*>(entryPointer);
return entry.fetch_and(~flags);
} }