comparison src/unexmacosx.c @ 62280:5517682762f6

Include assert.h. (MACOSX_MALLOC_MULT16): New define. [MACOSX_MALLOC_MULT16] (ptr_in_unexec_regions): Determine whether ptr is in unexec regions by checking it is multiple of 16. (unexec_malloc_header_t): New typedef. (unexec_malloc, unexec_realloc, unexec_free): Store and use allocated size information in unexec_malloc_header.

62279:c3422068dcdc

#if defined (HAVE_MALLOC_MALLOC_H)
#include <malloc/malloc.h>
#else
#include <objc/malloc.h>
#endif


#define VERBOSE 1

/* Size of buffer used to copy data from the input file to the output

{
  emacs_zone = malloc_create_zone (0, 0);
  malloc_set_zone_name (emacs_zone, "EmacsZone");
}

int
ptr_in_unexec_regions (void *ptr)
{
  int i;

      return 1;

  return 0;
}

void *
unexec_malloc (size_t size)
{
  if (in_dumped_exec)
    return malloc (size);
  else
    return malloc_zone_malloc (emacs_zone, size);
}

void *
unexec_realloc (void *old_ptr, size_t new_size)
{
  if (in_dumped_exec)
    if (ptr_in_unexec_regions (old_ptr))
      {
	char *p = malloc (new_size);
	/* 2002-04-15 T. Ikegami <[e-mail]>.  The original
	   code to get size failed to reallocate read_buffer
	   (lread.c).  */
	int old_size = malloc_default_zone()->size (emacs_zone, old_ptr);
	int size = new_size > old_size ? old_size : new_size;

	if (size)
	  memcpy (p, old_ptr, size);
	return p;
      }
    else
      return realloc (old_ptr, new_size);
  else
    return malloc_zone_realloc (emacs_zone, old_ptr, new_size);
}

void
unexec_free (void *ptr)
{

    {
      if (!ptr_in_unexec_regions (ptr))
	free (ptr);
    }
  else
    malloc_zone_free (emacs_zone, ptr);
}

/* arch-tag: 1a784f7b-a184-4c4f-9544-da8619593d72
   (do not change this comment) */

62280:5517682762f6

#if defined (HAVE_MALLOC_MALLOC_H)
#include <malloc/malloc.h>
#else
#include <objc/malloc.h>
#endif

#include <assert.h>


#define VERBOSE 1

/* Size of buffer used to copy data from the input file to the output

{
  emacs_zone = malloc_create_zone (0, 0);
  malloc_set_zone_name (emacs_zone, "EmacsZone");
}

#ifndef MACOSX_MALLOC_MULT16
#define MACOSX_MALLOC_MULT16 1
#endif

typedef struct unexec_malloc_header {
  union {
    char c[8];
    size_t size;
  } u;
} unexec_malloc_header_t;

#if MACOSX_MALLOC_MULT16

#define ptr_in_unexec_regions(p) ((((vm_address_t) (p)) & 8) != 0)

#else

int
ptr_in_unexec_regions (void *ptr)
{
  int i;

      return 1;

  return 0;
}

#endif

void *
unexec_malloc (size_t size)
{
  if (in_dumped_exec)
    {
      void *p;

      p = malloc (size);
#if MACOSX_MALLOC_MULT16
      assert (((vm_address_t) p % 16) == 0);
#endif
      return p;
    }
  else
    {
      unexec_malloc_header_t *ptr;

      ptr = (unexec_malloc_header_t *)
	malloc_zone_malloc (emacs_zone, size + sizeof (unexec_malloc_header_t));
      ptr->u.size = size;
      ptr++;
#if MACOSX_MALLOC_MULT16
      assert (((vm_address_t) ptr % 16) == 8);
#endif
      return (void *) ptr;
    }
}

void *
unexec_realloc (void *old_ptr, size_t new_size)
{
  if (in_dumped_exec)
    {
      void *p;

      if (ptr_in_unexec_regions (old_ptr))
	{
	  p = (size_t *) malloc (new_size);
	  size_t old_size = ((unexec_malloc_header_t *) old_ptr)[-1].u.size;
	  size_t size = new_size > old_size ? old_size : new_size;

	  if (size)
	    memcpy (p, old_ptr, size);
	}
      else
	{
	  p = realloc (old_ptr, new_size);
	}
#if MACOSX_MALLOC_MULT16
      assert (((vm_address_t) p % 16) == 0);
#endif
      return p;
    }
  else
    {
      unexec_malloc_header_t *ptr;

      ptr = (unexec_malloc_header_t *)
	malloc_zone_realloc (emacs_zone, (unexec_malloc_header_t *) old_ptr - 1,
			     new_size + sizeof (unexec_malloc_header_t));
      ptr->u.size = new_size;
      ptr++;
#if MACOSX_MALLOC_MULT16
      assert (((vm_address_t) ptr % 16) == 8);
#endif
      return (void *) ptr;
    }
}

void
unexec_free (void *ptr)
{

    {
      if (!ptr_in_unexec_regions (ptr))
	free (ptr);
    }
  else
    malloc_zone_free (emacs_zone, (unexec_malloc_header_t *) ptr - 1);
}

/* arch-tag: 1a784f7b-a184-4c4f-9544-da8619593d72
   (do not change this comment) */