Mercurial > hg > xemacs-beta
view src/vdb-mach.c @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 09 Jul 2008 20:46:22 +0200 |
parents | 141c2920ea48 |
children | 308d34e9f07d |
line wrap: on
line source
/* Virtual diry bit implementation for XEmacs. Copyright (C) 2005 Marcus Crestani. 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. */ /* Synched up with: Not in FSF. */ #include <config.h> #include "lisp.h" #include "gc.h" #include "mc-alloc.h" #include "vdb.h" #include <errno.h> #include <signal.h> #include <sys/mman.h> #include <sys/time.h> #include <sys/resource.h> #include <unistd.h> #include <mach/mach.h> #include <mach/mach_error.h> #include <architecture/ppc/cframe.h> /* the structure of an exception msg and its reply */ typedef struct rep_msg { mach_msg_header_t head; NDR_record_t NDR; kern_return_t ret_code; } mach_reply_msg_t; typedef struct exc_msg { mach_msg_header_t head; /* start of the kernel processed data */ mach_msg_body_t msgh_body; mach_msg_port_descriptor_t thread; mach_msg_port_descriptor_t task; /* end of the kernel processed data */ NDR_record_t NDR; exception_type_t exception; mach_msg_type_number_t code_cnt; exception_data_t code; /* some padding */ char pad[512]; } mach_exc_msg_t; /* this is a neat little mach callback */ extern boolean_t exc_server(mach_msg_header_t *in, mach_msg_header_t *out); /* these are the globals everyone needs */ static size_t page_size = 16384; static mach_port_t task_self = NULL; static mach_port_t exc_port = NULL; /* these are some less neat mach callbacks */ kern_return_t catch_exception_raise_state (mach_port_t UNUSED (port), exception_type_t UNUSED (exception_type), exception_data_t UNUSED (exception_data), mach_msg_type_number_t UNUSED (data_cnt), thread_state_flavor_t *UNUSED (flavor), thread_state_t UNUSED (in_state), mach_msg_type_number_t UNUSED (is_cnt), thread_state_t UNUSED (out_state), mach_msg_type_number_t UNUSED (os_cnt)) { return KERN_FAILURE; } kern_return_t catch_exception_raise_state_identitity (mach_port_t UNUSED (port), mach_port_t UNUSED (thread_port), mach_port_t UNUSED (task_port), exception_type_t UNUSED (exception_type), exception_data_t UNUSED (exception_data), mach_msg_type_number_t UNUSED (data_count), thread_state_flavor_t *UNUSED (state_flavor), thread_state_t UNUSED (in_state), mach_msg_type_number_t UNUSED (in_state_count), thread_state_t UNUSED (out_state), mach_msg_type_number_t UNUSED (out_state_count)) { return KERN_FAILURE; } kern_return_t catch_exception_raise (mach_port_t UNUSED (port), mach_port_t UNUSED (thread_port), mach_port_t UNUSED (task_port), exception_type_t UNUSED (exception_type), exception_data_t exception_data, mach_msg_type_number_t UNUSED (data_count)) { /* kernel return value is in exception_data[0], faulting address in exception_data[1] */ if (write_barrier_enabled && (fault_on_protected_page ((void *) exception_data[1])) && exception_data[0] == KERN_PROTECTION_FAILURE) { vdb_designate_modified ((void *) exception_data[1]); unprotect_page_and_mark_dirty ((void *) exception_data[1]); return KERN_SUCCESS; } else /* default sigsegv handler */ { fprintf (stderr, "\n\nFatal Error: Received %s (%d) for address 0x%x\n", "EXC_BAD_ACCESS", exception_data[0], (int) exception_data[1]); return KERN_FAILURE; } } /* this is the thread which forwards of exceptions read from the exception server off to our exception catchers and then back out to the other thread */ void exception_thread(void) { mach_msg_header_t *message; mach_msg_header_t *reply; kern_return_t retval; /* allocate the space for the message and reply */ message = (mach_msg_header_t *) malloc (sizeof (mach_exc_msg_t)); reply = (mach_msg_header_t *) malloc (sizeof (mach_reply_msg_t)); /* do this loop forever */ while (1) { /* block until we get an exception message */ retval = mach_msg (message, MACH_RCV_MSG, 0, sizeof (mach_exc_msg_t), exc_port, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL); /* forward off the handling of this message */ if (!exc_server (message, reply)) { fprintf (stderr, "INTERNAL ERROR: exc_server() failed.\n"); ABORT (); } /* send the message back out to the thread */ retval = mach_msg (reply, MACH_SEND_MSG, sizeof (mach_reply_msg_t), 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL); } } /* this initializes the subsystem (sets the exception port, starts the exception handling thread, etc) */ void vdb_install_signal_handler (void) { mach_port_t thread_self, exc_port_s, exc_thread; ppc_thread_state_t *exc_thread_state; mach_msg_type_name_t type; void *subthread_stack; kern_return_t retval; /* get ids for ourself */ if (!task_self) task_self = mach_task_self (); thread_self = mach_thread_self (); /* allocate the port we're going to get exceptions on */ retval = mach_port_allocate (task_self, MACH_PORT_RIGHT_RECEIVE, &exc_port); if (retval != KERN_SUCCESS) { fprintf (stderr, "Couldn't allocate exception port: %s\n", mach_error_string (retval)); ABORT (); } /* extract out the send rights for that port, which the OS needs */ retval = mach_port_extract_right (task_self, exc_port, MACH_MSG_TYPE_MAKE_SEND, &exc_port_s, &type); if(retval != KERN_SUCCESS) { fprintf (stderr, "Couldn't extract send rights: %s\n", mach_error_string (retval)); ABORT (); } /* set the exception ports for this thread to the above */ retval = thread_set_exception_ports(thread_self, EXC_MASK_BAD_ACCESS, exc_port_s, EXCEPTION_DEFAULT, PPC_THREAD_STATE); if(retval != KERN_SUCCESS) { fprintf (stderr, "Couldn't set exception ports: %s\n", mach_error_string (retval)); ABORT (); } /* set up the subthread */ retval = thread_create(task_self, &exc_thread); if(retval != KERN_SUCCESS) { fprintf (stderr , "Couldn't create exception thread: %s\n", mach_error_string (retval)); ABORT (); } subthread_stack = (void *) malloc (page_size); subthread_stack = (char *) subthread_stack + (page_size - C_ARGSAVE_LEN - C_RED_ZONE); exc_thread_state = (ppc_thread_state_t *) malloc (sizeof (ppc_thread_state_t)); exc_thread_state->srr0 = (unsigned int) exception_thread; exc_thread_state->r1 = (unsigned int) subthread_stack; retval = thread_set_state (exc_thread, PPC_THREAD_STATE, (thread_state_t) exc_thread_state, PPC_THREAD_STATE_COUNT); if (retval != KERN_SUCCESS) { fprintf (stderr, "Couldn't set subthread state: %s\n", mach_error_string (retval)); ABORT (); } retval = thread_resume (exc_thread); if (retval != KERN_SUCCESS) { fprintf (stderr, "Couldn't resume subthread: %s\n", mach_error_string (retval)); ABORT (); } allow_incremental_gc = 1; } void vdb_protect (void *ptr, EMACS_INT len) { if (mprotect (ptr, len, PROT_READ)) { perror ("Couldn't mprotect"); ABORT (); } } void vdb_unprotect (void *ptr, EMACS_INT len) { if (mprotect (ptr, len, PROT_READ | PROT_WRITE)) { perror ("Couldn't mprotect"); ABORT (); } }