* ---------------------------------------------------------------------------*/
#include "Rts.h"
-#include "OSMem.h"
+#include "sm/OSMem.h"
#include "RtsUtils.h"
-#include "RtsMessages.h"
#if HAVE_WINDOWS_H
#include <windows.h>
alloc_rec* rec;
rec = (alloc_rec*)stgMallocBytes(sizeof(alloc_rec),"getMBlocks: allocNew");
rec->size = (n+1)*MBLOCK_SIZE;
- rec->base =
+ rec->base =
VirtualAlloc(NULL, rec->size, MEM_RESERVE, PAGE_READWRITE);
if(rec->base==0) {
stgFree((void*)rec);
"getMBlocks: VirtualAlloc MEM_RESERVE %d blocks failed", n);
}
} else {
- alloc_rec temp;
- temp.base=0; temp.size=0; temp.next=allocs;
+ alloc_rec temp;
+ temp.base=0; temp.size=0; temp.next=allocs;
alloc_rec* it;
it=&temp;
rec->next=it->next;
it->next=rec;
- allocs=temp.next;
+ allocs=temp.next;
}
return rec;
}
temp = VirtualAlloc(base, size_delta, MEM_COMMIT, PAGE_READWRITE);
if(temp==0) {
sysErrorBelch("getMBlocks: VirtualAlloc MEM_COMMIT failed");
- stg_exit(EXIT_FAILURE);
- }
+ stg_exit(EXIT_FAILURE);
+ }
size-=size_delta;
base+=size_delta;
}
alloc_rec* alloc;
alloc = allocNew(n);
/* We already belch in allocNew if it fails */
- if (alloc == 0) {
- stg_exit(EXIT_FAILURE);
- } else {
+ if (alloc == 0) {
+ stg_exit(EXIT_FAILURE);
+ } else {
insertFree(alloc->base, alloc->size);
ret = findFreeBlocks(n);
- }
+ }
}
if(ret!=0) {
return ret;
}
+void osFreeMBlocks(char *addr, nat n)
+{
+ alloc_rec *p;
+ lnat nBytes = (lnat)n * MBLOCK_SIZE;
+
+ insertFree(addr, nBytes);
+
+ p = allocs;
+ while ((p != NULL) && (addr >= (p->base + p->size))) {
+ p = p->next;
+ }
+ while (nBytes > 0) {
+ if ((p == NULL) || (p->base > addr)) {
+ errorBelch("Memory to be freed isn't allocated\n");
+ stg_exit(EXIT_FAILURE);
+ }
+ if (p->base + p->size >= addr + nBytes) {
+ if (!VirtualFree(addr, nBytes, MEM_DECOMMIT)) {
+ sysErrorBelch("osFreeMBlocks: VirtualFree MEM_DECOMMIT failed");
+ stg_exit(EXIT_FAILURE);
+ }
+ nBytes = 0;
+ }
+ else {
+ lnat bytesToFree = p->base + p->size - addr;
+ if (!VirtualFree(addr, bytesToFree, MEM_DECOMMIT)) {
+ sysErrorBelch("osFreeMBlocks: VirtualFree MEM_DECOMMIT failed");
+ stg_exit(EXIT_FAILURE);
+ }
+ addr += bytesToFree;
+ nBytes -= bytesToFree;
+ p = p->next;
+ }
+ }
+}
+
void
osFreeAllMBlocks(void)
{
for(; it!=0; ) {
if(!VirtualFree((void*)it->base, 0, MEM_RELEASE)) {
sysErrorBelch("freeAllMBlocks: VirtualFree MEM_RELEASE failed");
- stg_exit(EXIT_FAILURE);
+ stg_exit(EXIT_FAILURE);
}
next = it->next;
stgFree(it);
{
static lnat pagesize = 0;
if (pagesize) {
- return pagesize;
+ return pagesize;
} else {
- SYSTEM_INFO sSysInfo;
- GetSystemInfo(&sSysInfo);
- pagesize = sSysInfo.dwPageSize;
- return pagesize;
+ SYSTEM_INFO sSysInfo;
+ GetSystemInfo(&sSysInfo);
+ pagesize = sSysInfo.dwPageSize;
+ return pagesize;
}
}
void setExecutable (void *p, lnat len, rtsBool exec)
{
DWORD dwOldProtect = 0;
- if (VirtualProtect (p, len,
- exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE,
- &dwOldProtect) == 0)
+ if (VirtualProtect (p, len,
+ exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE,
+ &dwOldProtect) == 0)
{
- sysErrorBelch("makeExecutable: failed to protect 0x%p; old protection: %lu\n",
+ sysErrorBelch("setExecutable: failed to protect 0x%p; old protection: %lu\n",
p, (unsigned long)dwOldProtect);
stg_exit(EXIT_FAILURE);
}