* eval.c (CEVAL): Don't distinguish between short and long

[bpt/guile.git] / libguile / gc-segment.c

diff --git a/libguile/gc-segment.c b/libguile/gc-segment.c
index 2cdbef2..332624d 100644 (file)
--- a/libguile/gc-segment.c
+++ b/libguile/gc-segment.c
@@ -1,43 +1,19 @@
 /* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002 Free Software Foundation, Inc.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
 
 #include <assert.h> 
 #include <stdio.h>
@@ -152,6 +128,8 @@ scm_i_clear_segment_mark_space (scm_t_heap_segment *seg)
 }
 
 /*
+  Sweep cards from SEG until we've gather THRESHOLD cells
+  
   RETURN:
 
   Freelist. 
@@ -296,7 +274,7 @@ scm_i_insert_segment (scm_t_heap_segment * seg)
       highest_cell = SCM_MAX (highest_cell, seg->bounds[1]);
     }
 
-  
+
   {
     int i = 0;
     int j = 0;
@@ -304,6 +282,17 @@ scm_i_insert_segment (scm_t_heap_segment * seg)
     while (i < scm_i_heap_segment_table_size
           && scm_i_heap_segment_table[i]->bounds[0] <= seg->bounds[0])
       i++;
+
+    /*
+      We insert a new entry; if that happens to be before the
+      "current" segment of a freelist, we must move the freelist index
+      as well.
+    */
+    if (scm_i_master_freelist.heap_segment_idx >= i)
+      scm_i_master_freelist.heap_segment_idx ++;
+    if (scm_i_master_freelist2.heap_segment_idx >= i)
+      scm_i_master_freelist2.heap_segment_idx ++;
+
     for (j = scm_i_heap_segment_table_size; j > i; --j)
       scm_i_heap_segment_table[j] = scm_i_heap_segment_table[j - 1];
 
@@ -509,12 +498,15 @@ scm_i_get_new_heap_segment (scm_t_cell_type_statistics *freelist, policy_on_erro
   return -1;
 }
 
-
-
 void
-scm_i_make_initial_segment (size_t init_heap_size, scm_t_cell_type_statistics *freelist)
+scm_i_make_initial_segment (int init_heap_size, scm_t_cell_type_statistics *freelist)
 {
   scm_t_heap_segment * seg = scm_i_make_empty_heap_segment (freelist);
+
+  if (init_heap_size < 1)
+    {
+      init_heap_size =  SCM_DEFAULT_INIT_HEAP_SIZE_1;
+    }
  
   if (scm_i_initialize_heap_segment_data (seg, init_heap_size))
     {