rewrite dynarr code -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-03 Ben Wing <ben@xemacs.org> * device-x.c (x_get_resource_prefix): * device-x.c (Fx_get_resource): * device-x.c (Fx_get_resource_prefix): * device-x.c (Fx_put_resource): * dialog-msw.c: * dialog-msw.c (handle_question_dialog_box): * dired-msw.c (mswindows_sort_files): * dired-msw.c (mswindows_get_files): * extents.c (extent_fragment_sort_by_priority): * extents.c (Fset_extent_parent): * file-coding.c (coding_reader): * file-coding.c (coding_writer): * file-coding.c (gzip_convert): * frame.c (generate_title_string): * gutter.c (calculate_gutter_size_from_display_lines): * indent.c (vmotion_1): * lread.c (read_bit_vector): * mule-coding.c (iso2022_decode): * rangetab.c: * rangetab.c (Fcopy_range_table): * rangetab.c (Fget_range_table): * rangetab.c (unified_range_table_copy_data): * redisplay-msw.c (mswindows_output_string): * redisplay-output.c (output_display_line): * redisplay-output.c (redisplay_move_cursor): * redisplay-output.c (redisplay_clear_bottom_of_window): * redisplay-tty.c (tty_output_ichar_dynarr): * redisplay-tty.c (set_foreground_to): * redisplay-tty.c (set_background_to): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay.c (redisplay_window_text_width_string): * redisplay.c (redisplay_text_width_string): * redisplay.c (create_text_block): * redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE): * redisplay.c (generate_fstring_runes): * redisplay.c (regenerate_modeline): * redisplay.c (ensure_modeline_generated): * redisplay.c (real_current_modeline_height): * redisplay.c (create_string_text_block): * redisplay.c (regenerate_window): * redisplay.c (REGEN_INC_FIND_START_END): * redisplay.c (point_visible): * redisplay.c (redisplay_window): * redisplay.c (mark_glyph_block_dynarr): * redisplay.c (line_start_cache_start): * redisplay.c (start_with_line_at_pixpos): * redisplay.c (update_line_start_cache): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * sysdep.c (qxe_readdir): * text.c (dfc_convert_to_external_format): * text.c (dfc_convert_to_internal_format): * toolbar-common.c (common_output_toolbar_button): * window.c (window_modeline_height): * window.c (Fwindow_last_line_visible_height): * window.c (window_displayed_height): * window.c (window_scroll): * window.c (get_current_pixel_pos): Use Dynarr_begin() in place of Dynarr_atp (foo, 0). * dynarr.c (Dynarr_realloc): * dynarr.c (Dynarr_lisp_realloc): * dynarr.c (Dynarr_resize): * dynarr.c (Dynarr_insert_many): * dynarr.c (Dynarr_delete_many): * dynarr.c (Dynarr_memory_usage): * dynarr.c (stack_like_malloc): * dynarr.c (stack_like_free): * lisp.h: * lisp.h (DECLARE_DYNARR_LISP_IMP): * lisp.h (XD_DYNARR_DESC): * lisp.h (Dynarr_pop): * gutter.c (output_gutter): * redisplay-output.c (sync_rune_structs): * redisplay-output.c (redisplay_output_window): Redo the dynarr code, add greater checks. Rename the `len', `largest' and `max' members to `len_', `largest_' and `max_' to try and catch existing places that might directly modify these values. Make new accessors Dynarr_largest() and Dynarr_max() and make them and existing Dynarr_length() be non-lvalues by adding '+ 0' to them; fix a couple of places in the redisplay code that tried to modify the length directly by setting Dynarr_length(). Use the accessors whenever possible even in the dynarr code itself. The accessors also verify that 0 <= len <= largest <= max. Rename settor function Dynarr_set_size() to Dynarr_set_length() and use it more consistently; also create lower-level Dynarr_set_length_1(). This latter function should be the only function that directly modifies the `len_' member of a Dynarr, and in the process makes sure that the `largest' value is kept correct. Consistently use ERROR_CHECK_STRUCTURES instead of ERROR_CHECK_TYPES for error-checking code. Reintroduce the temporarily disabled verification code on the positions of Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end(). Also create Dynarr_resize_if() in place of a repeated code fragment. Clean up all the functions that modify Dynarrs to use the new macros and functions and verify the correctness of the Dynarr both before and after the change. Note that there are two kinds of verification -- one for accessing and one for modifying. The difference is that the modify verification additionally checks to make sure that the Dynarr isn't locked. (This is used in redisplay to check for problems with reentrancy.) * lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.

