(U-0002195D): Add `ideographic-structure'; add `sound@ja/on'; add

[chise/xemacs-chise.git.1] / src / ralloc.c

diff --git a/src/ralloc.c b/src/ralloc.c
index 9c9b798..17b2976 100644 (file)
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -103,7 +103,7 @@ static POINTER virtual_break_value;
 static POINTER break_value;
 
 /* This is the size of a page.  We round memory requests to this boundary.  */
-static int page_size;
+static size_t page_size;
 
 /* Whenever we get memory from the system, get this many extra bytes.  This
    must be a multiple of page_size.  */
@@ -254,7 +254,7 @@ obtain (POINTER address, size_t size)
     }
 
   if (! heap)
-    abort ();
+    ABORT ();
 
   /* If we can't fit SIZE bytes in that heap,
      try successive later heaps.  */
@@ -360,7 +360,7 @@ relinquish (void)
          /* This heap should have no blocs in it.  */
          if (last_heap->first_bloc != NIL_BLOC
              || last_heap->last_bloc != NIL_BLOC)
-           abort ();
+           ABORT ();
 
          /* Return the last heap, with its header, to the system.  */
          excess = (char *)last_heap->end - (char *)last_heap->start;
@@ -375,7 +375,7 @@ relinquish (void)
        }
 
       if ((*real_morecore) (- excess) == 0)
-       abort ();
+       ABORT ();
     }
 }
 
@@ -478,7 +478,7 @@ relocate_blocs (bloc_ptr bloc, heap_ptr heap, POINTER address)
 
   /* No need to ever call this if arena is frozen, bug somewhere!  */
   if (r_alloc_freeze_level)
-    abort();
+    ABORT();
 
   while (b)
     {
@@ -633,7 +633,7 @@ resize_bloc (bloc_ptr bloc, size_t size)
 
   /* No need to ever call this if arena is frozen, bug somewhere!  */
   if (r_alloc_freeze_level)
-    abort();
+    ABORT();
 
   if (bloc == NIL_BLOC || size == bloc->size)
     return 1;
@@ -645,7 +645,7 @@ resize_bloc (bloc_ptr bloc, size_t size)
     }
 
   if (heap == NIL_HEAP)
-    abort ();
+    ABORT ();
 
   old_size = bloc->size;
   bloc->size = size;
@@ -889,7 +889,7 @@ r_alloc_sbrk (ptrdiff_t size)
     }
   else /* size < 0 */
     {
-      size_t excess = (char *)first_heap->bloc_start
+      EMACS_INT excess = (char *)first_heap->bloc_start
                      - ((char *)virtual_break_value + size);
 
       address = virtual_break_value;
@@ -972,7 +972,7 @@ r_alloc_free (POINTER *ptr)
 
   dead_bloc = find_bloc (ptr);
   if (dead_bloc == NIL_BLOC)
-    abort ();
+    ABORT ();
 
   free_bloc (dead_bloc);
   *ptr = 0;
@@ -1015,7 +1015,7 @@ r_re_alloc (POINTER *ptr, size_t size)
 
   bloc = find_bloc (ptr);
   if (bloc == NIL_BLOC)
-    abort ();
+    ABORT ();
 
   if (size < bloc->size)
     {
@@ -1085,7 +1085,7 @@ r_alloc_thaw (void)
     init_ralloc ();
 
   if (--r_alloc_freeze_level < 0)
-    abort ();
+    ABORT ();
 
   /* This frees all unused blocs.  It is not too inefficient, as the resize
      and memmove is done only once.  Afterwards, all unreferenced blocs are
@@ -1129,7 +1129,7 @@ init_ralloc (void)
   first_heap->start = first_heap->bloc_start
     = virtual_break_value = break_value = (*real_morecore) (0);
   if (break_value == NIL)
-    abort ();
+    ABORT ();
 
   page_size = PAGE;
   extra_bytes = ROUNDUP (50000);
@@ -1319,7 +1319,7 @@ r_alloc_check (void)
 #include <stdio.h>
 
 typedef void *VM_ADDR;         /* VM addresses */
-static CONST VM_ADDR VM_FAILURE_ADDR = (VM_ADDR) -1; /* mmap returns this when it fails. */
+static const VM_ADDR VM_FAILURE_ADDR = (VM_ADDR) -1; /* mmap returns this when it fails. */
 
 /* Configuration for relocating allocator. */
 
@@ -1438,7 +1438,7 @@ typedef struct alloc_dll
 
 static MMAP_HANDLE mmap_start = 0; /* Head of linked list */
 static size_t page_size = 0;   /* Size of VM pages */
-static int mmap_hysteresis;    /* Should be size_t, really. */
+static Fixnum mmap_hysteresis; /* Logically a "size_t" */
 
 /* Get a new handle for a fresh block. */
 static MMAP_HANDLE
@@ -1726,7 +1726,7 @@ Addr_Block_initialize (void)
   addr_chain = (ADDRESS_CHAIN) UNDERLYING_MALLOC( sizeof( ADDRESS_BLOCK ));
   addr_chain->next = 0;                /* Last block in chain */
   addr_chain->sz = 0x0c000000; /* Size */
-  addr_chain->addr = (POINTER) (0x04000000 | DATA_SEG_BITS);
+  addr_chain->addr = (POINTER) (0x04000000);
   addr_chain->flag = empty;
 }
 
@@ -1805,13 +1805,13 @@ Free_Addr_Block (VM_ADDR addr, size_t sz)
     {
       if (p->addr == addr)
        {
-         if (p->sz != sz) abort(); /* ACK! Shouldn't happen at all. */
+         if (p->sz != sz) ABORT(); /* ACK! Shouldn't happen at all. */
          munmap( (VM_ADDR) p->addr, p->sz );
          p->flag = empty;
          break;
        }
     }
-  if (!p) abort(); /* Can't happen... we've got a block to free which is not in
+  if (!p) ABORT(); /* Can't happen... we've got a block to free which is not in
                      the address list. */
   Coalesce_Addr_Blocks();
 }
@@ -1857,7 +1857,7 @@ r_alloc (POINTER *ptr, size_t size)
   switch(r_alloc_initialized)
     {
     case 0:
-      abort();
+      ABORT();
     case 1:
       *ptr = (POINTER) UNDERLYING_MALLOC(size);
       break;
@@ -1898,7 +1898,7 @@ r_alloc_free (POINTER *ptr)
 {
   switch( r_alloc_initialized) {
     case 0:
-      abort();
+      ABORT();
 
     case 1:
       UNDERLYING_FREE( *ptr );         /* Certain this is from the heap. */
@@ -1940,7 +1940,7 @@ r_re_alloc (POINTER *ptr, size_t sz)
 {
   if (r_alloc_initialized == 0)
     {
-      abort ();
+      ABORT ();
       return 0; /* suppress compiler warning */
     }
   else if (r_alloc_initialized == 1)
@@ -2022,6 +2022,10 @@ init_ralloc (void)
   if (r_alloc_initialized > 1)
     return;    /* used to return 1 */
 
+#ifdef PDUMP
+  /* Under pdump, we need to activate ralloc on the first go. */
+  ++r_alloc_initialized;
+#endif
   if (++r_alloc_initialized == 1)
     return;    /* used to return 1 */