mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-07 20:30:32 -08:00
Code Issues Projects Releases Wiki Activity

Revert revision 2014-05-27T17:31:17Z!eliz@gnu.org, as it breaks debugging with GCC 3.x.

Browse source 
Revert last changes to GDB-visible symbols.
 src/lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): Delete macros.
 (ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Don't use them.
 (ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
 Delete macros.
This commit is contained in:
Eli Zaretskii 2014-05-31 16:24:45 +03:00
parent 3a73c34c47
commit 2bbda049fb
2 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2014-05-31 Eli Zaretskii <eliz@gnu.org>
Revert last changes to GDB-visible symbols.
* lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): Delete macros.
(ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Don't use them.
(ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
Delete macros.
2014-05-31 Glenn Morris <rgm@gnu.org>
* cmds.c (Fself_insert_command): Allow zero repeat count. (Bug#17649)

31
src/lisp.h
View file

@ -36,21 +36,14 @@ INLINE_HEADER_BEGIN
/* Define a TYPE constant ID as an externally visible name. Use like this:
#define ID_val (some integer preprocessor expression)
#if ENUMABLE (ID_val)
DEFINE_GDB_SYMBOL_ENUM (ID)
#else
DEFINE_GDB_SYMBOL_BEGIN (TYPE, ID)
# define ID ID_val
#define ID something
DEFINE_GDB_SYMBOL_END (ID)
#endif
This hack is for the benefit of compilers that do not make macro
definitions visible to the debugger. It's used for symbols that
.gdbinit needs, symbols whose values may not fit in 'int' (where an
enum would suffice). */
#define ENUMABLE(val) (INT_MIN <= (val) && (val) <= INT_MAX)
#define DEFINE_GDB_SYMBOL_ENUM(id) enum { id = id##_val };
#if defined MAIN_PROGRAM
# define DEFINE_GDB_SYMBOL_BEGIN(type, id) type const id EXTERNALLY_VISIBLE
# define DEFINE_GDB_SYMBOL_END(id) = id;
@ -578,25 +571,15 @@ LISP_MACRO_DEFUN (XIL, Lisp_Object, (EMACS_INT i), (i))
/* In the size word of a vector, this bit means the vector has been marked. */
#define ARRAY_MARK_FLAG_val PTRDIFF_MIN
#if ENUMABLE (ARRAY_MARK_FLAG_val)
DEFINE_GDB_SYMBOL_ENUM (ARRAY_MARK_FLAG)
#else
DEFINE_GDB_SYMBOL_BEGIN (ptrdiff_t, ARRAY_MARK_FLAG)
# define ARRAY_MARK_FLAG ARRAY_MARK_FLAG_val
#define ARRAY_MARK_FLAG PTRDIFF_MIN
DEFINE_GDB_SYMBOL_END (ARRAY_MARK_FLAG)
#endif
/* In the size word of a struct Lisp_Vector, this bit means it's really
some other vector-like object. */
#define PSEUDOVECTOR_FLAG_val (PTRDIFF_MAX - PTRDIFF_MAX / 2)
#if ENUMABLE (PSEUDOVECTOR_FLAG_val)
DEFINE_GDB_SYMBOL_ENUM (PSEUDOVECTOR_FLAG)
#else
DEFINE_GDB_SYMBOL_BEGIN (ptrdiff_t, PSEUDOVECTOR_FLAG)
# define PSEUDOVECTOR_FLAG PSEUDOVECTOR_FLAG_val
#define PSEUDOVECTOR_FLAG (PTRDIFF_MAX - PTRDIFF_MAX / 2)
DEFINE_GDB_SYMBOL_END (PSEUDOVECTOR_FLAG)
#endif
/* In a pseudovector, the size field actually contains a word with one
PSEUDOVECTOR_FLAG bit set, and one of the following values extracted
@ -658,15 +641,9 @@ enum More_Lisp_Bits
XCONS (tem) is the struct Lisp_Cons * pointing to the memory for
that cons. */
/* Mask for the value (as opposed to the type bits) of a Lisp object. */
#define VALMASK_val (USE_LSB_TAG ? - (1 << GCTYPEBITS) : VAL_MAX)
#if ENUMABLE (VALMASK_val)
DEFINE_GDB_SYMBOL_ENUM (VALMASK)
#else
DEFINE_GDB_SYMBOL_BEGIN (EMACS_INT, VALMASK)
# define VALMASK VALMASK_val
#define VALMASK (USE_LSB_TAG ? - (1 << GCTYPEBITS) : VAL_MAX)
DEFINE_GDB_SYMBOL_END (VALMASK)
#endif
/* Largest and smallest representable fixnum values. These are the C
values. They are macros for use in static initializers. */