VERY experimental Nintendo Switch 2 emulator
C++
host_memory: move MAP_ALIGNED_SUPER attempt after de66cf5637ab
Jan Beichd4e85401354b
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cppindex 179f6ab118..4bfc64f2db 100644--- a/src/common/host_memory.cpp+++ b/src/common/host_memory.cpp@@ -408,6 +408,16 @@ static void* ChooseVirtualBase(size_t virtual_size) {#elsestatic void* ChooseVirtualBase(size_t virtual_size) {+#if defined(__FreeBSD__)+ void* virtual_base =+ mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE,+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_ALIGNED_SUPER, -1, 0);++ if (virtual_base != MAP_FAILED) {+ return virtual_base;+ }+#endif+return mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE,MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);}@@ -463,24 +473,12 @@ public:}// Virtual memory initialization-#if defined(__FreeBSD__)- virtual_base =- static_cast<u8*>(mmap(nullptr, virtual_size, PROT_NONE,- MAP_PRIVATE | MAP_ANONYMOUS | MAP_ALIGNED_SUPER, -1, 0));- if (virtual_base == MAP_FAILED) {- virtual_base = static_cast<u8*>(- mmap(nullptr, virtual_size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0));- if (virtual_base == MAP_FAILED) {- LOG_CRITICAL(HW_Memory, "mmap failed: {}", strerror(errno));- throw std::bad_alloc{};- }- }-#elsevirtual_base = virtual_map_base = static_cast<u8*>(ChooseVirtualBase(virtual_size));if (virtual_base == MAP_FAILED) {LOG_CRITICAL(HW_Memory, "mmap failed: {}", strerror(errno));throw std::bad_alloc{};}+#if defined(__linux__)madvise(virtual_base, virtual_size, MADV_HUGEPAGE);#endif