This is an archive of the discontinued LLVM Phabricator instance.

[scudo/standalone] Use zx_system_get_page_size() on Fuchsia
ClosedPublic

Authored by mcgrathr on Feb 2 2021, 9:02 PM.

Reviewers

cryptoad
hctim

Commits

Summary

Fuchsia is migrating to a variable page size.

mcgrathr requested review of this revision.Feb 2 2021, 9:02 PM

mcgrathr created this revision.

Herald added a subscriber: Restricted Project. · View Herald Transcript

This revision is now accepted and ready to land.Feb 2 2021, 9:18 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

compiler-rt/

lib/

scudo/

standalone/

3 lines

	Show All 9 Lines

	#if SCUDO_FUCHSIA			#if SCUDO_FUCHSIA

	#include "common.h"			#include "common.h"
	#include "mutex.h"			#include "mutex.h"
	#include "string_utils.h"			#include "string_utils.h"

	#include <lib/sync/mutex.h> // for sync_mutex_t			#include <lib/sync/mutex.h> // for sync_mutex_t
	#include <limits.h> // for PAGE_SIZE
	#include <stdlib.h> // for getenv()			#include <stdlib.h> // for getenv()
	#include <zircon/compiler.h>			#include <zircon/compiler.h>
	#include <zircon/sanitizer.h>			#include <zircon/sanitizer.h>
	#include <zircon/syscalls.h>			#include <zircon/syscalls.h>

	namespace scudo {			namespace scudo {

	uptr getPageSize() { return PAGE_SIZE; }			uptr getPageSize() { return _zx_system_get_page_size(); }

	void NORETURN die() { __builtin_trap(); }			void NORETURN die() { __builtin_trap(); }

	// We zero-initialize the Extra parameter of map(), make sure this is consistent			// We zero-initialize the Extra parameter of map(), make sure this is consistent
	// with ZX_HANDLE_INVALID.			// with ZX_HANDLE_INVALID.
	static_assert(ZX_HANDLE_INVALID == 0, "");			static_assert(ZX_HANDLE_INVALID == 0, "");

	static void allocateVmar(uptr Size, MapPlatformData Data, bool AllowNoMem) {			static void allocateVmar(uptr Size, MapPlatformData Data, bool AllowNoMem) {
	▲ Show 20 Lines • Show All 157 Lines • Show Last 20 Lines