diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2022-05-26 09:33:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-26 09:33:42 +0100 |
| commit | 337780497df7ff9dfae2cc4936db294ce4047c54 (patch) | |
| tree | c76757edb5bc97b44a317233242c11c0261e8d5e | |
| parent | d8e77cd738844b172d1741b1b1d3d4376efd17b5 (diff) | |
| parent | 10deb2e88b007504423f962942872e76c305553a (diff) | |
Merge pull request #1806 from jasonKercher/virtual_linux_fix
fix mmap call in virtual_linux.odin
| -rw-r--r-- | core/mem/virtual/virtual_linux.odin | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/mem/virtual/virtual_linux.odin b/core/mem/virtual/virtual_linux.odin index 6ae926e47..2f6fbdd01 100644 --- a/core/mem/virtual/virtual_linux.odin +++ b/core/mem/virtual/virtual_linux.odin @@ -37,9 +37,9 @@ MADV_WIPEONFORK :: 18 MADV_KEEPONFORK :: 19 MADV_HWPOISON :: 100 -mmap :: proc "contextless" (addr: rawptr, length: uint, prot: c.int, flags: c.int, fd: c.int, offset: uintptr) -> rawptr { +mmap :: proc "contextless" (addr: rawptr, length: uint, prot: c.int, flags: c.int, fd: c.int, offset: uintptr) -> int { res := intrinsics.syscall(unix.SYS_mmap, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), offset) - return rawptr(res) + return int(res) } munmap :: proc "contextless" (addr: rawptr, length: uint) -> c.int { @@ -59,12 +59,11 @@ madvise :: proc "contextless" (addr: rawptr, length: uint, advice: c.int) -> c.i _reserve :: proc "contextless" (size: uint) -> (data: []byte, err: Allocator_Error) { - MAP_FAILED := rawptr(~uintptr(0)) result := mmap(nil, size, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) - if result == MAP_FAILED { + if result < 0 && result > -4096 { return nil, .Out_Of_Memory } - return ([^]byte)(result)[:size], nil + return ([^]byte)(uintptr(result))[:size], nil } _commit :: proc "contextless" (data: rawptr, size: uint) -> Allocator_Error { |