/* -----------------------------------------------------------------------------
- * $Id: Storage.c,v 1.60 2002/03/21 11:23:59 sebc Exp $
+ * $Id: Storage.c,v 1.66 2002/05/14 08:17:38 matthewc Exp $
*
* (c) The GHC Team, 1998-1999
*
#include "RetainerProfile.h" // for counting memory blocks (memInventory)
#ifdef darwin_TARGET_OS
-#include <mach/mach.h>
-#include <mach/task.h>
-#include <mach/message.h>
-#include <mach/vm_prot.h>
-#include <mach/vm_region.h>
#include <mach-o/getsect.h>
unsigned long macho_etext = 0;
unsigned long macho_edata = 0;
-#define IN_RANGE(base,size,x) (((P_)base) <= ((P_)x) && ((P_)x) < ((P_)((unsigned long)base + size)))
+
static void macosx_get_memory_layout(void)
{
- vm_address_t address;
- vm_size_t size;
- struct vm_region_basic_info info;
- mach_msg_type_number_t info_count;
- mach_port_t object_name;
- task_t task = mach_task_self();
- P_ in_text = ((P_*)(&stg_BLACKHOLE_info))[0];
- P_ in_data = (P_)&stg_dummy_ret_closure;
-
- address = 0; /* VM_MIN_ADDRESS */
- while (1) {
- info_count = VM_REGION_BASIC_INFO_COUNT;
- if (vm_region(task, &address, &size, VM_REGION_BASIC_INFO,
- (vm_region_info_t)&info, &info_count, &object_name)
- != KERN_SUCCESS)
- break;
- if (IN_RANGE(address, size, in_text))
- macho_etext = address + size;
- if (IN_RANGE(address, size, in_data))
- macho_edata = address + size;
- address += size;
- }
+ struct segment_command *seg;
+
+ seg = getsegbyname("__TEXT");
+ macho_etext = seg->vmaddr + seg->vmsize;
+ seg = getsegbyname("__DATA");
+ macho_edata = seg->vmaddr + seg->vmsize;
}
#endif
return allocate(n);
}
+ // we always return 8-byte aligned memory. bd->free must be
+ // 8-byte aligned to begin with, so we just round up n to
+ // the nearest multiple of 8 bytes.
+ if (sizeof(StgWord) == 4) {
+ n = (n+1) & ~1;
+ }
+
// If we don't have a block of pinned objects yet, or the current
// one isn't large enough to hold the new object, allocate a new one.
if (bd == NULL || (bd->free + n) > (bd->start + BLOCK_SIZE_W)) {
StgArrWords* arr;
nat data_size_in_words, total_size_in_words;
- /* should be a multiple of sizeof(StgWord) (whole no. of limbs) */
- ASSERT(size_in_bytes % sizeof(W_) == 0);
-
- data_size_in_words = size_in_bytes / sizeof(W_);
+ /* round up to a whole number of words */
+ data_size_in_words = (size_in_bytes + sizeof(W_) + 1) / sizeof(W_);
total_size_in_words = sizeofW(StgArrWords) + data_size_in_words;
/* allocate and fill it in. */