comparison src/lisp.h @ 617:af57a77cbc92

[xemacs-hg @ 2001-06-18 07:09:50 by ben] --------------------------------------------------------------- DOCUMENTATION FIXES: --------------------------------------------------------------- eval.c: Correct documentation. elhash.c: Doc correction. --------------------------------------------------------------- LISP OBJECT CLEANUP: --------------------------------------------------------------- bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them) -- an expression to encapsulate a pointer into a Lisp object, rather than the inconvenient XSET*. "wrap" was chosen because "make" as in make_int(), make_char() is not appropriate. (It implies allocation. The issue does not exist for ints and chars because they are not allocated.) Full error checking has been added to these expressions. When used without error checking, non-union build, use of these expressions will incur no loss of efficiency. (In fact, XSET* is now defined in terms of wrap_* in a non-union build.) In a union build, you will also get no loss of efficiency provided that you have a decent optimizing compiler, and a compiler that either understands inlines or automatically inlines those particular functions. (And since people don't normally do their production builds on union, it doesn't matter.) Update the sample Lisp object definition in lrecord.h accordingly. dumper.c: Fix places in dumper that referenced wrap_object to reference its new name, wrap_pointer_1. buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h, just like for the other structures. -- Extract out the remaining (not copied into the window config) Lisp objects in `struct window' into winslots.h; use different macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them. -- Eliminate the `dead' flag of `struct frame', since it duplicates information already available in `framemeths', and fix FRAME_LIVE_P accordingly. (Devices and consoles already work this way.) -- In *slots.h, switch to system where MARKED_SLOT is automatically undef'd at the end of the file. (Follows what winslots.h already does.) -- Update the comments at the beginning of *slots.h to be accurate. -- When making any of the above objects dead, zero it out entirely and reset all Lisp object slots to Qnil. (We were already doing this somewhat, but not consistently.) This (1) Eliminates the possibility of extra objects hanging around that ought to be GC'd, (2) Causes an immediate crash if anyone tries to access a structure in one of these objects, (3) Ensures consistent behavior wrt dead objects. dialog-msw.c: Use internal_object_printer, since this object should not escape. --------------------------------------------------------------- FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR): --------------------------------------------------------------- eval.c: Fix up some comments about the FSF implementation. Fix two nasty bugs: (1) condition_case_unwind frees the conses sitting in the catch->tag slot too quickly, resulting in a crash that I hit. (2) catches need to be unwound one at a time when calling unwind-protect code, rather than all at once at the end; otherwise, incorrect behavior can result. (A comment shows exactly how.) backtrace.h: Improve comment about FSF differences in the handler stack. --------------------------------------------------------------- FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL UNDER MSWINDOWS: --------------------------------------------------------------- Basic idea: My crash is due either to a dead, non-marked, GC-collected frame inside of a window mirror, or a prematurely freed window mirror. We need to mark the Lisp objects inside of window mirrors. Tracking the lifespan of window mirrors and scrollbar instances is extremely hard, and there may well be lurking bugs where such objects are freed too soon. The only safe way to fix these problems (and it fixes both problems at once) is to make both of these structures Lisp objects. lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window mirrors in them. inline.c needs to know about scrollbar.h now. Record the new type in lrecord.h. Fix up scrollbar-*.c appropriately. Create a hash table in scrollbar-msw.c so that the scrollbar instances stored in scrollbar HWND's are properly GC-protected. Create complex_vars_of_scrollbar_mswindows() to create the hash table at startup, and call it from emacs.c. Don't store the scrollbar instance as a property of the GTK scrollbar, as it's not used and if we did this, we'd have to separately GC-protect it in a hash table, like in MS Windows. lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window mirrors actual Lisp objects. Tell lrecord.h about them. Change the window mirror member of struct frame from a pointer to a Lisp object, and add XWINDOW_MIRROR in appropriate places. Mark the scrollbar instances in the window mirror. redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark frame-specific structures in mark_frame. NOTE: I also deleted an extremely questionable call to update_frame_window_mirrors(). It was extremely questionable before, and now totally impossible, since it will create Lisp objects during redisplay. frame.c: Mark the scrollbar instances, which are now Lisp objects. Call mark_gutter() here, not in mark_redisplay(). gutter.c: Update comments about correct marking. --------------------------------------------------------------- ISSUES BROUGHT UP BY MARTIN: --------------------------------------------------------------- buffer.h: Put back these macros the way Steve T and I think they ought to be. I already explained in a previous changelog entry why I think these macros should be the way I'd defined them. Once again: We fix these macros so they don't care about the type of their lvalues. The non-C-string equivalents of these already function in the same way, and it's correct because it should be OK to pass in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *, etc. The whole reason for these different types is to work around errors caused by signed-vs-unsigned non-matching types. Any possible error that might be caught in a DFC macro would also be caught wherever the argument is used elsewhere. So creating multiple macro versions would add no useful error-checking and just further complicate an already complicated area. As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing clean and probably never will be. Unless the board agrees to change XEmacs in this way (and we really don't want to go down that road), this is not a bug. sound.h: Undo Martin's type change. signal.c: Fix problem identified by Martin with Linux and g++ due to non-standard declaration of setitimer(). systime.h: Update the docs for "qxe_" to point out why making the encapsulation explicit is always the right way to go. (setitimer() itself serves as an example.) For 21.4: update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get recompiled.
author ben
date Mon, 18 Jun 2001 07:10:32 +0000
parents 42bfaea76395
children b39c14581166
comparison
equal deleted inserted replaced
616:4f1c7a4ac1e6 617:af57a77cbc92
674 #endif 674 #endif
675 675
676 DECLARE_LRECORD (cons, Lisp_Cons); 676 DECLARE_LRECORD (cons, Lisp_Cons);
677 #define XCONS(x) XRECORD (x, cons, Lisp_Cons) 677 #define XCONS(x) XRECORD (x, cons, Lisp_Cons)
678 #define XSETCONS(x, p) XSETRECORD (x, p, cons) 678 #define XSETCONS(x, p) XSETRECORD (x, p, cons)
679 #define wrap_cons(p) wrap_record (p, cons)
679 #define CONSP(x) RECORDP (x, cons) 680 #define CONSP(x) RECORDP (x, cons)
680 #define CHECK_CONS(x) CHECK_RECORD (x, cons) 681 #define CHECK_CONS(x) CHECK_RECORD (x, cons)
681 #define CONCHECK_CONS(x) CONCHECK_RECORD (x, cons) 682 #define CONCHECK_CONS(x) CONCHECK_RECORD (x, cons)
682 683
683 #define CONS_MARKED_P(c) MARKED_RECORD_HEADER_P(&((c)->lheader)) 684 #define CONS_MARKED_P(c) MARKED_RECORD_HEADER_P(&((c)->lheader))
1161 typedef struct Lisp_String Lisp_String; 1162 typedef struct Lisp_String Lisp_String;
1162 1163
1163 DECLARE_LRECORD (string, Lisp_String); 1164 DECLARE_LRECORD (string, Lisp_String);
1164 #define XSTRING(x) XRECORD (x, string, Lisp_String) 1165 #define XSTRING(x) XRECORD (x, string, Lisp_String)
1165 #define XSETSTRING(x, p) XSETRECORD (x, p, string) 1166 #define XSETSTRING(x, p) XSETRECORD (x, p, string)
1167 #define wrap_string(p) wrap_record (p, string)
1166 #define STRINGP(x) RECORDP (x, string) 1168 #define STRINGP(x) RECORDP (x, string)
1167 #define CHECK_STRING(x) CHECK_RECORD (x, string) 1169 #define CHECK_STRING(x) CHECK_RECORD (x, string)
1168 #define CONCHECK_STRING(x) CONCHECK_RECORD (x, string) 1170 #define CONCHECK_STRING(x) CONCHECK_RECORD (x, string)
1169 1171
1170 #ifdef MULE 1172 #ifdef MULE
1252 typedef struct Lisp_Vector Lisp_Vector; 1254 typedef struct Lisp_Vector Lisp_Vector;
1253 1255
1254 DECLARE_LRECORD (vector, Lisp_Vector); 1256 DECLARE_LRECORD (vector, Lisp_Vector);
1255 #define XVECTOR(x) XRECORD (x, vector, Lisp_Vector) 1257 #define XVECTOR(x) XRECORD (x, vector, Lisp_Vector)
1256 #define XSETVECTOR(x, p) XSETRECORD (x, p, vector) 1258 #define XSETVECTOR(x, p) XSETRECORD (x, p, vector)
1259 #define wrap_vector(p) wrap_record (p, vector)
1257 #define VECTORP(x) RECORDP (x, vector) 1260 #define VECTORP(x) RECORDP (x, vector)
1258 #define CHECK_VECTOR(x) CHECK_RECORD (x, vector) 1261 #define CHECK_VECTOR(x) CHECK_RECORD (x, vector)
1259 #define CONCHECK_VECTOR(x) CONCHECK_RECORD (x, vector) 1262 #define CONCHECK_VECTOR(x) CONCHECK_RECORD (x, vector)
1260 1263
1261 #define vector_length(v) ((v)->size) 1264 #define vector_length(v) ((v)->size)
1290 typedef struct Lisp_Bit_Vector Lisp_Bit_Vector; 1293 typedef struct Lisp_Bit_Vector Lisp_Bit_Vector;
1291 1294
1292 DECLARE_LRECORD (bit_vector, Lisp_Bit_Vector); 1295 DECLARE_LRECORD (bit_vector, Lisp_Bit_Vector);
1293 #define XBIT_VECTOR(x) XRECORD (x, bit_vector, Lisp_Bit_Vector) 1296 #define XBIT_VECTOR(x) XRECORD (x, bit_vector, Lisp_Bit_Vector)
1294 #define XSETBIT_VECTOR(x, p) XSETRECORD (x, p, bit_vector) 1297 #define XSETBIT_VECTOR(x, p) XSETRECORD (x, p, bit_vector)
1298 #define wrap_bit_vector(p) wrap_record (p, bit_vector)
1295 #define BIT_VECTORP(x) RECORDP (x, bit_vector) 1299 #define BIT_VECTORP(x) RECORDP (x, bit_vector)
1296 #define CHECK_BIT_VECTOR(x) CHECK_RECORD (x, bit_vector) 1300 #define CHECK_BIT_VECTOR(x) CHECK_RECORD (x, bit_vector)
1297 #define CONCHECK_BIT_VECTOR(x) CONCHECK_RECORD (x, bit_vector) 1301 #define CONCHECK_BIT_VECTOR(x) CONCHECK_RECORD (x, bit_vector)
1298 1302
1299 #define BITP(x) (INTP (x) && (XINT (x) == 0 || XINT (x) == 1)) 1303 #define BITP(x) (INTP (x) && (XINT (x) == 0 || XINT (x) == 1))
1355 #define KEYWORDP(obj) (SYMBOLP (obj) && SYMBOL_IS_KEYWORD (obj)) 1359 #define KEYWORDP(obj) (SYMBOLP (obj) && SYMBOL_IS_KEYWORD (obj))
1356 1360
1357 DECLARE_LRECORD (symbol, Lisp_Symbol); 1361 DECLARE_LRECORD (symbol, Lisp_Symbol);
1358 #define XSYMBOL(x) XRECORD (x, symbol, Lisp_Symbol) 1362 #define XSYMBOL(x) XRECORD (x, symbol, Lisp_Symbol)
1359 #define XSETSYMBOL(x, p) XSETRECORD (x, p, symbol) 1363 #define XSETSYMBOL(x, p) XSETRECORD (x, p, symbol)
1364 #define wrap_symbol(p) wrap_record (p, symbol)
1360 #define SYMBOLP(x) RECORDP (x, symbol) 1365 #define SYMBOLP(x) RECORDP (x, symbol)
1361 #define CHECK_SYMBOL(x) CHECK_RECORD (x, symbol) 1366 #define CHECK_SYMBOL(x) CHECK_RECORD (x, symbol)
1362 #define CONCHECK_SYMBOL(x) CONCHECK_RECORD (x, symbol) 1367 #define CONCHECK_SYMBOL(x) CONCHECK_RECORD (x, symbol)
1363 1368
1364 #define symbol_next(s) ((s)->next) 1369 #define symbol_next(s) ((s)->next)
1384 typedef struct Lisp_Subr Lisp_Subr; 1389 typedef struct Lisp_Subr Lisp_Subr;
1385 1390
1386 DECLARE_LRECORD (subr, Lisp_Subr); 1391 DECLARE_LRECORD (subr, Lisp_Subr);
1387 #define XSUBR(x) XRECORD (x, subr, Lisp_Subr) 1392 #define XSUBR(x) XRECORD (x, subr, Lisp_Subr)
1388 #define XSETSUBR(x, p) XSETRECORD (x, p, subr) 1393 #define XSETSUBR(x, p) XSETRECORD (x, p, subr)
1394 #define wrap_subr(p) wrap_record (p, subr)
1389 #define SUBRP(x) RECORDP (x, subr) 1395 #define SUBRP(x) RECORDP (x, subr)
1390 #define CHECK_SUBR(x) CHECK_RECORD (x, subr) 1396 #define CHECK_SUBR(x) CHECK_RECORD (x, subr)
1391 #define CONCHECK_SUBR(x) CONCHECK_RECORD (x, subr) 1397 #define CONCHECK_SUBR(x) CONCHECK_RECORD (x, subr)
1392 1398
1393 #define subr_function(subr) ((subr)->subr_fn) 1399 #define subr_function(subr) ((subr)->subr_fn)
1410 }; 1416 };
1411 1417
1412 DECLARE_LRECORD (marker, Lisp_Marker); 1418 DECLARE_LRECORD (marker, Lisp_Marker);
1413 #define XMARKER(x) XRECORD (x, marker, Lisp_Marker) 1419 #define XMARKER(x) XRECORD (x, marker, Lisp_Marker)
1414 #define XSETMARKER(x, p) XSETRECORD (x, p, marker) 1420 #define XSETMARKER(x, p) XSETRECORD (x, p, marker)
1421 #define wrap_marker(p) wrap_record (p, marker)
1415 #define MARKERP(x) RECORDP (x, marker) 1422 #define MARKERP(x) RECORDP (x, marker)
1416 #define CHECK_MARKER(x) CHECK_RECORD (x, marker) 1423 #define CHECK_MARKER(x) CHECK_RECORD (x, marker)
1417 #define CONCHECK_MARKER(x) CONCHECK_RECORD (x, marker) 1424 #define CONCHECK_MARKER(x) CONCHECK_RECORD (x, marker)
1418 1425
1419 /* The second check was looking for GCed markers still in use */ 1426 /* The second check was looking for GCed markers still in use */
1463 typedef struct Lisp_Float Lisp_Float; 1470 typedef struct Lisp_Float Lisp_Float;
1464 1471
1465 DECLARE_LRECORD (float, Lisp_Float); 1472 DECLARE_LRECORD (float, Lisp_Float);
1466 #define XFLOAT(x) XRECORD (x, float, Lisp_Float) 1473 #define XFLOAT(x) XRECORD (x, float, Lisp_Float)
1467 #define XSETFLOAT(x, p) XSETRECORD (x, p, float) 1474 #define XSETFLOAT(x, p) XSETRECORD (x, p, float)
1475 #define wrap_float(p) wrap_record (p, float)
1468 #define FLOATP(x) RECORDP (x, float) 1476 #define FLOATP(x) RECORDP (x, float)
1469 #define CHECK_FLOAT(x) CHECK_RECORD (x, float) 1477 #define CHECK_FLOAT(x) CHECK_RECORD (x, float)
1470 #define CONCHECK_FLOAT(x) CONCHECK_RECORD (x, float) 1478 #define CONCHECK_FLOAT(x) CONCHECK_RECORD (x, float)
1471 1479
1472 #define float_data(f) ((f)->data.d) 1480 #define float_data(f) ((f)->data.d)
1662 }; 1670 };
1663 1671
1664 DECLARE_LRECORD (weak_list, struct weak_list); 1672 DECLARE_LRECORD (weak_list, struct weak_list);
1665 #define XWEAK_LIST(x) XRECORD (x, weak_list, struct weak_list) 1673 #define XWEAK_LIST(x) XRECORD (x, weak_list, struct weak_list)
1666 #define XSETWEAK_LIST(x, p) XSETRECORD (x, p, weak_list) 1674 #define XSETWEAK_LIST(x, p) XSETRECORD (x, p, weak_list)
1675 #define wrap_weak_list(p) wrap_record (p, weak_list)
1667 #define WEAK_LISTP(x) RECORDP (x, weak_list) 1676 #define WEAK_LISTP(x) RECORDP (x, weak_list)
1668 #define CHECK_WEAK_LIST(x) CHECK_RECORD (x, weak_list) 1677 #define CHECK_WEAK_LIST(x) CHECK_RECORD (x, weak_list)
1669 #define CONCHECK_WEAK_LIST(x) CONCHECK_RECORD (x, weak_list) 1678 #define CONCHECK_WEAK_LIST(x) CONCHECK_RECORD (x, weak_list)
1670 1679
1671 #define weak_list_list(w) ((w)->list) 1680 #define weak_list_list(w) ((w)->list)
1687 }; 1696 };
1688 1697
1689 DECLARE_LRECORD (lcrecord_list, struct lcrecord_list); 1698 DECLARE_LRECORD (lcrecord_list, struct lcrecord_list);
1690 #define XLCRECORD_LIST(x) XRECORD (x, lcrecord_list, struct lcrecord_list) 1699 #define XLCRECORD_LIST(x) XRECORD (x, lcrecord_list, struct lcrecord_list)
1691 #define XSETLCRECORD_LIST(x, p) XSETRECORD (x, p, lcrecord_list) 1700 #define XSETLCRECORD_LIST(x, p) XSETRECORD (x, p, lcrecord_list)
1701 #define wrap_lcrecord_list(p) wrap_record (p, lcrecord_list)
1692 #define LCRECORD_LISTP(x) RECORDP (x, lcrecord_list) 1702 #define LCRECORD_LISTP(x) RECORDP (x, lcrecord_list)
1693 /* #define CHECK_LCRECORD_LIST(x) CHECK_RECORD (x, lcrecord_list) 1703 /* #define CHECK_LCRECORD_LIST(x) CHECK_RECORD (x, lcrecord_list)
1694 Lcrecord lists should never escape to the Lisp level, so 1704 Lcrecord lists should never escape to the Lisp level, so
1695 functions should not be doing this. */ 1705 functions should not be doing this. */
1696 1706