mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-17 10:06:13 +00:00
Code Issues Releases Activity

* eval.c (struct backtrace): Simplify and port the data structure.

Browse Source 
Do not assume that "int nargs : BITS_PER_INT - 2;" produces a
signed bit field, as this assumption is not portable and it makes
Emacs crash when compiled with Sun C 5.8 on sparc.  Do not use
"char debug_on_exit : 1" as this is not portable either; instead,
use the portable "unsigned int debug_on_exit : 1".  Remove unused
member evalargs.  Remove obsolete comments about cc bombing out.
This commit is contained in:
Paul Eggert 2011-06-30 22:12:00 -07:00
parent fb81de5fb5
commit bbc6b30467
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -1,3 +1,13 @@
2011-07-01 Paul Eggert <eggert@cs.ucla.edu>
* eval.c (struct backtrace): Simplify and port the data structure.
Do not assume that "int nargs : BITS_PER_INT - 2;" produces a
signed bit field, as this assumption is not portable and it makes
Emacs crash when compiled with Sun C 5.8 on sparc. Do not use
"char debug_on_exit : 1" as this is not portable either; instead,
use the portable "unsigned int debug_on_exit : 1". Remove unused
member evalargs. Remove obsolete comments about cc bombing out.
2011-06-30 Jan Djärv <jan.h.d@swipnet.se>
* xsettings.c: Include glib-object.h, gio/gio.h if HAVE_GSETTINGS.

23
src/eval.c
View File

@ -32,25 +32,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "xterm.h"
#endif
/* This definition is duplicated in alloc.c and keyboard.c. */
/* Putting it in lisp.h makes cc bomb out! */
struct backtrace
{
struct backtrace *next;
Lisp_Object *function;
Lisp_Object *args; /* Points to vector of args. */
#define NARGS_BITS (BITS_PER_INT - 2)
/* Let's not use size_t because we want to allow negative values (for
UNEVALLED). Also let's steal 2 bits so we save a word (or more for
alignment). In any case I doubt Emacs would survive a function call with
more than 500M arguments. */
int nargs : NARGS_BITS; /* Length of vector.
If nargs is UNEVALLED, args points
to slot holding list of unevalled args. */
char evalargs : 1;
ptrdiff_t nargs; /* Length of vector. */
/* Nonzero means call value of debugger when done with this operation. */
char debug_on_exit : 1;
unsigned int debug_on_exit : 1;
};
static struct backtrace *backtrace_list;
@ -2291,7 +2280,6 @@ eval_sub (Lisp_Object form)
backtrace.function = &original_fun; /* This also protects them from gc. */
backtrace.args = &original_args;
backtrace.nargs = UNEVALLED;
backtrace.evalargs = 1;
backtrace.debug_on_exit = 0;
if (debug_on_next_call)
@ -2325,10 +2313,7 @@ eval_sub (Lisp_Object form)
xsignal2 (Qwrong_number_of_arguments, original_fun, numargs);
else if (XSUBR (fun)->max_args == UNEVALLED)
{
backtrace.evalargs = 0;
val = (XSUBR (fun)->function.aUNEVALLED) (args_left);
}
val = (XSUBR (fun)->function.aUNEVALLED) (args_left);
else if (XSUBR (fun)->max_args == MANY)
{
/* Pass a vector of evaluated arguments. */
@ -2984,7 +2969,6 @@ usage: (funcall FUNCTION &rest ARGUMENTS) */)
backtrace.function = &args[0];
backtrace.args = &args[1];
backtrace.nargs = nargs - 1;
backtrace.evalargs = 0;
backtrace.debug_on_exit = 0;
if (debug_on_next_call)
@ -3141,7 +3125,6 @@ apply_lambda (Lisp_Object fun, Lisp_Object args)
backtrace_list->args = arg_vector;
backtrace_list->nargs = i;
backtrace_list->evalargs = 0;
tem = funcall_lambda (fun, numargs, arg_vector);
/* Do the debug-on-exit now, while arg_vector still exists. */