comparison src/unexnt.c @ 5050:6f2158fa75ed

Fix quick-build, use asserts() in place of ABORT() -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * configure.ac (XE_COMPLEX_ARG): Correct doc of --quick-build: It also doesn't check for Lisp shadows. src/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * EmacsFrame.c: * EmacsFrame.c (EmacsFrameRecomputeCellSize): * alloca.c (i00afunc): * buffer.c: * buffer.c (MARKED_SLOT): * buffer.c (complex_vars_of_buffer): * cm.c: * cm.c (cmcheckmagic): * console.c: * console.c (MARKED_SLOT): * device-x.c: * device-x.c (x_get_visual_depth): * emacs.c (sort_args): * eval.c (throw_or_bomb_out): * event-stream.c: * event-stream.c (Fadd_timeout): * event-stream.c (Fadd_async_timeout): * event-stream.c (Frecent_keys): * events.c: * events.c (Fdeallocate_event): * events.c (event_pixel_translation): * extents.c: * extents.c (process_extents_for_insertion_mapper): * fns.c (Fbase64_encode_region): * fns.c (Fbase64_encode_string): * fns.c (Fbase64_decode_region): * fns.c (Fbase64_decode_string): * font-lock.c: * font-lock.c (find_context): * frame-x.c: * frame-x.c (x_wm_mark_shell_size_user_specified): * frame-x.c (x_wm_mark_shell_position_user_specified): * frame-x.c (x_wm_set_shell_iconic_p): * frame-x.c (x_wm_set_cell_size): * frame-x.c (x_wm_set_variable_size): * frame-x.c (x_wm_store_class_hints): * frame-x.c (x_wm_maybe_store_wm_command): * frame-x.c (x_initialize_frame_size): * frame.c (delete_frame_internal): * frame.c (change_frame_size_1): * free-hook.c (check_free): * free-hook.c (note_block_input): * free-hook.c (log_gcpro): * gccache-gtk.c (gc_cache_lookup): * gccache-x.c: * gccache-x.c (gc_cache_lookup): * glyphs-gtk.c: * glyphs-gtk.c (init_image_instance_from_gdk_pixmap): * glyphs-x.c: * glyphs-x.c (extract_xpm_color_names): * insdel.c: * insdel.c (move_gap): * keymap.c: * keymap.c (keymap_lookup_directly): * keymap.c (keymap_delete_inverse_internal): * keymap.c (accessible_keymaps_mapper_1): * keymap.c (where_is_recursive_mapper): * lisp.h: * lstream.c (make_lisp_buffer_stream_1): * macros.c: * macros.c (pop_kbd_macro_event): * mc-alloc.c (remove_page_from_used_list): * menubar-x.c: * menubar-x.c (set_frame_menubar): * ralloc.c: * ralloc.c (obtain): * ralloc.c (relinquish): * ralloc.c (relocate_blocs): * ralloc.c (resize_bloc): * ralloc.c (r_alloc_free): * ralloc.c (r_re_alloc): * ralloc.c (r_alloc_thaw): * ralloc.c (init_ralloc): * ralloc.c (Free_Addr_Block): * scrollbar-x.c: * scrollbar-x.c (x_update_scrollbar_instance_status): * sunplay.c (init_device): * unexnt.c: * unexnt.c (read_in_bss): * unexnt.c (map_in_heap): * window.c: * window.c (real_window): * window.c (window_display_lines): * window.c (window_display_buffer): * window.c (set_window_display_buffer): * window.c (unshow_buffer): * window.c (Fget_lru_window): if (...) ABORT(); ---> assert(); More specifically: if (x == y) ABORT (); --> assert (x != y); if (x != y) ABORT (); --> assert (x == y); if (x > y) ABORT (); --> assert (x <= y); etc. if (!x) ABORT (); --> assert (x); if (x) ABORT (); --> assert (!x); DeMorgan's Law's applied and manually simplified: if (x && !y) ABORT (); --> assert (!x || y); if (!x || y >= z) ABORT (); --> assert (x && y < z); Checked to make sure that assert() of an expression with side effects ensures that the side effects get executed even when asserts are disabled, and add a comment about this being a requirement of any "disabled assert" expression. * depend: * make-src-depend: * make-src-depend (PrintDeps): Fix broken code in make-src-depend so it does what it was always supposed to do, which was separate out config.h and lisp.h and all the files they include into separate variables in the depend part of Makefile so that quick-build can turn off the lisp.h/config.h/text.h/etc. dependencies of the source files, to speed up recompilation.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 05:05:54 -0600
parents 95c4ced5c07c
children 308d34e9f07d
comparison
equal deleted inserted replaced
5030:422b4b4fb2a6 5050:6f2158fa75ed
1 /* unexec for XEmacs on Windows NT. 1 /* unexec for XEmacs on Windows NT.
2 Copyright (C) 1994 Free Software Foundation, Inc. 2 Copyright (C) 1994 Free Software Foundation, Inc.
3 Copyright (C) 2002 Ben Wing. 3 Copyright (C) 2002, 2010 Ben Wing.
4 4
5 This file is part of XEmacs. 5 This file is part of XEmacs.
6 6
7 XEmacs is free software; you can redistribute it and/or modify it 7 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
523 HANDLE file; 523 HANDLE file;
524 unsigned long index, n_read; 524 unsigned long index, n_read;
525 525
526 file = qxeCreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL, 526 file = qxeCreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
527 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); 527 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
528 if (file == INVALID_HANDLE_VALUE) 528 assert (file != INVALID_HANDLE_VALUE);
529 ABORT ();
530 529
531 /* Seek to where the .bss section is tucked away after the heap... */ 530 /* Seek to where the .bss section is tucked away after the heap... */
532 index = heap_index_in_executable + get_committed_heap_size (); 531 index = heap_index_in_executable + get_committed_heap_size ();
533 if (SetFilePointer (file, index, NULL, FILE_BEGIN) == 0xFFFFFFFF) 532 if (SetFilePointer (file, index, NULL, FILE_BEGIN) == 0xFFFFFFFF)
534 ABORT (); 533 ABORT ();
535 534
536 /* Ok, read in the saved .bss section and initialize all 535 /* Ok, read in the saved .bss section and initialize all
537 uninitialized variables. */ 536 uninitialized variables. */
538 if (!ReadFile (file, bss_start, bss_size, &n_read, NULL)) 537 if (!ReadFile (file, bss_start, bss_size, &n_read, NULL))
551 void *file_base; 550 void *file_base;
552 unsigned long size, upper_size, n_read; 551 unsigned long size, upper_size, n_read;
553 552
554 file = qxeCreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL, 553 file = qxeCreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
555 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); 554 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
556 if (file == INVALID_HANDLE_VALUE) 555 assert (file != INVALID_HANDLE_VALUE);
557 ABORT ();
558 556
559 size = GetFileSize (file, &upper_size); 557 size = GetFileSize (file, &upper_size);
560 file_mapping = qxeCreateFileMapping (file, NULL, PAGE_WRITECOPY, 558 file_mapping = qxeCreateFileMapping (file, NULL, PAGE_WRITECOPY,
561 0, size, NULL); 559 0, size, NULL);
562 if (!file_mapping) 560 assert (file_mapping);
563 ABORT ();
564 561
565 size = get_committed_heap_size (); 562 size = get_committed_heap_size ();
566 file_base = MapViewOfFileEx (file_mapping, FILE_MAP_COPY, 0, 563 file_base = MapViewOfFileEx (file_mapping, FILE_MAP_COPY, 0,
567 heap_index_in_executable, size, 564 heap_index_in_executable, size,
568 get_heap_start ()); 565 get_heap_start ());