Mercurial > hg > xemacs-beta
view src/sheap.c @ 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 | 17b3dc5500b0 |
children | 19a72041c5ed |
line wrap: on
line source
/* Static Heap management routines for XEmacs. Copyright (C) 1994, 1998 Free Software Foundation, Inc. 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.*/ #include <config.h> #include "lisp.h" #include "sysfile.h" #include <unistd.h> #include <sheap-adjust.h> #define STATIC_HEAP_BASE 0x800000 #define STATIC_HEAP_SLOP 0x80000 #define STATIC_HEAP_SIZE \ (STATIC_HEAP_BASE + SHEAP_ADJUSTMENT + STATIC_HEAP_SLOP) #define BLOCKSIZE (1<<12) #define ALLOC_UNIT (BLOCKSIZE-1) #define ALLOC_MASK ~((unsigned long)(ALLOC_UNIT)) #define ALIGN_ALLOC(addr) ((((unsigned long)addr) + ALLOC_UNIT) & ALLOC_MASK) char static_heap_buffer[STATIC_HEAP_SIZE]={0}; char* static_heap_base=static_heap_buffer; char* static_heap_ptr=static_heap_buffer; unsigned long static_heap_size=STATIC_HEAP_SIZE; int static_heap_initialized=0; int static_heap_dumped=0; void *more_static_core ( ptrdiff_t increment ); void *more_static_core ( ptrdiff_t increment ) { int size = (int) increment; void *result; if (!static_heap_initialized) { #ifdef VALMASK if (((unsigned long) static_heap_base & ~VALMASK) != 0) { printf ("error: The heap was allocated in upper memory.\n"); exit (-1); } #endif static_heap_base=(char*)ALIGN_ALLOC(static_heap_buffer); static_heap_ptr=static_heap_base; static_heap_size=STATIC_HEAP_SIZE - (static_heap_base-static_heap_buffer); #ifdef CYGWIN sbrk(BLOCKSIZE); /* force space for fork to work */ #endif static_heap_initialized=1; } result = static_heap_ptr; /* we don't need to align - handled by gmalloc. */ if (size < 0) { if (static_heap_ptr + size < static_heap_base) { return 0; } } else { if (static_heap_ptr + size >= static_heap_base + static_heap_size) { printf ( "\nRequested %d bytes, static heap exhausted! base is %p, current ptr\n" "is %p, static heap size is %ld. You have exhausted the static heap. \n" "\n" "If you are simply trying to compile, remove sheap-adjust.h\n" "and recompile from the top level. If this doesn't\n" "work then STATIC_HEAP_SLOP (defined in this file) is too small.\n" "\n" "If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h\n" "to 0 or a +ve number. Generally you should *not* try to run temacs\n" "with a static heap, you should dump first.\n", size, static_heap_base, static_heap_ptr, static_heap_size); exit(-1); return 0; } } static_heap_ptr += size; return result; } static void sheap_adjust_h (long adjust) { FILE *stream = retry_fopen ("sheap-adjust.h", "w"); if (stream == NULL) report_file_error ("Opening sheap adjustment file", build_string ("sheap-adjust.h")); fprintf (stream, "/*\tDo not edit this file!\n" "\tAutomatically generated by XEmacs */\n" "# define SHEAP_ADJUSTMENT (%ld)\n", adjust); retry_fclose (stream); } void report_sheap_usage (int die_if_pure_storage_exceeded); void report_sheap_usage (int die_if_pure_storage_exceeded) { int rc = 0; Bytecount lost = STATIC_HEAP_SIZE - (static_heap_ptr - static_heap_buffer); char buf[200]; sprintf (buf, "Static heap usage: %ldk of %ldk, slop is %ldk", (long) ((static_heap_ptr - static_heap_buffer) /1024), (long) (STATIC_HEAP_SIZE / 1024), (long) STATIC_HEAP_SLOP / 1024); if (lost > STATIC_HEAP_SLOP) { sprintf (buf + strlen (buf), " -- %ldk wasted", (long)(lost/1024)); if (die_if_pure_storage_exceeded) { sheap_adjust_h(STATIC_HEAP_SLOP - lost); sprintf (buf + strlen (buf), " -- reset to %ldk", (long) ((STATIC_HEAP_SIZE + STATIC_HEAP_SLOP - lost) / 1024)); rc = -1; } message ("%s\n", buf); } if (rc < 0) { unlink ("SATISFIED"); stderr_out ("Static heap size adjusted, don't panic! I will restart the `make'\n"); exit (0); } }