Changeset 3671

Timestamp:

2005年04月09日 10時14分44秒 (4 years ago)

Author:

miyoshi

Message:

* lisp.h (struct Lisp_Cons): New member `gcmarkbit'. This is a
hack for portable dumper.
(XCAR): Sync up with Emacs CVS HEAD.
(XCDR): Ditto.
(SYMBOL_NAME): Ditto.

* alloc.c (CONS_MARKED_P): Refer to `gcmarkbit'. This is a hack
for portable dumper.
(CONS_MARK): Ditto.
(CONS_UNMARK): Ditto.
(Fcons): Initialize the allocated memory to clean up `gcmarkbit'.
(mark_object): Sync up with Emacs CVS HEAD.
(pdump_hash_value): Cast `obj' as 'unsigned long' not to be
negative.
(pdump_map_file): Don't use `VALMASK'.

* fileio.c (Fdo_auto_save): Sync up with Emacs CVS HEAD.

Files:

• branches/2.2/src/alloc.c (modified) (6 diffs)
• branches/2.2/src/fileio.c (modified) (1 diff)
• branches/2.2/src/lisp.h (modified) (3 diffs)

branches/2.2/src/alloc.c

@@ -2617 +2617 @@
-
-#define CONS_MARKED_P(fptr) \
-XMARKBIT ((fptr)->car)
+(fptr)->gcmarkbit
-
-#define CONS_MARK(fptr) \
-XMARK ((fptr)->car)
+(fptr)->gcmarkbit = 1
-
-#define CONS_UNMARK(fptr) \
-XUNMARK ((fptr)->car)
+(fptr)->gcmarkbit = 0
-
-/* Current cons_block.  */
@@ -2688 +2688 @@
-          new = (struct cons_block *) lisp_align_malloc (sizeof *new,
-                                                         MEM_TYPE_CONS);
+          bzero ((char *) new, sizeof (*new));
-          new->next = cons_block;
-          cons_block = new;
@@ -5142 +5143 @@
-
-#endif /* not GC_CHECK_MARKED_OBJECTS */
-
-  switch (SWITCH_ENUM_CAST (XGCTYPE (obj)))
-    {
-    case Lisp_Int:
-    case Lisp_Misc:
-    case Lisp_Float:
-    case Lisp_Vectorlike:
-    case Lisp_Symbol:
-    case Lisp_String:
-      break;
-      
-    case Lisp_Cons:
-      XUNMARK (obj);
-      break;
-    default:
-      XUNMARK (obj);
-      break;
-    }
-
-  switch (SWITCH_ENUM_CAST (XGCTYPE (obj)))
@@ -6279 +6262 @@
-pdump_hash_value (Lisp_Object obj)
-{
-
+unsigned 
-}
-
@@ -7524 +7507 @@
-#endif /* WINDOWSNT */
-
-(unsigned long)ret & ~VALMASK
-
-(unsigned long)ret & ~VALMASK
+XTYPE ((unsigned long) ret)
+
+XTYPE ((unsigned long) ret)
-        {
-#ifdef WINDOWSNT
@@ -7544 +7527 @@
-#endif
-      pdump_current_load_scheme = PDUMP_MALLOC;
-(unsigned long)ret & ~VALMASK
+XTYPE ((unsigned long) ret)
-        {
-          fprintf (stderr, "emacs: malloc returned high address\n");

branches/2.2/src/fileio.c

@@ -5649 +5649 @@
-             Also reset auto_saving to 0.  */
-          lispstream = Fcons (Qnil, Qnil);
-FASTINT (XCAR (lispstream)
-FASTINT (XCDR (lispstream)
+CARFASTINT (lispstream
+CDRFASTINT (lispstream
-        }
-      else

branches/2.2/src/lisp.h

@@ -617 +617 @@
-struct Lisp_Cons
-  {
+#ifdef MEADOW
+    /* Hack for portable dumper. This sholud be removed! */
+    unsigned gcmarkbit : 1;
+    int spacer : 15;
+#endif
+
-    /* Please do not use the names of these elements in code other
-       than the core lisp implementation.  Use XCAR and XCDR below.  */
@@ -642 +648 @@
-
-/* Use these from normal code.  */
-XCAR_AS_LVALUE(c
-XCDR_AS_LVALUE(c
+LISP_MAKE_RVALUE(XCAR_AS_LVALUE(c)
+LISP_MAKE_RVALUE(XCDR_AS_LVALUE(c)
-
-/* Use these to set the fields of a cons cell.
@@ -915 +921 @@
-/* Value is name of symbol.  */
-
-                       
-
+  
+LISP_MAKE_RVALUE 
-
-/* Value is non-zero if SYM is an interned symbol.  */