##   TIFF makefile for Microsoft nmake
##   Copyright (C) 2001 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., 51 Franklin St - Fifth Floor,
## Boston, MA 02110-1301, USA.

!if !defined(DEBUG_XEMACS)
DEBUG_XEMACS=0
!endif

!if $(DEBUG_XEMACS)
OPT=-Od -Zi
!else
OPT=-O2 -G5
!endif

WARN_CPP_FLAGS = -W3
CFLAGS=-nologo -DFOR_MSW $(WARN_CPP_FLAGS) $(OPT) -c

OUTDIR=.\WinRel
OBJDIR=.\WinRel
# the following is because fax3sm.c references "tiff.h" and "tif_fax3.h",
# under the assumption that those header files are in the same directory
# as fax3sm.c  But, since we're using a special fax3sm.c file, and we
# can't be sure the user has patch to change "xx" to "..\..\libtiff\xx",
# let's just copy these header files to this directory. (Symbolic links
# would be _so_ nice)
NEED_FOR_COMPILE= tiff.h tif_fax3.h

CPP=cl.exe
CPP_PROJ= /GX /YX /I "." /I ".." /D "WIN32" /D "NDEBUG" /D\
 "_WINDOWS" /FR$(OBJDIR)/ /Fp$(OUTDIR)/"libtiff.pch" $(CFLAGS)

BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o$(OUTDIR)/libtiff.bsc 

LIB32=lib.exe
LIB32_FLAGS=/NOLOGO /OUT:$(OUTDIR)\libtiff.lib 
DEF_FLAGS=
DEF_FILE=

BSC32_SBRS= \
	$(OBJDIR)\tif_jpeg.sbr \
	$(OBJDIR)\tif_dirinfo.sbr \
	$(OBJDIR)\tif_win32.sbr \
	$(OBJDIR)\tif_flush.sbr \
	$(OBJDIR)\tif_thunder.sbr \
	$(OBJDIR)\tif_compress.sbr \
	$(OBJDIR)\tif_print.sbr \
	$(OBJDIR)\tif_dirread.sbr \
	$(OBJDIR)\tif_getimage.sbr \
	$(OBJDIR)\tif_fax3.sbr \
	$(OBJDIR)\tif_version.sbr \
	$(OBJDIR)\tif_codec.sbr \
	$(OBJDIR)\tif_dir.sbr \
	$(OBJDIR)\tif_predict.sbr \
	$(OBJDIR)\tif_close.sbr \
	$(OBJDIR)\tif_dumpmode.sbr \
	$(OBJDIR)\tif_aux.sbr \
	$(OBJDIR)\tif_error.sbr \
	$(OBJDIR)\tif_lzw.sbr \
	$(OBJDIR)\tif_zip.sbr \
	$(OBJDIR)\tif_read.sbr \
	$(OBJDIR)\tif_packbits.sbr \
	$(OBJDIR)\tif_swab.sbr \
	$(OBJDIR)\tif_dirwrite.sbr \
	$(OBJDIR)\tif_open.sbr \
	$(OBJDIR)\tif_warning.sbr \
	$(OBJDIR)\tif_tile.sbr \
	$(OBJDIR)\tif_strip.sbr \
	$(OBJDIR)\tif_next.sbr \
	$(OBJDIR)\tif_write.sbr \
	$(OBJDIR)\fax3sm.sbr

