From b5cdb36a1de3bc4cacdc296b5348fc00e4766a85 Mon Sep 17 00:00:00 2001 From: Laura Peskin Date: Fri, 4 Nov 2022 11:53:06 -0700 Subject: sys/fuchsia: rename vmars.txt -> vmar.txt --- sys/fuchsia/vmar.txt | 16 ++++++++++++++++ sys/fuchsia/vmar_amd64.const | 12 ++++++++++++ sys/fuchsia/vmar_arm64.const | 12 ++++++++++++ sys/fuchsia/vmars.txt | 16 ---------------- sys/fuchsia/vmars_amd64.const | 12 ------------ sys/fuchsia/vmars_arm64.const | 12 ------------ 6 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 sys/fuchsia/vmar.txt create mode 100644 sys/fuchsia/vmar_amd64.const create mode 100644 sys/fuchsia/vmar_arm64.const delete mode 100644 sys/fuchsia/vmars.txt delete mode 100644 sys/fuchsia/vmars_amd64.const delete mode 100644 sys/fuchsia/vmars_arm64.const (limited to 'sys') diff --git a/sys/fuchsia/vmar.txt b/sys/fuchsia/vmar.txt new file mode 100644 index 000000000..ed986f900 --- /dev/null +++ b/sys/fuchsia/vmar.txt @@ -0,0 +1,16 @@ +# Copyright 2017 syzkaller project authors. All rights reserved. +# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. + +include + +resource zx_vmar[zx_handle] + +zx_vmar_allocate(parent_handle zx_vmar, options flags[vmar_allocate_options], offset intptr, size intptr, out ptr[out, zx_vmar], child_addr ptr[out, intptr]) +zx_vmar_map(handle zx_vmar, options flags[vmar_map_options], vmar_offset intptr, vmo zx_vmo, vmo_offset int64, len intptr, mapped_addr ptr[out, intptr]) +zx_vmar_unmap(handle zx_vmar, addr vma, len len[addr]) +zx_vmar_protect(handle zx_vmar, options flags[vmar_protect_options], addr vma, len len[addr]) +zx_vmar_destroy(handle zx_vmar) + +vmar_allocate_options = ZX_VM_FLAG_COMPACT, ZX_VM_FLAG_SPECIFIC, ZX_VM_FLAG_CAN_MAP_SPECIFIC, ZX_VM_FLAG_CAN_MAP_READ, ZX_VM_FLAG_CAN_MAP_WRITE, ZX_VM_FLAG_CAN_MAP_EXECUTE +vmar_map_options = ZX_VM_FLAG_SPECIFIC, ZX_VM_FLAG_SPECIFIC_OVERWRITE, ZX_VM_FLAG_PERM_READ, ZX_VM_FLAG_PERM_WRITE, ZX_VM_FLAG_PERM_EXECUTE, ZX_VM_FLAG_MAP_RANGE +vmar_protect_options = ZX_VM_FLAG_PERM_READ, ZX_VM_FLAG_PERM_WRITE, ZX_VM_FLAG_PERM_EXECUTE diff --git a/sys/fuchsia/vmar_amd64.const b/sys/fuchsia/vmar_amd64.const new file mode 100644 index 000000000..4d692a5f4 --- /dev/null +++ b/sys/fuchsia/vmar_amd64.const @@ -0,0 +1,12 @@ +# AUTOGENERATED FILE +ZX_VM_FLAG_CAN_MAP_EXECUTE = 512 +ZX_VM_FLAG_CAN_MAP_READ = 128 +ZX_VM_FLAG_CAN_MAP_SPECIFIC = 64 +ZX_VM_FLAG_CAN_MAP_WRITE = 256 +ZX_VM_FLAG_COMPACT = 8 +ZX_VM_FLAG_MAP_RANGE = 1024 +ZX_VM_FLAG_PERM_EXECUTE = 4 +ZX_VM_FLAG_PERM_READ = 1 +ZX_VM_FLAG_PERM_WRITE = 2 +ZX_VM_FLAG_SPECIFIC = 16 +ZX_VM_FLAG_SPECIFIC_OVERWRITE = 32 diff --git a/sys/fuchsia/vmar_arm64.const b/sys/fuchsia/vmar_arm64.const new file mode 100644 index 000000000..4d692a5f4 --- /dev/null +++ b/sys/fuchsia/vmar_arm64.const @@ -0,0 +1,12 @@ +# AUTOGENERATED FILE +ZX_VM_FLAG_CAN_MAP_EXECUTE = 512 +ZX_VM_FLAG_CAN_MAP_READ = 128 +ZX_VM_FLAG_CAN_MAP_SPECIFIC = 64 +ZX_VM_FLAG_CAN_MAP_WRITE = 256 +ZX_VM_FLAG_COMPACT = 8 +ZX_VM_FLAG_MAP_RANGE = 1024 +ZX_VM_FLAG_PERM_EXECUTE = 4 +ZX_VM_FLAG_PERM_READ = 1 +ZX_VM_FLAG_PERM_WRITE = 2 +ZX_VM_FLAG_SPECIFIC = 16 +ZX_VM_FLAG_SPECIFIC_OVERWRITE = 32 diff --git a/sys/fuchsia/vmars.txt b/sys/fuchsia/vmars.txt deleted file mode 100644 index ed986f900..000000000 --- a/sys/fuchsia/vmars.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2017 syzkaller project authors. All rights reserved. -# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. - -include - -resource zx_vmar[zx_handle] - -zx_vmar_allocate(parent_handle zx_vmar, options flags[vmar_allocate_options], offset intptr, size intptr, out ptr[out, zx_vmar], child_addr ptr[out, intptr]) -zx_vmar_map(handle zx_vmar, options flags[vmar_map_options], vmar_offset intptr, vmo zx_vmo, vmo_offset int64, len intptr, mapped_addr ptr[out, intptr]) -zx_vmar_unmap(handle zx_vmar, addr vma, len len[addr]) -zx_vmar_protect(handle zx_vmar, options flags[vmar_protect_options], addr vma, len len[addr]) -zx_vmar_destroy(handle zx_vmar) - -vmar_allocate_options = ZX_VM_FLAG_COMPACT, ZX_VM_FLAG_SPECIFIC, ZX_VM_FLAG_CAN_MAP_SPECIFIC, ZX_VM_FLAG_CAN_MAP_READ, ZX_VM_FLAG_CAN_MAP_WRITE, ZX_VM_FLAG_CAN_MAP_EXECUTE -vmar_map_options = ZX_VM_FLAG_SPECIFIC, ZX_VM_FLAG_SPECIFIC_OVERWRITE, ZX_VM_FLAG_PERM_READ, ZX_VM_FLAG_PERM_WRITE, ZX_VM_FLAG_PERM_EXECUTE, ZX_VM_FLAG_MAP_RANGE -vmar_protect_options = ZX_VM_FLAG_PERM_READ, ZX_VM_FLAG_PERM_WRITE, ZX_VM_FLAG_PERM_EXECUTE diff --git a/sys/fuchsia/vmars_amd64.const b/sys/fuchsia/vmars_amd64.const deleted file mode 100644 index 4d692a5f4..000000000 --- a/sys/fuchsia/vmars_amd64.const +++ /dev/null @@ -1,12 +0,0 @@ -# AUTOGENERATED FILE -ZX_VM_FLAG_CAN_MAP_EXECUTE = 512 -ZX_VM_FLAG_CAN_MAP_READ = 128 -ZX_VM_FLAG_CAN_MAP_SPECIFIC = 64 -ZX_VM_FLAG_CAN_MAP_WRITE = 256 -ZX_VM_FLAG_COMPACT = 8 -ZX_VM_FLAG_MAP_RANGE = 1024 -ZX_VM_FLAG_PERM_EXECUTE = 4 -ZX_VM_FLAG_PERM_READ = 1 -ZX_VM_FLAG_PERM_WRITE = 2 -ZX_VM_FLAG_SPECIFIC = 16 -ZX_VM_FLAG_SPECIFIC_OVERWRITE = 32 diff --git a/sys/fuchsia/vmars_arm64.const b/sys/fuchsia/vmars_arm64.const deleted file mode 100644 index 4d692a5f4..000000000 --- a/sys/fuchsia/vmars_arm64.const +++ /dev/null @@ -1,12 +0,0 @@ -# AUTOGENERATED FILE -ZX_VM_FLAG_CAN_MAP_EXECUTE = 512 -ZX_VM_FLAG_CAN_MAP_READ = 128 -ZX_VM_FLAG_CAN_MAP_SPECIFIC = 64 -ZX_VM_FLAG_CAN_MAP_WRITE = 256 -ZX_VM_FLAG_COMPACT = 8 -ZX_VM_FLAG_MAP_RANGE = 1024 -ZX_VM_FLAG_PERM_EXECUTE = 4 -ZX_VM_FLAG_PERM_READ = 1 -ZX_VM_FLAG_PERM_WRITE = 2 -ZX_VM_FLAG_SPECIFIC = 16 -ZX_VM_FLAG_SPECIFIC_OVERWRITE = 32 -- cgit mrf-deployment