Skip to content

Commit 633d369

Browse files
committed
Use mach_task_self_ global instead
1 parent 22ec9d9 commit 633d369

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

base/runtime/virtual_memory_darwin.odin

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ VIRTUAL_MEMORY_SUPPORTED :: true
88
foreign import lib "system:System.framework"
99

1010
foreign lib {
11-
mach_task_self :: proc() -> u32 ---
11+
mach_task_self_: u32
1212
mach_vm_allocate :: proc(target: u32, address: ^u64, size: u64, flags: i32) -> i32 ---
1313
mach_vm_deallocate :: proc(target: u32, address: u64, size: u64) -> i32 ---
1414
mach_vm_map :: proc(
@@ -56,7 +56,7 @@ VM_INHERIT_COPY :: 1
5656

5757
_allocate_virtual_memory :: proc "contextless" (size: int) -> rawptr {
5858
address: u64
59-
result := mach_vm_map(mach_task_self(), &address, u64(size), 0, VM_FLAGS_ANYWHERE, MEMORY_OBJECT_NULL, 0, false, VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_COPY)
59+
result := mach_vm_map(mach_task_self_, &address, u64(size), 0, VM_FLAGS_ANYWHERE, MEMORY_OBJECT_NULL, 0, false, VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_COPY)
6060
if result != 0 {
6161
return nil
6262
}
@@ -76,7 +76,7 @@ _allocate_virtual_memory_superpage :: proc "contextless" () -> rawptr {
7676
}
7777
}
7878
alignment_mask: u64 = SUPERPAGE_SIZE - 1 // Assumes a power of two size, ensured by an assertion in `virtual_memory.odin`.
79-
result := mach_vm_map(mach_task_self(), &address, SUPERPAGE_SIZE, alignment_mask, flags, MEMORY_OBJECT_NULL, 0, false, VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_COPY)
79+
result := mach_vm_map(mach_task_self_, &address, SUPERPAGE_SIZE, alignment_mask, flags, MEMORY_OBJECT_NULL, 0, false, VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_COPY)
8080
if result != 0 {
8181
return nil
8282
}
@@ -87,15 +87,15 @@ _allocate_virtual_memory_superpage :: proc "contextless" () -> rawptr {
8787
_allocate_virtual_memory_aligned :: proc "contextless" (size: int, alignment: int) -> rawptr {
8888
address: u64
8989
alignment_mask: u64 = u64(alignment) - 1
90-
result := mach_vm_map(mach_task_self(), &address, u64(size), alignment_mask, VM_FLAGS_ANYWHERE, MEMORY_OBJECT_NULL, 0, false, VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_COPY)
90+
result := mach_vm_map(mach_task_self_, &address, u64(size), alignment_mask, VM_FLAGS_ANYWHERE, MEMORY_OBJECT_NULL, 0, false, VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_COPY)
9191
if result != 0 {
9292
return nil
9393
}
9494
return rawptr(uintptr(address))
9595
}
9696

9797
_free_virtual_memory :: proc "contextless" (ptr: rawptr, size: int) {
98-
mach_vm_deallocate(mach_task_self(), u64(uintptr(ptr)), u64(size))
98+
mach_vm_deallocate(mach_task_self_, u64(uintptr(ptr)), u64(size))
9999
}
100100

101101
_resize_virtual_memory :: proc "contextless" (ptr: rawptr, old_size: int, new_size: int, alignment: int) -> rawptr {
@@ -112,7 +112,7 @@ _resize_virtual_memory :: proc "contextless" (ptr: rawptr, old_size: int, new_si
112112
return ptr
113113
} else if new_size_pages > old_size_pages {
114114
new_address: u64
115-
result_alloc := mach_vm_allocate(mach_task_self(), &new_address, u64(new_size), VM_FLAGS_ANYWHERE)
115+
result_alloc := mach_vm_allocate(mach_task_self_, &new_address, u64(new_size), VM_FLAGS_ANYWHERE)
116116
if result_alloc != 0 {
117117
return nil
118118
}
@@ -123,16 +123,16 @@ _resize_virtual_memory :: proc "contextless" (ptr: rawptr, old_size: int, new_si
123123
}
124124

125125
cur_protection, max_protection: i32
126-
result_remap := mach_vm_remap(mach_task_self(), &new_address, u64(old_size), alignment_mask, VM_FLAGS_ANYWHERE, mach_task_self(), u64(uintptr(ptr)), true, &cur_protection, &max_protection, VM_INHERIT_COPY)
126+
result_remap := mach_vm_remap(mach_task_self_, &new_address, u64(old_size), alignment_mask, VM_FLAGS_ANYWHERE, mach_task_self_, u64(uintptr(ptr)), true, &cur_protection, &max_protection, VM_INHERIT_COPY)
127127
if result_remap != 0 {
128128
return nil
129129
}
130-
mach_vm_deallocate(mach_task_self(), u64(uintptr(ptr)), u64(old_size))
130+
mach_vm_deallocate(mach_task_self_, u64(uintptr(ptr)), u64(old_size))
131131
return rawptr(uintptr(new_address))
132132
} else {
133133
new_size_boundary := new_size_pages * PAGE_SIZE
134134
shrink_by := u64(old_size - new_size)
135-
mach_vm_deallocate(mach_task_self(), u64(uintptr(ptr) + uintptr(new_size_boundary)), shrink_by)
135+
mach_vm_deallocate(mach_task_self_, u64(uintptr(ptr) + uintptr(new_size_boundary)), shrink_by)
136136
return rawptr(uintptr(ptr))
137137
}
138138
}

0 commit comments

Comments
 (0)