This is an archive of the discontinued LLVM Phabricator instance.

[compiler-rt][Fuchsia] Replace _zx_vmar_allocate_old call
ClosedPublic

Authored by phosek on Jan 5 2019, 8:59 PM.

Reviewers

Commits

Summary

This is the deprecated legacy interface, replace it with the current
_zx_vmar_allocate one.

lgtm

This revision is now accepted and ready to land.Jan 5 2019, 9:01 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

compiler-rt/

lib/

sanitizer_common/

8 lines

	Show First 20 Lines • Show All 204 Lines • ▼ Show 20 Lines

	uptr ReservedAddressRange::Init(uptr init_size, const char *name,			uptr ReservedAddressRange::Init(uptr init_size, const char *name,
	uptr fixed_addr) {			uptr fixed_addr) {
	init_size = RoundUpTo(init_size, PAGE_SIZE);			init_size = RoundUpTo(init_size, PAGE_SIZE);
	DCHECK_EQ(os_handle_, ZX_HANDLE_INVALID);			DCHECK_EQ(os_handle_, ZX_HANDLE_INVALID);
	uintptr_t base;			uintptr_t base;
	zx_handle_t vmar;			zx_handle_t vmar;
	zx_status_t status =			zx_status_t status =
	_zx_vmar_allocate_old(_zx_vmar_root_self(), 0, init_size,			_zx_vmar_allocate(
	ZX_VM_FLAG_CAN_MAP_READ \| ZX_VM_FLAG_CAN_MAP_WRITE \|			_zx_vmar_root_self(),
	ZX_VM_FLAG_CAN_MAP_SPECIFIC,			ZX_VM_CAN_MAP_READ \| ZX_VM_CAN_MAP_WRITE \| ZX_VM_CAN_MAP_SPECIFIC,
	&vmar, &base);			0, init_size, &vmar, &base);
	if (status != ZX_OK)			if (status != ZX_OK)
	ReportMmapFailureAndDie(init_size, name, "zx_vmar_allocate", status);			ReportMmapFailureAndDie(init_size, name, "zx_vmar_allocate", status);
	base_ = reinterpret_cast<void *>(base);			base_ = reinterpret_cast<void *>(base);
	size_ = init_size;			size_ = init_size;
	name_ = name;			name_ = name;
	os_handle_ = vmar;			os_handle_ = vmar;

	return reinterpret_cast<uptr>(base_);			return reinterpret_cast<uptr>(base_);
	▲ Show 20 Lines • Show All 297 Lines • Show Last 20 Lines