LIB32_OBJS= \
	$(OBJDIR)\tif_jpeg.obj \
	$(OBJDIR)\tif_dirinfo.obj \
	$(OBJDIR)\tif_win32.obj \
	$(OBJDIR)\tif_flush.obj \
	$(OBJDIR)\tif_thunder.obj \
	$(OBJDIR)\tif_compress.obj \
	$(OBJDIR)\tif_print.obj \
	$(OBJDIR)\tif_dirread.obj \
	$(OBJDIR)\tif_getimage.obj \
	$(OBJDIR)\tif_fax3.obj \
	$(OBJDIR)\tif_version.obj \
	$(OBJDIR)\tif_codec.obj \
	$(OBJDIR)\tif_dir.obj \
	$(OBJDIR)\tif_predict.obj \
	$(OBJDIR)\tif_close.obj \
	$(OBJDIR)\tif_dumpmode.obj \
	$(OBJDIR)\tif_aux.obj \
	$(OBJDIR)\tif_error.obj \
	$(OBJDIR)\tif_lzw.obj \
	$(OBJDIR)\tif_zip.obj \
	$(OBJDIR)\tif_read.obj \
	$(OBJDIR)\tif_packbits.obj \
	$(OBJDIR)\tif_swab.obj \
	$(OBJDIR)\tif_dirwrite.obj \
	$(OBJDIR)\tif_open.obj \
	$(OBJDIR)\tif_warning.obj \
	$(OBJDIR)\tif_tile.obj \
	$(OBJDIR)\tif_strip.obj \
	$(OBJDIR)\tif_next.obj \
	$(OBJDIR)\tif_write.obj \
	$(OBJDIR)\fax3sm.obj

# nmake rule

.SUFFIXES:
.SUFFIXES:	.c .obj

{..\..\libtiff}.c{$(OBJDIR)}.obj:
	$(CPP) $(CPP_PROJ) $< -Fo$@


ALL : $(OUTDIR)/libtiff.lib $(OUTDIR)/libtiff.bsc

clean : 
	-del tiff.h
	-del tif_fax3.h
	-del t4.h
	-del tiffcomp.h
	-del tiffconf.h
	-del tiffio.h
	-del ..\..\libtiff\libtiff.lib
	-del *.pdb
	-del $(OBJDIR)\*.obj
	-del $(OBJDIR)\*.sbr
	-del $(OUTDIR)\libtiff.lib
	-del $(OUTDIR)\libtiff.bsc
	-del $(OUTDIR)\libtiff.pch
	-rmdir $(OUTDIR)

tiff.h :
	if not exist ./tiff.h copy ..\..\libtiff\tiff.h .
tif_fax3.h :
	if not exist ./tif_fax3.h copy ..\..\libtiff\tif_fax3.h .

$(OUTDIR) : $(NEED_FOR_COMPILE)
        if not exist $(OUTDIR)/nul mkdir $(OUTDIR)

$(OUTDIR)/libtiff.bsc : $(OUTDIR)  $(BSC32_SBRS)
	$(BSC32) @<< 
	$(BSC32_FLAGS) $(BSC32_SBRS) 
<<

$(OUTDIR)/libtiff.lib : $(OUTDIR)  $(DEF_FILE) $(LIB32_OBJS)
	$(LIB32) @<< 
	$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) 
<<
	copy $(OUTDIR)\libtiff.lib ..\..\libtiff\libtiff.lib

DEP_FAX3S=\
	..\..\libtiff\tiff.h     \
	..\..\libtiff\tif_fax3.h
$(OBJDIR)/fax3sm.obj :  $(DEP_FAX3S) $(OBJDIR)
	$(CPP) $(CPP_PROJ) .\fax3sm.c -Fo$@