diff src/.gdbinit @ 83123:ad01ab3c6f4d

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-299 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-300 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-301 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-302 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-303 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-304 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-305 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-306 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-307 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-308 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-309 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-310 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-311 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-312 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-313 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-314 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-315 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-316 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-317 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-318 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-319 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-320 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-321 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-322 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-323 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-324 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-163

--- a/src/.gdbinit	Tue May 11 09:12:09 2004 +0000
+++ b/src/.gdbinit	Tue May 18 19:12:15 2004 +0000
@@ -81,7 +81,7 @@
 define xvectype
   xgetptr $
   set $size = ((struct Lisp_Vector *) $ptr)->size
-  output ($size & PVEC_FLAG) ? (enum pvec_type) ($size & PVEC_TYPE_MASK) : $size
+  output ($size & PVEC_FLAG) ? (enum pvec_type) ($size & PVEC_TYPE_MASK) : $size & ~gdb_array_mark_flag
   echo \n
 end
 document xvectype
@@ -199,7 +199,7 @@
 define xstring
   xgetptr $
   print (struct Lisp_String *) $ptr
-  output ($->size > 1000) ? 0 : ($->data[0])@($->size_byte < 0 ? $->size : $->size_byte)
+  output ($->size > 1000) ? 0 : ($->data[0])@($->size_byte < 0 ? $->size & ~gdb_array_mark_flag : $->size_byte)
   echo \n
 end
 document xstring
@@ -210,7 +210,7 @@
 define xvector
   xgetptr $
   print (struct Lisp_Vector *) $ptr
-  output ($->size > 50) ? 0 : ($->contents[0])@($->size)
+  output ($->size > 50) ? 0 : ($->contents[0])@($->size & ~gdb_array_mark_flag)
 echo \n
 end
 document xvector
@@ -289,7 +289,7 @@
 define xboolvector
   xgetptr $
   print (struct Lisp_Bool_Vector *) $ptr
-  output ($->size > 256) ? 0 : ($->data[0])@(($->size + 7)/ 8)
+  output ($->size > 256) ? 0 : ($->data[0])@((($->size & ~gdb_array_mark_flag) + 7)/ 8)
   echo \n
 end
 document xboolvector
@@ -377,7 +377,7 @@
   set $sym = (struct Lisp_Symbol *) $ptr
   xgetptr $sym->xname
   set $sym_name = (struct Lisp_String *) $ptr
-  output ($sym_name->data[0])@($sym_name->size_byte < 0 ? $sym_name->size : $sym_name->size_byte)
+  output ($sym_name->data[0])@($sym_name->size_byte < 0 ? $sym_name->size & ~gdb_array_mark_flag : $sym_name->size_byte)
 end
 document xprintsym
   Print argument as a symbol.
@@ -395,7 +395,7 @@
       if $type == Lisp_Vectorlike
 	xgetptr (*$bt->function)
         set $size = ((struct Lisp_Vector *) $ptr)->size
-        output ($size & PVEC_FLAG) ? (enum pvec_type) ($size & PVEC_TYPE_MASK) : $size
+        output ($size & PVEC_FLAG) ? (enum pvec_type) ($size & PVEC_TYPE_MASK) : $size & ~gdb_array_mark_flag
       else
         printf "Lisp type %d", $type
       end