annotate nt/compface.mak @ 4967:0d4c9d0f6a8d

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.
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 20:51:18 -0600
parents 03ab78e48ef6
children 7e535575bf6d 365bc8cb5894
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4894
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
1 ## Compface Makefile for Microsoft NMAKE
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
2 ## Based on xpm.mak
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
3 ## Copyright (C) 2001 Ben Wing.
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
4
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
5 ## This file is part of XEmacs.
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
6
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
7 ## XEmacs is free software; you can redistribute it and/or modify it
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
8 ## under the terms of the GNU General Public License as published by the
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
9 ## Free Software Foundation; either version 2, or (at your option) any
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
10 ## later version.
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
11
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
12 ## XEmacs is distributed in the hope that it will be useful, but WITHOUT
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
13 ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
14 ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
15 ## for more details.
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
16
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
17 ## You should have received a copy of the GNU General Public License
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
18 ## along with XEmacs; see the file COPYING. If not, write to
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
19 ## the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor,
03ab78e48ef6 Add copyright and license information based on Ben's recollections.
Jerry James <james@xemacs.org>
parents: 488
diff changeset
20 ## Boston, MA 02110-1301, USA.
394
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
21
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
22 !if !defined(DEBUG_XEMACS)
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
23 DEBUG_XEMACS=0
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
24 !endif
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
25
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
26 !if $(DEBUG_XEMACS)
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
27 OPT=-Od -Zi
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
28 !else
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
29 OPT=-O2 -G5 -Zi
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
30 !endif
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
31
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
32 WARN_CPP_FLAGS = -W3
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
33
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
34 #MSVC uses string.h, not strings.h
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
35 DEFINES=-DSYSV32
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
36
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
37 CC=cl
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
38 CFLAGS=-nologo -DFOR_MSW $(WARN_CPP_FLAGS) $(OPT) $(INCLUDES) $(DEFINES) -Fo$@ -c
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
39
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
40 OBJS= arith.obj file.obj compress.obj gen.obj uncompface.obj
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
41
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
42 # nmake rule
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
43
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
44 .SUFFIXES:
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
45 .SUFFIXES: .c
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
46
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
47 .c.obj:
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
48 $(CC) $(CFLAGS) $< -Fo$@
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
49
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
50
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
51 # targets
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
52
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
53 all: libcompface.lib
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
54
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
55 libcompface.lib: $(OBJS)
7d59cb494b73 Import from CVS: tag r21-2-12
cvs
parents:
diff changeset
56 link.exe -lib -nologo -out:$@ $(OBJS)
488
1e7b510d04f6 [xemacs-hg @ 2001-04-28 21:04:49 by adrian]
adrian
parents: 394
diff changeset
57
1e7b510d04f6 [xemacs-hg @ 2001-04-28 21:04:49 by adrian]
adrian
parents: 394
diff changeset
58 clean: $(OBJS)
1e7b510d04f6 [xemacs-hg @ 2001-04-28 21:04:49 by adrian]
adrian
parents: 394
diff changeset
59 -rm -f $(OBJS) libcompface.lib