diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-26 19:24:28 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-26 19:24:58 -0700 |
| commit | 60d1b18734fff144f1608da6228d60e4bda7b24c (patch) | |
| tree | 9b917c91b7de84ba517dba738784e1f1600f9234 /src/frame.c | |
| parent | 259a643d7f7c56976ff794cbdba8f5c70c795091 (diff) | |
| download | emacs-60d1b18734fff144f1608da6228d60e4bda7b24c.tar.gz | |
Assume GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS
This removes the need for GCPRO1 etc. Suggested by Stefan Monnier in:
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00918.html
* doc/lispref/internals.texi (Writing Emacs Primitives):
* etc/NEWS:
Document the change.
* src/alloc.c (gcprolist, dump_zombies, MAX_ZOMBIES, zombies)
(nzombies, ngcs, avg_zombies, max_live, max_zombies, avg_live)
(Fgc_status, check_gcpros, relocatable_string_data_p, gc-precise):
* src/bytecode.c (mark_byte_stack) [BYTE_MARK_STACK]:
* src/eval.c (gcpro_level) [DEBUG_GCPRO]:
* src/lisp.h (struct handler.gcpro, struct gcpro, GC_MARK_STACK)
(GC_USE_GCPROS_AS_BEFORE, GC_MAKE_GCPROS_NOOPS)
(GC_MARK_STACK_CHECK_GCPROS, GC_USE_GCPROS_CHECK_ZOMBIES)
(BYTE_MARK_STACK, GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5, GCPRO6)
(GCPRO7, UNGCPRO, RETURN_UNGCPRO):
Remove. All uses removed. The code now assumes
GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS.
* src/bytecode.c (relocate_byte_stack):
Rename from unmark_byte_stack, since it now only relocates.
All callers changed.
* src/frame.c (make_frame): Add an IF_LINT to pacify GCC 5.2
with GCPROs removed.
* src/systime.h: Use EMACS_LISP_H as the canary instead of GCPRO1.
* test/automated/finalizer-tests.el (finalizer-basic)
(finalizer-circular-reference, finalizer-cross-reference)
(finalizer-error):
* test/automated/generator-tests.el (cps-test-iter-close-finalizer):
Remove tests, as they depend on gc-precise.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/src/frame.c b/src/frame.c index 20440489381..d3e478075c3 100644 --- a/src/frame.c +++ b/src/frame.c @@ -611,10 +611,10 @@ struct frame * make_frame (bool mini_p) { Lisp_Object frame; - register struct frame *f; - register struct window *rw, *mw; - register Lisp_Object root_window; - register Lisp_Object mini_window; + struct frame *f; + struct window *rw, *mw IF_LINT (= NULL); + Lisp_Object root_window; + Lisp_Object mini_window; f = allocate_frame (); XSETFRAME (frame, f); @@ -735,10 +735,10 @@ make_frame (bool mini_p) default (the global minibuffer). */ struct frame * -make_frame_without_minibuffer (register Lisp_Object mini_window, KBOARD *kb, Lisp_Object display) +make_frame_without_minibuffer (Lisp_Object mini_window, KBOARD *kb, + Lisp_Object display) { - register struct frame *f; - struct gcpro gcpro1; + struct frame *f; if (!NILP (mini_window)) CHECK_LIVE_WINDOW (mini_window); @@ -759,11 +759,9 @@ make_frame_without_minibuffer (register Lisp_Object mini_window, KBOARD *kb, Lis Lisp_Object frame_dummy; XSETFRAME (frame_dummy, f); - GCPRO1 (frame_dummy); /* If there's no minibuffer frame to use, create one. */ kset_default_minibuffer_frame (kb, call1 (intern ("make-initial-minibuffer-frame"), display)); - UNGCPRO; } mini_window @@ -1855,7 +1853,6 @@ and returns whatever that function returns. */) struct frame *f; Lisp_Object lispy_dummy; Lisp_Object x, y, retval; - struct gcpro gcpro1; f = SELECTED_FRAME (); x = y = Qnil; @@ -1881,10 +1878,9 @@ and returns whatever that function returns. */) } XSETFRAME (lispy_dummy, f); retval = Fcons (lispy_dummy, Fcons (x, y)); - GCPRO1 (retval); if (!NILP (Vmouse_position_function)) retval = call1 (Vmouse_position_function, retval); - RETURN_UNGCPRO (retval); + return retval; } DEFUN ("mouse-pixel-position", Fmouse_pixel_position, @@ -1901,7 +1897,6 @@ and nil for X and Y. */) struct frame *f; Lisp_Object lispy_dummy; Lisp_Object x, y, retval; - struct gcpro gcpro1; f = SELECTED_FRAME (); x = y = Qnil; @@ -1919,10 +1914,9 @@ and nil for X and Y. */) XSETFRAME (lispy_dummy, f); retval = Fcons (lispy_dummy, Fcons (x, y)); - GCPRO1 (retval); if (!NILP (Vmouse_position_function)) retval = call1 (Vmouse_position_function, retval); - RETURN_UNGCPRO (retval); + return retval; } #ifdef HAVE_WINDOW_SYSTEM @@ -2510,13 +2504,11 @@ If FRAME is omitted or nil, return information on the currently selected frame. Lisp_Object alist; struct frame *f = decode_any_frame (frame); int height, width; - struct gcpro gcpro1; if (!FRAME_LIVE_P (f)) return Qnil; alist = Fcopy_alist (f->param_alist); - GCPRO1 (alist); if (!FRAME_WINDOW_P (f)) { @@ -2586,7 +2578,6 @@ If FRAME is omitted or nil, return information on the currently selected frame. store_in_alist (&alist, Qmenu_bar_lines, lines); } - UNGCPRO; return alist; } @@ -3135,8 +3126,6 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist) /* TAIL and ALIST are not used again below here. */ alist = tail = Qnil; - /* There is no need to gcpro LEFT, TOP, ICON_LEFT, or ICON_TOP, - because their values appear in VALUES and strings are not valid. */ top = left = Qunbound; icon_left = icon_top = Qunbound; |
