yuzu/libadrenotools
1
0
Fork 0
mirror of https://github.com/bylaws/libadrenotools synced 2024-11-21 14:29:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

bcenabler.cpp: Replace PAGE_SIZE with getpagesize()

Browse source 
Android 15 will allow OEMs to ship arm64-v8a devices with 16KiB page sizes. Devices that use this configuration will not be able to run existing apps that use native code. To be compatible with these devices, applications will need to rebuild all their native code to be 16KiB aligned, and rewrite any code which assumes a specific page size.

This change should allow for page size to be calculated dynamically to support these new devices.
This commit is contained in:
Reg Tiangha 2024-09-07 15:07:08 -06:00 committed by Billy Laws
parent 5deac9f1ab
commit c9d613fe3d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/bcenabler.cpp
View file

@ -5,6 +5,7 @@
#include <string> #include <string>
#include <cstring> #include <cstring>
#include <sys/mman.h> #include <sys/mman.h>
#include <unistd.h>
#include <adrenotools/bcenabler.h> #include <adrenotools/bcenabler.h>
#include "gen/bcenabler_patch.h" #include "gen/bcenabler_patch.h"
@ -38,7 +39,7 @@ static void *find_free_page(uintptr_t address) {
} }
static void *align_ptr(void *ptr) { static void *align_ptr(void *ptr) {
return reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(ptr) & ~(PAGE_SIZE - 1)); return reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(ptr) & ~(getpagesize() - 1));
} }
bool adrenotools_patch_bcn(void *vkGetPhysicalDeviceFormatPropertiesFn) { bool adrenotools_patch_bcn(void *vkGetPhysicalDeviceFormatPropertiesFn) {
@ -58,13 +59,13 @@ bool adrenotools_patch_bcn(void *vkGetPhysicalDeviceFormatPropertiesFn) {
return false; return false;
// Map patch region // Map patch region
void *ptr{mmap(patchPage, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, 0, 0)}; void *ptr{mmap(patchPage, getpagesize(), PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, 0, 0)};
if (ptr != patchPage) if (ptr != patchPage)
return false; return false;
// Allow reading from the blob's .text section since some devices enable ---X // Allow reading from the blob's .text section since some devices enable ---X
// Protect two pages just in case we happen to land on a page boundary // Protect two pages just in case we happen to land on a page boundary
if (mprotect(align_ptr(vkGetPhysicalDeviceFormatPropertiesFn), PAGE_SIZE * 2, PROT_WRITE | PROT_READ | PROT_EXEC)) if (mprotect(align_ptr(vkGetPhysicalDeviceFormatPropertiesFn), getpagesize() * 2, PROT_WRITE | PROT_READ | PROT_EXEC))
return false; return false;
// First branch in this function is targeted at the function we want to patch // First branch in this function is targeted at the function we want to patch
@ -81,7 +82,7 @@ bool adrenotools_patch_bcn(void *vkGetPhysicalDeviceFormatPropertiesFn) {
// See mprotect call above // See mprotect call above
// This time we also set PROT_WRITE so we can write our patch to the page // This time we also set PROT_WRITE so we can write our patch to the page
if (mprotect(align_ptr(convFormatFn), PAGE_SIZE * 2, PROT_WRITE | PROT_READ | PROT_EXEC)) if (mprotect(align_ptr(convFormatFn), getpagesize() * 2, PROT_WRITE | PROT_READ | PROT_EXEC))
return false; return false;
// This would normally set the default result to 0 (error) in the format not found case // This would normally set the default result to 0 (error) in the format not found case
@ -93,7 +94,7 @@ bool adrenotools_patch_bcn(void *vkGetPhysicalDeviceFormatPropertiesFn) {
clearResultPtr++; clearResultPtr++;
// Ensure we don't write out of bounds // Ensure we don't write out of bounds
if (PatchRawData_size > PAGE_SIZE) if (PatchRawData_size > getpagesize())
return false; return false;
// Copy the patch function to our mapped page // Copy the patch function to our mapped page