Changeset 3676

Timestamp:

04/10/05 17:51:25 (4 years ago)

Author:

miyoshi

Message:

* lisp.h (struct Lisp_Float): New member `gcmarkbit'. This is a
hack for portable dumper.

* alloc.c (FLOAT_BLOCK_SIZE): Undo the last change.
(GETMARKBIT): Removed.
(SETMARKBIT): Ditto.
(UNSETMARKBIT): Ditto.
(FLOAT_BLOCK): Ditto.
(FLOAT_INDEX): Ditto.
(struct float_block): Undo the last change.
(FLOAT_MARKED_P): Refer to `gcmarkbit'. This is a hack for
portable dumper.
(FLOAT_MARK): Ditto.
(FLOAT_UNMARK): Ditto.
(make_float): Initialize the allocated memory to clean up
`gcmarkbit'.
(PDUMP_BLOCK_HASH_SIZE): Removed.
(struct pdump_block): Removed.
(pdump_block_hash): Ditto.
(pdump_block_hash_value): Ditto.
(pdump_put_block_hash): Ditto.
(pdump_get_block_hash): Ditto.
(initialize_block_hash): Ditto.
(pdump_float_blocks_size): Ditto.
(pdump_register_object): Undo the last change.
(pdump_forward_object): Ditto.
(pdump_write_objects): Ditto.
(pdump): Ditto.
(PDUMP_RELOCATE): Ditto.
(pdump_load): Ditto.
(pdump_relocate_objects): Ditto.
(unmark_pdumped_objects): Ditto.

* fontset.c (lookup_overriding_fontspec): Invalidate for Meadow.

Files:

• branches/2.2/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.2/src/alloc.c (modified) (15 diffs)
• branches/2.2/src/fontset.c (modified) (2 diffs)
• branches/2.2/src/lisp.h (modified) (1 diff)

branches/2.2/src/ChangeLog.Meadow

@@ +1 @@
+2005-04-10  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * lisp.h (struct Lisp_Float): New member `gcmarkbit'.  This is a
+        hack for portable dumper.
+
+        * alloc.c (FLOAT_BLOCK_SIZE): Undo the last change.
+        (GETMARKBIT): Removed.
+        (SETMARKBIT): Ditto.
+        (UNSETMARKBIT): Ditto.
+        (FLOAT_BLOCK): Ditto.
+        (FLOAT_INDEX): Ditto.
+        (struct float_block): Undo the last change.
+        (FLOAT_MARKED_P): Refer to `gcmarkbit'.  This is a hack for
+        portable dumper.
+        (FLOAT_MARK): Ditto.
+        (FLOAT_UNMARK): Ditto.
+        (make_float): Initialize the allocated memory to clean up
+        `gcmarkbit'.
+        (PDUMP_BLOCK_HASH_SIZE): Removed.
+        (struct pdump_block): Removed.
+        (pdump_block_hash): Ditto.
+        (pdump_block_hash_value): Ditto.
+        (pdump_put_block_hash): Ditto.
+        (pdump_get_block_hash): Ditto.
+        (initialize_block_hash): Ditto.
+        (pdump_float_blocks_size): Ditto.
+        (pdump_register_object): Undo the last change.
+        (pdump_forward_object): Ditto.
+        (pdump_write_objects): Ditto.
+        (pdump): Ditto.
+        (PDUMP_RELOCATE): Ditto.
+        (pdump_load): Ditto.
+        (pdump_relocate_objects): Ditto.
+        (unmark_pdumped_objects): Ditto.
+
+        * fontset.c (lookup_overriding_fontspec): Invalidate for Meadow.
+
-2005-04-10  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.2/src/alloc.c

