procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bring back the changes to GDB-visible symbols, but only on AIX.

Browse source 
And only if it's not pre-4.2 GCC.
* lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): New macros.
(ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Use them.
(ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
New macros.
This commit is contained in:
Paul Eggert 2014-06-01 00:06:28 -07:00
parent 08c0f6266a
commit bba89481ee
2 changed files with 56 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ChangeLog
View file

@ -1,3 +1,12 @@
2014-06-01 Paul Eggert <eggert@cs.ucla.edu>
Bring back the changes to GDB-visible symbols, but only on AIX.
And only if it's not pre-4.2 GCC.
* lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): New macros.
(ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Use them.
(ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
New macros.
2014-05-31 Eli Zaretskii <eliz@gnu.org>
* fileio.c (Finsert_file_contents): Call prepare_to_modify_buffer

52
src/lisp.h
View file

@ -36,14 +36,40 @@ 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 something
# define ID ID_val
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). */
enum would suffice).
Some GCC versions before GCC 4.2 omit enums in debugging output;
see GCC bug 23336. So don't use enums with older GCC. */
#if !defined __GNUC__ || 4 < __GNUC__ + (2 <= __GNUC_MINOR__)
# define ENUMABLE(val) (INT_MIN <= (val) && (val) <= INT_MAX)
#else
# define ENUMABLE(val) 0
#endif
/* On AIX 7.1 ENUMABLE should return true when possible, otherwise the
linker can optimize the symbols away, making it harder to debug.
This was discovered only late in the release process, so to play it
safe for now, non-AIX platforms do not use enums for debugging symbols.
FIXME: remove this comment and the following four lines of code. */
#ifndef _AIX
# undef ENUMABLE
# define ENUMABLE(val) 0
#endif
#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;
@ -571,15 +597,25 @@ 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 PTRDIFF_MIN
# define ARRAY_MARK_FLAG ARRAY_MARK_FLAG_val
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 (PTRDIFF_MAX - PTRDIFF_MAX / 2)
# define PSEUDOVECTOR_FLAG PSEUDOVECTOR_FLAG_val
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
@ -641,9 +677,15 @@ 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 (USE_LSB_TAG ? - (1 << GCTYPEBITS) : VAL_MAX)
# define VALMASK VALMASK_val
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. */