jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

take the one good idea from --os:standalone and enable it via -d:StandaloneHeapSize (#13077)

Browse source
This commit is contained in:
Andreas Rumpf 2020-01-09 11:48:37 +01:00 • committed by GitHub
commit 852170cc78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/system/mmdisp.nim
View file

@ -62,7 +62,7 @@ const
proc raiseOutOfMem() {.noinline.} = proc raiseOutOfMem() {.noinline.} =
if outOfMemHook != nil: outOfMemHook() if outOfMemHook != nil: outOfMemHook()
cstderr.rawWrite("out of memory") cstderr.rawWrite("out of memory\n")
quit(1) quit(1)
when defined(boehmgc): when defined(boehmgc):

14
lib/system/osalloc.nim
View file

@ -28,7 +28,7 @@ const doNotUnmap = not (defined(amd64) or defined(i386)) or
defined(windows) or defined(nimAllocNoUnmap) defined(windows) or defined(nimAllocNoUnmap)
when defined(emscripten): when defined(emscripten) and not defined(StandaloneHeapSize):
const const
PROT_READ = 1 # page can be read PROT_READ = 1 # page can be read
PROT_WRITE = 2 # page can be written PROT_WRITE = 2 # page can be written
@ -77,10 +77,10 @@ when defined(emscripten):
var mmapDescr = cast[EmscriptenMMapBlock](mmapDescrPos) var mmapDescr = cast[EmscriptenMMapBlock](mmapDescrPos)
munmap(mmapDescr.realPointer, mmapDescr.realSize) munmap(mmapDescr.realPointer, mmapDescr.realSize)
elif defined(genode): elif defined(genode) and not defined(StandaloneHeapSize):
include genode/alloc # osAllocPages, osTryAllocPages, osDeallocPages include genode/alloc # osAllocPages, osTryAllocPages, osDeallocPages
elif defined(nintendoswitch): elif defined(nintendoswitch) and not defined(StandaloneHeapSize):
import nintendoswitch/switch_memory import nintendoswitch/switch_memory
@ -191,7 +191,7 @@ elif defined(nintendoswitch):
when reallyOsDealloc: when reallyOsDealloc:
freeMem(p) freeMem(p)
elif defined(posix): elif defined(posix) and not defined(StandaloneHeapSize):
const const
PROT_READ = 1 # page can be read PROT_READ = 1 # page can be read
PROT_WRITE = 2 # page can be written PROT_WRITE = 2 # page can be written
@ -234,7 +234,7 @@ elif defined(posix):
proc osDeallocPages(p: pointer, size: int) {.inline.} = proc osDeallocPages(p: pointer, size: int) {.inline.} =
when reallyOsDealloc: discard munmap(p, cast[csize_t](size)) when reallyOsDealloc: discard munmap(p, cast[csize_t](size))
elif defined(windows): elif defined(windows) and not defined(StandaloneHeapSize):
const const
MEM_RESERVE = 0x2000 MEM_RESERVE = 0x2000
MEM_COMMIT = 0x1000 MEM_COMMIT = 0x1000
@ -274,10 +274,10 @@ elif defined(windows):
quit 1 quit 1
#VirtualFree(p, size, MEM_DECOMMIT) #VirtualFree(p, size, MEM_DECOMMIT)
elif hostOS == "standalone": elif hostOS == "standalone" or defined(StandaloneHeapSize):
const StandaloneHeapSize {.intdefine.}: int = 1024 * PageSize const StandaloneHeapSize {.intdefine.}: int = 1024 * PageSize
var var
theHeap: array[StandaloneHeapSize, float64] # 'float64' for alignment theHeap: array[StandaloneHeapSize div sizeof(float64), float64] # 'float64' for alignment
bumpPointer = cast[int](addr theHeap) bumpPointer = cast[int](addr theHeap)
proc osAllocPages(size: int): pointer {.inline.} = proc osAllocPages(size: int): pointer {.inline.} =