Mercurial > hg > xemacs-beta
annotate src/vdb-win32.c @ 5803:b79e1e02bf01
Preserve extent information in the command builder code.
src/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* event-stream.c:
* event-stream.c (mark_command_builder):
* event-stream.c (finalize_command_builder): Removed.
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder): Removed. Use
free_normal_lisp_object() instead.
* event-stream.c (echo_key_event):
* event-stream.c (regenerate_echo_keys_from_this_command_keys):
Detach all extents here.
* event-stream.c (maybe_echo_keys):
* event-stream.c (reset_key_echo):
* event-stream.c (execute_help_form):
* event-stream.c (Fnext_event):
* event-stream.c (command_builder_find_leaf_no_jit_binding):
* event-stream.c (command_builder_find_leaf):
* event-stream.c (lookup_command_event):
* events.h (struct command_builder):
Move the command builder's echo_buf to being a Lisp string rather
than a malloced Ibyte array. This allows passing through extent
information, which was previously dropped. It also simplifies the
allocation and release code for the command builder.
Rename echo_buf_index to echo_buf_fill_pointer, better reflecting
its function.
Don't rely on zero-termination (something not particularly
compatible with Lisp-level code) when showing a substring of
echo_buf that differs from that designated by
echo_buf_fill_pointer, keep a separate counter instead and use
that.
* minibuf.c:
* minibuf.c (echo_area_append):
Use the new START and END keyword arguments to #'append-message,
rather than consing a new string for basically every #'next-event
prompt displayed.
test/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* automated/extent-tests.el:
Check that extent information is passed through to the echo area
correctly with #'next-event's PROMPT argument.
lisp/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (raw-append-message):
Use #'write-sequence in this, take its START and END keyword
arguments, so our callers don't have to cons as much.
* simple.el (append-message):
Pass through START and END here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 14 Jul 2014 13:42:42 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 3092 | 1 /* Virtual diry bit implementation for XEmacs. |
| 2 Copyright (C) 2005 Marcus Crestani. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5042
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
| 3092 | 7 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5042
diff
changeset
|
8 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5042
diff
changeset
|
9 option) any later version. |
| 3092 | 10 |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5042
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 3092 | 18 |
| 19 /* Synched up with: Not in FSF. */ | |
| 20 | |
| 21 #include <config.h> | |
| 22 #include "lisp.h" | |
| 23 #include "gc.h" | |
| 24 #include "mc-alloc.h" | |
| 25 #include "vdb.h" | |
| 26 | |
| 27 #include "syswindows.h" | |
| 28 | |
| 29 | |
|
5042
f395ee7ad844
Fix some compile warnings, make vdb test code conditional on DEBUG_XEMACS
Ben Wing <ben@xemacs.org>
parents:
4827
diff
changeset
|
30 static LONG WINAPI |
| 3092 | 31 win32_fault_handler (LPEXCEPTION_POINTERS e) |
| 32 { | |
| 33 #define GET_FAULT_ADDRESS (void *) e->ExceptionRecord->ExceptionInformation[1] | |
| 34 if ((e->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) | |
| 35 && (e->ExceptionRecord->ExceptionInformation[0] == 1) | |
| 36 && write_barrier_enabled | |
| 37 && (fault_on_protected_page (GET_FAULT_ADDRESS))) | |
| 38 { | |
| 39 vdb_designate_modified (GET_FAULT_ADDRESS); | |
| 40 unprotect_page_and_mark_dirty (GET_FAULT_ADDRESS); | |
| 41 return EXCEPTION_CONTINUE_EXECUTION; | |
| 42 } | |
| 43 else | |
| 44 return EXCEPTION_CONTINUE_SEARCH; | |
| 45 } | |
| 46 | |
|
4827
11daf37dae4d
more fixes to get a clean compile
Ben Wing <ben@xemacs.org>
parents:
3092
diff
changeset
|
47 typedef LONG (WINAPI *gcPVECTORED_EXCEPTION_HANDLER) (LPEXCEPTION_POINTERS e); |
| 3092 | 48 |
| 49 | |
| 50 void | |
| 51 vdb_install_signal_handler (void) | |
| 52 { | |
| 53 HMODULE hm; | |
| 54 PVOID (WINAPI *aveh) (ULONG, gcPVECTORED_EXCEPTION_HANDLER); | |
| 55 | |
| 56 /* See init_signals_very_early () in signal.c. */ | |
| 57 if (noninteractive && !initialized) | |
| 58 { | |
| 59 allow_incremental_gc = 0; | |
| 60 return; | |
| 61 } | |
| 62 | |
| 63 hm = qxeGetModuleHandle (XETEXT ("kernel32")); | |
| 64 if (hm) | |
| 65 aveh = (PVOID (WINAPI *) (ULONG, gcPVECTORED_EXCEPTION_HANDLER)) | |
| 66 GetProcAddress (hm, "AddVectoredExceptionHandler"); | |
| 67 else | |
| 68 { | |
| 69 fprintf (stderr, "\nFAILED TO LOAD LIBRARY\n"); | |
| 70 aveh = NULL; | |
| 71 } | |
| 72 if (aveh) | |
| 73 { | |
| 74 allow_incremental_gc = 1; | |
| 75 aveh (TRUE, win32_fault_handler); | |
| 76 } | |
| 77 else | |
| 78 { | |
| 79 fprintf (stderr, "\nFAILED TO INSTALL SIGNAL HANDLER\n"); | |
| 80 ABORT (); | |
| 81 } | |
| 82 } | |
| 83 | |
| 84 | |
| 85 void | |
| 86 vdb_protect (void *ptr, EMACS_INT len) | |
| 87 { | |
| 88 DWORD old; | |
| 89 VirtualProtect (ptr, len, PAGE_READONLY, &old); | |
| 90 } | |
| 91 | |
| 92 | |
| 93 void | |
| 94 vdb_unprotect (void *ptr, EMACS_INT len) | |
| 95 { | |
| 96 DWORD old; | |
| 97 VirtualProtect (ptr, len, PAGE_READWRITE, &old); | |
| 98 } |
