Mercurial > hg > xemacs-beta
view src/EmacsFrame.h @ 4921:17362f371cc2
add more byte-code assertions and better failure output
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* alloc.c (Fmake_byte_code):
* bytecode.h:
* lisp.h:
* lread.c:
* lread.c (readevalloop):
* lread.c (Fread):
* lread.c (Fread_from_string):
* lread.c (read_list_conser):
* lread.c (read_list):
* lread.c (vars_of_lread):
* symbols.c:
* symbols.c (Fdefine_function):
Turn on the "compiled-function annotation hack". Implement it
properly by hooking into Fdefalias(). Note in the docstring to
`defalias' that we do this. Remove some old broken code and
change code that implemented the old kludgy way of hooking into
the Lisp reader into bracketed by `#ifdef
COMPILED_FUNCTION_ANNOTATION_HACK_OLD_WAY', which is not enabled.
Also enable byte-code metering when DEBUG_XEMACS -- this is a form
of profiling for computing histograms of which sequences of two
bytecodes are used most often.
* bytecode-ops.h:
* bytecode-ops.h (OPCODE):
New file. Extract out all the opcodes and declare them using
OPCODE(), a bit like frame slots and such. This way the file can
be included multiple times if necessary to iterate multiple times
over the byte opcodes.
* bytecode.c:
* bytecode.c (NUM_REMEMBERED_BYTE_OPS):
* bytecode.c (OPCODE):
* bytecode.c (assert_failed_with_remembered_ops):
* bytecode.c (READ_UINT_2):
* bytecode.c (READ_INT_1):
* bytecode.c (READ_INT_2):
* bytecode.c (PEEK_INT_1):
* bytecode.c (PEEK_INT_2):
* bytecode.c (JUMP_RELATIVE):
* bytecode.c (JUMP_NEXT):
* bytecode.c (PUSH):
* bytecode.c (POP_WITH_MULTIPLE_VALUES):
* bytecode.c (DISCARD):
* bytecode.c (UNUSED):
* bytecode.c (optimize_byte_code):
* bytecode.c (optimize_compiled_function):
* bytecode.c (Fbyte_code):
* bytecode.c (vars_of_bytecode):
* bytecode.c (init_opcode_table_multi_op):
* bytecode.c (reinit_vars_of_bytecode):
* emacs.c (main_1):
* eval.c (funcall_compiled_function):
* symsinit.h:
Any time we change either the instruction pointer or the stack
pointer, assert that we're going to move it to a valid location.
This should catch failures right when they occur rather than
sometime later. This requires that we pass in another couple of
parameters into some functions (only with error-checking enabled,
see below).
Also keep track, using a circular queue, of the last 100 byte
opcodes seen, and when we hit an assert failure during byte-code
execution, output the contents of the queue in a nice readable
fashion. This requires that bytecode-ops.h be included a second
time so that a table mapping opcodes to the name of their operation
can be constructed. This table is constructed in new function
reinit_vars_of_bytecode().
Everything in the last two paras happens only when
ERROR_CHECK_BYTE_CODE.
Add some longish comments describing how the arrays that hold the
stack and instructions, and the pointers used to access them, work.
* gc.c:
Import some code from my `latest-fix' workspace to mark the
staticpro's in order from lowest to highest, rather than highest to
lowest, so it's easier to debug when something goes wrong.
* lisp.h (abort_with_message): Renamed from abort_with_msg().
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symeval.h (DEFVAR_SYMVAL_FWD_OBJECT):
Make the various calls to staticpro() instead call staticpro_1(),
passing in the name of the C var being staticpro'ed, so that it
shows up in staticpro_names. Otherwise staticpro_names just has
1000+ copies of the word `location'.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 08:01:55 -0600 |
parents | 8de8e3f6228a |
children | 308d34e9f07d |
line wrap: on
line source
/* Public header for the Emacs frame widget. Copyright (C) 1993-1995 Sun Microsystems, Inc. Copyright (C) 1995 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_EmacsFrame_h_ #define INCLUDED_EmacsFrame_h_ #ifndef XtNminibuffer #define XtNminibuffer "minibuffer" #endif #ifndef XtCMinibuffer #define XtCMinibuffer "Minibuffer" #endif #ifndef XtNunsplittable #define XtNunsplittable "unsplittable" #endif #ifndef XtCUnsplittable #define XtCUnsplittable "Unsplittable" #endif #ifndef XtNinternalBorderWidth #define XtNinternalBorderWidth "internalBorderWidth" #endif #ifndef XtCInternalBorderWidth #define XtCInternalBorderWidth "InternalBorderWidth" #endif #ifndef XtNscrollBarWidth #define XtNscrollBarWidth "scrollBarWidth" #endif #ifndef XtCScrollBarWidth #define XtCScrollBarWidth "ScrollBarWidth" #endif #ifndef XtNscrollBarHeight #define XtNscrollBarHeight "scrollBarHeight" #endif #ifndef XtCScrollBarHeight #define XtCScrollBarHeight "ScrollBarHeight" #endif #ifndef XtNtopToolBarHeight #define XtNtopToolBarHeight "topToolBarHeight" #endif #ifndef XtCTopToolBarHeight #define XtCTopToolBarHeight "TopToolBarHeight" #endif #ifndef XtNbottomToolBarHeight #define XtNbottomToolBarHeight "bottomToolBarHeight" #endif #ifndef XtCBottomToolBarHeight #define XtCBottomToolBarHeight "BottomToolBarHeight" #endif #ifndef XtNleftToolBarWidth #define XtNleftToolBarWidth "leftToolBarWidth" #endif #ifndef XtCLeftToolBarWidth #define XtCLeftToolBarWidth "LeftToolBarWidth" #endif #ifndef XtNrightToolBarWidth #define XtNrightToolBarWidth "rightToolBarWidth" #endif #ifndef XtCRightToolBarWidth #define XtCRightToolBarWidth "RightToolBarWidth" #endif #ifndef XtNtopToolBarBorderWidth #define XtNtopToolBarBorderWidth "topToolBarBorderWidth" #endif #ifndef XtCTopToolBarBorderWidth #define XtCTopToolBarBorderWidth "TopToolBarBorderWidth" #endif #ifndef XtNbottomToolBarBorderWidth #define XtNbottomToolBarBorderWidth "bottomToolBarBorderWidth" #endif #ifndef XtCBottomToolBarBorderWidth #define XtCBottomToolBarBorderWidth "BottomToolBarBorderWidth" #endif #ifndef XtNleftToolBarBorderWidth #define XtNleftToolBarBorderWidth "leftToolBarBorderWidth" #endif #ifndef XtCLeftToolBarBorderWidth #define XtCLeftToolBarBorderWidth "LeftToolBarBorderWidth" #endif #ifndef XtNrightToolBarBorderWidth #define XtNrightToolBarBorderWidth "rightToolBarBorderWidth" #endif #ifndef XtCRightToolBarBorderWidth #define XtCRightToolBarBorderWidth "RightToolBarBorderWidth" #endif #ifndef XtNtopToolBarShadowColor #define XtNtopToolBarShadowColor "topToolBarShadowColor" #endif #ifndef XtCTopToolBarShadowColor #define XtCTopToolBarShadowColor "TopToolBarShadowColor" #endif #ifndef XtNbottomToolBarShadowColor #define XtNbottomToolBarShadowColor "bottomToolBarShadowColor" #endif #ifndef XtCBottomToolBarShadowColor #define XtCBottomToolBarShadowColor "BottomToolBarShadowColor" #endif #ifndef XtNbackgroundToolBarColor #define XtNbackgroundToolBarColor "backgroundToolBarColor" #endif #ifndef XtCBackgroundToolBarColor #define XtCBackgroundToolBarColor "BackgroundToolBarColor" #endif #ifndef XtNforegroundToolBarColor #define XtNforegroundToolBarColor "foregroundToolBarColor" #endif #ifndef XtCForegroundToolBarColor #define XtCForegroundToolBarColor "ForegroundToolBarColor" #endif #ifndef XtNtopToolBarShadowPixmap #define XtNtopToolBarShadowPixmap "topToolBarShadowPixmap" #endif #ifndef XtCTopToolBarShadowPixmap #define XtCTopToolBarShadowPixmap "TopToolBarShadowPixmap" #endif #ifndef XtNbottomToolBarShadowPixmap #define XtNbottomToolBarShadowPixmap "bottomToolBarShadowPixmap" #endif #ifndef XtCBottomToolBarShadowPixmap #define XtCBottomToolBarShadowPixmap "BottomToolBarShadowPixmap" #endif #ifndef XtNtoolBarShadowThickness #define XtNtoolBarShadowThickness "toolBarShadowThickness" #endif #ifndef XtCToolBarShadowThickness #define XtCToolBarShadowThickness "ToolBarShadowThickness" #endif #ifndef XtNscrollBarPlacement #define XtNscrollBarPlacement "scrollBarPlacement" #endif #ifndef XtCScrollBarPlacement #define XtCScrollBarPlacement "ScrollBarPlacement" #endif #ifndef XtRScrollBarPlacement #define XtRScrollBarPlacement "ScrollBarPlacement" #endif #ifndef XtNinterline #define XtNinterline "interline" #endif #ifndef XtCInterline #define XtCInterline "Interline" #endif #ifndef XtNfont #define XtNfont "font" #endif #ifndef XtCFont #define XtCFont "Font" #endif #ifndef XtNforeground #define XtNforeground "foreground" #endif #ifndef XtCForeground #define XtCForeground "Foreground" #endif #ifndef XtNbackground #define XtNbackground "background" #endif #ifndef XtCBackground #define XtCBackground "Background" #endif #ifndef XtNiconic #define XtNiconic "iconic" #endif #ifndef XtCIconic #define XtCIconic "Iconic" #endif #ifndef XtNcursorColor #define XtNcursorColor "cursorColor" #endif #ifndef XtCCursorColor #define XtCCursorColor "CursorColor" #endif #ifndef XtNbarCursor #define XtNbarCursor "barCursor" #endif #ifndef XtCBarCursor #define XtCBarCursor "BarCursor" #endif #ifndef XtNvisualBell #define XtNvisualBell "visualBell" #endif #ifndef XtCVisualBell #define XtCVisualBell "VisualBell" #endif #ifndef XtNbellVolume #define XtNbellVolume "bellVolume" #endif #ifndef XtCBellVolume #define XtCBellVolume "BellVolume" #endif #ifndef XtNpointerBackground #define XtNpointerBackground "pointerBackground" #endif #ifndef XtNpointerColor #define XtNpointerColor "pointerColor" #endif #ifndef XtNtextPointer #define XtNtextPointer "textPointer" #endif #ifndef XtNspacePointer #define XtNspacePointer "spacePointer" #endif #ifndef XtNmodeLinePointer #define XtNmodeLinePointer "modePointer" #endif #ifndef XtNgcPointer #define XtNgcPointer "gcPointer" #endif #ifndef XtNemacsFrame #define XtNemacsFrame "emacsFrame" #endif #ifndef XtCEmacsFrame #define XtCEmacsFrame "EmacsFrame" #endif #ifndef XtNgeometry #define XtNgeometry "geometry" #endif #ifndef XtCGeometry #define XtCGeometry "Geometry" #endif #ifndef XtNinitialGeometry #define XtNinitialGeometry "initialGeometry" #endif #ifndef XtCInitialGeometry #define XtCInitialGeometry "InitialGeometry" #endif #ifndef XtNmenubar #define XtNmenubar "menubar" #endif #ifndef XtCMenubar #define XtCMenubar "Menubar" #endif #ifndef XtNinitiallyUnmapped #define XtNinitiallyUnmapped "initiallyUnmapped" #endif #ifndef XtCInitiallyUnmapped #define XtCInitiallyUnmapped "InitiallyUnmapped" #endif #ifndef XtNpreferredWidth #define XtNpreferredWidth "preferredWidth" #endif #ifndef XtCPreferredWidth #define XtCPreferredWidth "PreferredWidth" #endif #ifndef XtNpreferredHeight #define XtNpreferredHeight "preferredHeight" #endif #ifndef XtCPreferredHeight #define XtCPreferredHeight "PreferredHeight" #endif #ifndef XtNuseBackingStore #define XtNuseBackingStore "useBackingStore" #endif #ifndef XtCUseBackingStore #define XtCUseBackingStore "UseBackingStore" #endif #define XtNximStyles "ximStyles" #define XtCXimStyles "XimStyles" #define XtRXimStyles "XimStyles" #define XtNximForeground "ximForeground" #define XtNximBackground "ximBackground" /* scrollbar placement types; like in ScrolledW.h */ #define EM_TOP 1 #define EM_BOTTOM 0 #define EM_LEFT 2 #define EM_RIGHT 0 #define XtTOP_LEFT (EM_TOP | EM_LEFT) #define XtBOTTOM_LEFT (EM_BOTTOM | EM_LEFT) #define XtTOP_RIGHT (EM_TOP | EM_RIGHT) #define XtBOTTOM_RIGHT (EM_BOTTOM | EM_RIGHT) /* structures */ typedef struct _EmacsFrameRec *EmacsFrame; typedef struct _EmacsFrameClassRec *EmacsFrameClass; extern WidgetClass emacsFrameClass; extern struct _DisplayContext* display_context; /* Special entrypoints */ void EmacsFrameRecomputeCellSize (Widget widget); void EmacsFrameSetCharSize (Widget widget, int rows, int cols); #endif /* INCLUDED_EmacsFrame_h_ */