@@ -2473 +2473 @@
-   any new float cells from the latest float_block.  */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-struct float_block
@@ -2502 +2480 @@
-  /* Place `floats' at the beginning, to ease up FLOAT_INDEX's job.  */
-  struct Lisp_Float floats[FLOAT_BLOCK_SIZE];
-  int gcmarkbits[1 + FLOAT_BLOCK_SIZE / (sizeof(int) * CHAR_BIT)];
-  struct float_block *next;
-};
-
-#define FLOAT_MARKED_P(fptr) \
-GETMARKBIT (FLOAT_BLOCK (fptr), FLOAT_INDEX ((fptr))
+((fptr)->gcmarkbit
-
-#define FLOAT_MARK(fptr) \
-SETMARKBIT (FLOAT_BLOCK (fptr), FLOAT_INDEX ((fptr))
+((fptr)->gcmarkbit = 1
-
-#define FLOAT_UNMARK(fptr) \
-UNSETMARKBIT (FLOAT_BLOCK (fptr), FLOAT_INDEX ((fptr))
+((fptr)->gcmarkbit = 0
-
-/* Current float_block.  */
@@ -2578 +2555 @@
-          new = (struct float_block *) lisp_align_malloc (sizeof *new,
-                                                          MEM_TYPE_FLOAT);
+          bzero ((char *) new, sizeof (*new));
-          new->next = float_block;
-          bzero ((char *) new->gcmarkbits, sizeof new->gcmarkbits);
-          float_block = new;
-          float_block_index = 0;
@@ -6097 +6074 @@
-#define PDUMP_HASH_TABLE_SIZE 7 /* for Lisp_Hash_Table */
-#define PDUMP_OFFSET 12289
-#define PDUMP_BLOCK_HASH_SIZE 71
-
-static pdump_forward **pdump_hash;
@@ -6303 +6279 @@
-}
-
-/* Struct to hold a element of blocks in a hash table. */
-typedef struct pdump_block
-{
-  void *obj;
-  int block_index;
-  int element_index;
-  struct pdump_block *next;
-} pdump_block;
-
-static pdump_block **pdump_block_hash;
-
-/* calculate hash value for Lisp_Object */
-static int
-pdump_block_hash_value (void *obj)
-{
-  return ((unsigned long) obj >> 3) % PDUMP_BLOCK_HASH_SIZE;
-}
-
-/* put given Lisp_Object to pdump_block_hash */
-static void
-pdump_put_block_hash (void *obj, int block_index, int element_index)
-{
-  int idx = pdump_block_hash_value (obj);
-  pdump_block **prev = &pdump_block_hash[idx];
-  pdump_block *f = pdump_block_hash[idx];
-
-  while (f != 0)
-    {
-      if (f->obj == obj)
-        return;
-      prev = &(*prev)->next;
-      f = f->next;
-    }
-  f = (pdump_block *) xmalloc (sizeof (*f));
-  f->obj = obj;
-  f->block_index = block_index;
-  f->element_index = element_index;
-  f->next = NULL;
-  *prev = f;
-}
-
-/* retrieve pdump_forward entry of given Lisp_Object */
-static pdump_block *
-pdump_get_block_hash (void *obj)
-{
-  pdump_block *f = pdump_block_hash[pdump_block_hash_value (obj)];
-
-  while (f != 0)
-    {
-      if (f->obj == obj)
-        return f;
-      f = f->next;
-    }
-  return 0;
-}
-
-static void
-initialize_block_hash (void)
-{
-  struct float_block *p = float_block;
-  int n = float_block_index;
-  int i, j = 0;
-
-  while (p)
-    {
-      for (i = 0; i < n; i++)
-        {
-          pdump_put_block_hash ((void *) &p->floats[i], j, i);
-        }
-      p = p->next;
-      n = FLOAT_BLOCK_SIZE;
-      j++;
-    }
-}
-
-static unsigned long
-pdump_float_blocks_size (void)
-{
-  return sizeof (struct float_block) * n_float_blocks + sizeof (pdump_block);
-}
-
-/* Register given object for pdump_hash and pdump_lisp_object[type] */
-static void
@@ -6390 +6285 @@
-{
-  assert (pdump_get_hash (obj) == 0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -6805 +6683 @@
-
-  addr = f->offset + PDUMP_OFFSET + sizeof (pdump_header_type);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-  XSET (new_obj, XTYPE (obj), addr);
-  return new_obj;
@@ -6951 +6819 @@
-      fwrite (&new, size, 1, pdump_stream);
-    }
+  for (i = 0; i < pdump_lisp_object[PDUMP_FLOAT].index; i++)
+    {
+      Lisp_Object obj = pdump_lisp_object[PDUMP_FLOAT].objects[i];
+      int size = sizeof (struct Lisp_Float);
+      fwrite (XFLOAT (obj), size, 1, pdump_stream);
+    }
-  for (i = 0; i < pdump_lisp_object[PDUMP_HASH_TABLE].index; i ++)
-    {
@@ -7112 +6986 @@
-  bzero (pdump_hash_table, sizeof (*pdump_hash_table) * PDUMP_HASH_TABLE_SIZE);
-
-  pdump_block_hash = (pdump_block **)
-    xmalloc (sizeof (*pdump_block_hash) * PDUMP_BLOCK_HASH_SIZE);
-  bzero (pdump_block_hash, sizeof (*pdump_block_hash) * PDUMP_BLOCK_HASH_SIZE);
-  initialize_block_hash ();
-  
-  pdump_stream = fopen ("emacs.dmp", "w");
-
@@ -7167 +7036 @@
-                  header.hash_table_length, header.hash_table_size,
-                  header.vector_length, header.vector_size));
-
-  /* write float blocks */
-  {
-    struct float_block *p = float_block;
-    unsigned long offset = PDUMP_OFFSET + sizeof (pdump_header_type);
-    struct pdump_block_table bt;
-    
-    for (i = 0; i < PDUMP_OBJECT_LIMIT; i++)
-      offset += pdump_lisp_object[i].size;
-
-    bt.block = (struct float_block *) offset;
-    bt.block_index = float_block_index;
-    bt.n_blocks = n_float_blocks;
-    
-    while (p)
-      {
-        struct float_block fb = *p;
-
-        if (fb.next)
-          fb.next = (struct float_block *) (offset
-                                            + sizeof (struct float_block));
-        fwrite (&fb, sizeof (fb), 1, pdump_stream);
-        p = p->next;
-        offset += sizeof (struct float_block);
-      }
-    fwrite (&bt, sizeof (bt), 1, pdump_stream);
-  }
-
-  /* write misc */
@@ -7300 +7142 @@
-  xfree (pdump_hash);
-
-  for (i = 0; i < PDUMP_BLOCK_HASH_SIZE; i++)
-    {
-      pdump_block *f = pdump_block_hash[i], *next;
-
-      while (f != 0)
-        {
-          next = f->next;
-          xfree (f);
-          f = next;
-        }
-    }
-  xfree (pdump_block_hash);
-
-#ifdef PDUMP_DEBUG
-  assert (pure_bytes_used == 0);
@@ -7324 +7153 @@
-  if (! INTEGERP (obj)                                                  \
-      && pdump_objects_start <= p_r_ptr                                 \
-
-
+
-    XSET ((obj), XTYPE (obj), p_r_ptr);                                 \
-}                                                                       \
@@ -7591 +7419 @@
-  PDUMP_MESSAGE (("Loading root objects... \n"));
-  lseek (fd, pdump_header.objects_size + sizeof (pdump_header_type), SEEK_SET);
-
-  /* load float blocks */
-  {
-    struct float_block fb, *p;
-    struct pdump_block_table bt;
-    int count = 0;
-
-    do
-      {
-        read (fd, &fb, sizeof (fb));
-      }
-    while (fb.next);
-
-    read (fd, &bt, sizeof (bt));
-    float_block = (struct float_block * )((unsigned long) bt.block
-                                          + offset);
-    float_block_index = bt.block_index;
-    n_float_blocks = bt.n_blocks;
-
-    /* relocation */
-    p = float_block;
-    while (p)
-      {
-        if (p->next)
-          p->next = (struct float_block * ) ((unsigned long) p->next + offset);
-        p = p->next;
-      }
-  }
-
-  for (staticidx = 0; staticidx < pdump_header.root_objects_length; staticidx++)
-    {
@@ -7869 +7668 @@
-      obj_ptr += sizeof (struct Lisp_Symbol);
-    }
+  for (i = 0; i < pdump_header.float_length; i++)
+    obj_ptr += sizeof (struct Lisp_Float);
-  for (i = 0; i < pdump_header.hash_table_length; i ++)
-    obj_ptr += PDUMP_LISP_HASH_TABLE_SIZE;
@@ -7977 +7778 @@
-  assert (pdump_object_start_address (PDUMP_FLOAT) == obj_ptr);
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-#ifdef PDUMP_DEBUG
-  assert (pdump_object_start_address (PDUMP_HASH_TABLE) == obj_ptr);

branches/2.2/src/fontset.c

@@ -253 +253 @@
-
-
+#ifndef MEADOW
-static Lisp_Object
-lookup_overriding_fontspec (frame, c)
@@ -292 +293 @@
-  return Qnil;
-}
+#endif /* not MEADOW */
-
-#define FONTSET_REF_VIA_BASE(fontset, c) fontset_ref_via_base (fontset, &c)

branches/2.2/src/lisp.h

@@ -1271 +1271 @@
-struct Lisp_Float
-  {
+#ifdef MEADOW
+    /* Hack for portable dumper. This sholud be removed! */
+    unsigned gcmarkbit : 1;
+    int spacer : 15;
+#endif
-#ifdef HIDE_LISP_IMPLEMENTATION
-    double data_;