Commit 3fe8bda5 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

Adapt to new Lisp_Object format.

(xvectype, xmisctype): New commands.
(xtype): Print the misc or vectorlike subtype too.
parent c11a94fe
......@@ -21,29 +21,51 @@ Specifically, this sets $data_seg_bits to the right thing.
end
define xtype
output (enum Lisp_Type) (($ >> 24) & 0x7f)
output (enum Lisp_Type) (($ >> 28) & 0x7)
echo \n
output ((($ >> 28) & 0x7) == Lisp_Misc ? (enum Lisp_Misc_Type) (((struct Lisp_Free *) (($ & 0x0fffffff) | $data_seg_bits))->type) : (($ >> 28) & 0x7) == Lisp_Vectorlike ? ($size = ((struct Lisp_Vector *) (($ & 0x0fffffff) | $data_seg_bits))->size, (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)) : 0)
echo \n
end
document xtype
Print the type of $, assuming it is an Emacs Lisp value.
If the first type printed is Lisp_Vector or Lisp_Misc,
the second line gives the more precise type.
Otherwise the second line doesn't mean anything.
end
define xvectype
set $size = ((struct Lisp_Vector *) (($ & 0x0fffffff) | $data_seg_bits))->size
output (enum pvec_type) (($size & PVEC_FLAG) ? $size & PVEC_TYPE_MASK : 0)
echo \n
end
document xvectype
Print the vector subtype of $, assuming it is a vector or pseudovector.
end
define xmisctype
output (enum Lisp_Misc_Type) (((struct Lisp_Free *) (($ & 0x0fffffff) | $data_seg_bits))->type)
echo \n
end
document xmisctype
Print the specific type of $, assuming it is some misc type.
end
define xint
print (($ & 0x00ffffff) << 8) >> 8
print (($ & 0x00ffffff) << 4) >> 4
end
document xint
Print $, assuming it is an Emacs Lisp integer. This gets the sign right.
end
define xptr
print (void *) (($ & 0x00ffffff) | $data_seg_bits)
print (void *) (($ & 0x0fffffff) | $data_seg_bits)
end
document xptr
Print the pointer portion of $, assuming it is an Emacs Lisp value.
end
define xwindow
print (struct window *) (($ & 0x00ffffff) | $data_seg_bits)
print (struct window *) (($ & 0x0fffffff) | $data_seg_bits)
printf "%dx%d+%d+%d\n", $->width, $->height, $->left, $->top
end
document xwindow
......@@ -52,15 +74,15 @@ Print the window's position as "WIDTHxHEIGHT+LEFT+TOP".
end
define xmarker
print (struct Lisp_Marker *) (($ & 0x00ffffff) | $data_seg_bits)
print (struct Lisp_Marker *) (($ & 0x0fffffff) | $data_seg_bits)
end
document xmarker
Print $ as a marker pointer, assuming it is an Emacs Lisp marker value.
end
define xbuffer
print (struct buffer *) (($ & 0x00ffffff) | $data_seg_bits)
output &((struct Lisp_String *) ((($->name) & 0x00ffffff) | $data_seg_bits))->data
print (struct buffer *) (($ & 0x0fffffff) | $data_seg_bits)
output &((struct Lisp_String *) ((($->name) & 0x0fffffff) | $data_seg_bits))->data
echo \n
end
document xbuffer
......@@ -69,7 +91,7 @@ Print the name of the buffer.
end
define xsymbol
print (struct Lisp_Symbol *) ((((int) $) & 0x00ffffff) | $data_seg_bits)
print (struct Lisp_Symbol *) ((((int) $) & 0x0fffffff) | $data_seg_bits)
output &$->name->data
echo \n
end
......@@ -79,7 +101,7 @@ This command assumes that $ is an Emacs Lisp symbol value.
end
define xstring
print (struct Lisp_String *) (($ & 0x00ffffff) | $data_seg_bits)
print (struct Lisp_String *) (($ & 0x0fffffff) | $data_seg_bits)
output ($->size > 1000) ? 0 : ($->data[0])@($->size)
echo \n
end
......@@ -89,7 +111,7 @@ This command assumes that $ is an Emacs Lisp string value.
end
define xvector
print (struct Lisp_Vector *) (($ & 0x00ffffff) | $data_seg_bits)
print (struct Lisp_Vector *) (($ & 0x0fffffff) | $data_seg_bits)
output ($->size > 50) ? 0 : ($->contents[0])@($->size)
echo \n
end
......@@ -99,14 +121,14 @@ This command assumes that $ is an Emacs Lisp vector value.
end
define xframe
print (struct frame *) (($ & 0x00ffffff) | $data_seg_bits)
print (struct frame *) (($ & 0x0fffffff) | $data_seg_bits)
end
document xframe
Print $ as a frame pointer, assuming it is an Emacs Lisp frame value.
end
define xcons
print (struct Lisp_Cons *) (($ & 0x00ffffff) | $data_seg_bits)
print (struct Lisp_Cons *) (($ & 0x0fffffff) | $data_seg_bits)
output *$
echo \n
end
......@@ -115,21 +137,21 @@ Print the contents of $, assuming it is an Emacs Lisp cons.
end
define xcar
print ((($ >> 24) & 0x7f) == Lisp_Cons ? ((struct Lisp_Cons *) (($ & 0x00ffffff) | $data_seg_bits))->car : 0)
print ((($ >> 24) & 0x7f) == Lisp_Cons ? ((struct Lisp_Cons *) (($ & 0x0fffffff) | $data_seg_bits))->car : 0)
end
document xcar
Print the car of $, assuming it is an Emacs Lisp pair.
end
define xcdr
print ((($ >> 24) & 0x7f) == Lisp_Cons ? ((struct Lisp_Cons *) (($ & 0x00ffffff) | $data_seg_bits))->cdr : 0)
print ((($ >> 24) & 0x7f) == Lisp_Cons ? ((struct Lisp_Cons *) (($ & 0x0fffffff) | $data_seg_bits))->cdr : 0)
end
document xcdr
Print the cdr of $, assuming it is an Emacs Lisp pair.
end
define xsubr
print (struct Lisp_Subr *) (($ & 0x00ffffff) | $data_seg_bits)
print (struct Lisp_Subr *) (($ & 0x0fffffff) | $data_seg_bits)
output *$
echo \n
end
......@@ -138,7 +160,7 @@ Print the address of the subr which the Lisp_Object $ points to.
end
define xprocess
print (struct Lisp_Process *) (($ & 0x00ffffff) | $data_seg_bits)
print (struct Lisp_Process *) (($ & 0x0fffffff) | $data_seg_bits)
output *$
echo \n
end
......@@ -147,14 +169,14 @@ Print the address of the struct Lisp_process which the Lisp_Object $ points to.
end
define xfloat
print ((struct Lisp_Float *) (($ & 0x00ffffff) | $data_seg_bits))->data
print ((struct Lisp_Float *) (($ & 0x0fffffff) | $data_seg_bits))->data
end
document xfloat
Print $ assuming it is a lisp floating-point number.
end
define xscrollbar
print (struct scrollbar *) (($ & 0x00ffffff) | $data_seg_bits)
print (struct scrollbar *) (($ & 0x0fffffff) | $data_seg_bits)
output *$
echo \n
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment