[Emacs-diffs] Changes to emacs/src/.gdbinit [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/.gdbinit
diff -c emacs/src/.gdbinit:1.54.6.2 emacs/src/.gdbinit:1.54.6.3
*** emacs/src/.gdbinit:1.54.6.2 Fri Apr 16 12:50:43 2004
--- emacs/src/.gdbinit  Mon Jun 28 07:29:04 2004
***************
*** 81,87 ****
  define xvectype
    xgetptr $
    set $size = ((struct Lisp_Vector *) $ptr)->size
!   output ($size & PVEC_FLAG) ? (enum pvec_type) ($size & PVEC_TYPE_MASK) : 
$size
    echo \n
  end
  document xvectype
--- 81,87 ----
  define xvectype
    xgetptr $
    set $size = ((struct Lisp_Vector *) $ptr)->size
!   output ($size & PVEC_FLAG) ? (enum pvec_type) ($size & PVEC_TYPE_MASK) : 
$size & ~gdb_array_mark_flag
    echo \n
  end
  document xvectype
***************
*** 186,194 ****
  end
  
  define xsymbol
!   xgetptr $
    print (struct Lisp_Symbol *) $ptr
!   xprintsym $
    echo \n
  end
  document xsymbol
--- 186,195 ----
  end
  
  define xsymbol
!   set $sym = $
!   xgetptr $sym
    print (struct Lisp_Symbol *) $ptr
!   xprintsym $sym
    echo \n
  end
  document xsymbol
***************
*** 199,205 ****
  define xstring
    xgetptr $
    print (struct Lisp_String *) $ptr
!   output ($->size > 1000) ? 0 : ($->data[0])@($->size_byte < 0 ? $->size : 
$->size_byte)
    echo \n
  end
  document xstring
--- 200,206 ----
  define xstring
    xgetptr $
    print (struct Lisp_String *) $ptr
!   xprintstr $
    echo \n
  end
  document xstring
***************
*** 210,216 ****
  define xvector
    xgetptr $
    print (struct Lisp_Vector *) $ptr
!   output ($->size > 50) ? 0 : ($->contents[0])@($->size)
  echo \n
  end
  document xvector
--- 211,217 ----
  define xvector
    xgetptr $
    print (struct Lisp_Vector *) $ptr
!   output ($->size > 50) ? 0 : ($->contents[0])@($->size & 
~gdb_array_mark_flag)
  echo \n
  end
  document xvector
***************
*** 289,295 ****
  define xboolvector
    xgetptr $
    print (struct Lisp_Bool_Vector *) $ptr
!   output ($->size > 256) ? 0 : ($->data[0])@(($->size + 7)/ 8)
    echo \n
  end
  document xboolvector
--- 290,296 ----
  define xboolvector
    xgetptr $
    print (struct Lisp_Bool_Vector *) $ptr
!   output ($->size > 256) ? 0 : ($->data[0])@((($->size & 
~gdb_array_mark_flag) + 7)/ 8)
    echo \n
  end
  document xboolvector
***************
*** 372,383 ****
  Print $ as a scrollbar pointer.
  end
  
  define xprintsym
    xgetptr $arg0
    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)
  end
  document xprintsym
    Print argument as a symbol.
--- 373,389 ----
  Print $ as a scrollbar pointer.
  end
  
+ define xprintstr
+   set $data = $arg0->data
+   output ($arg0->size > 1000) ? 0 : ($data[0])@($arg0->size_byte < 0 ? 
$arg0->size & ~gdb_array_mark_flag : $arg0->size_byte)
+ end
+ 
  define xprintsym
    xgetptr $arg0
    set $sym = (struct Lisp_Symbol *) $ptr
    xgetptr $sym->xname
    set $sym_name = (struct Lisp_String *) $ptr
!   xprintstr $sym_name
  end
  document xprintsym
    Print argument as a symbol.
***************
*** 418,424 ****
        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
        else
          printf "Lisp type %d", $type
        end
--- 424,430 ----
        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 & ~gdb_array_mark_flag
        else
          printf "Lisp type %d", $type
        end