diff options
| author | Sergey Bugaev <bugaevc@gmail.com> | 2023-03-19 18:09:46 +0300 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-04-03 00:44:04 +0200 |
| commit | 4096bd9d9cbdbac9b1bfce99a393295f63a88cc5 (patch) | |
| tree | 14310d54975eada411a5e494f1ad944d58376234 /kern/exception.c | |
| parent | f9b1676d4526ce89e6c6d41d8caf5759007d8c75 (diff) | |
| download | gnumach-4096bd9d9cbdbac9b1bfce99a393295f63a88cc5.tar.gz gnumach-4096bd9d9cbdbac9b1bfce99a393295f63a88cc5.tar.bz2 gnumach-4096bd9d9cbdbac9b1bfce99a393295f63a88cc5.zip | |
Make exception subcode a long
On EXC_BAD_ACCESS, exception subcode is used to pass the faulting memory
address, so it needs to be (at least) pointer-sized. Thus, make it into
a long.
This requires matching changes in glibc and the Hurd.
Message-Id: <20230319151017.531737-4-bugaevc@gmail.com>
Diffstat (limited to 'kern/exception.c')
| -rw-r--r-- | kern/exception.c | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/kern/exception.c b/kern/exception.c index 1014b3ed..10435b5c 100644 --- a/kern/exception.c +++ b/kern/exception.c @@ -85,9 +85,9 @@ boolean_t debug_user_with_kdb = FALSE; void exception( - integer_t _exception, - integer_t code, - integer_t subcode) + integer_t _exception, + integer_t code, + long_integer_t subcode) { ipc_thread_t self = current_thread(); ipc_port_t exc_port; @@ -157,9 +157,9 @@ exception( void exception_try_task( - integer_t _exception, - integer_t code, - integer_t subcode) + integer_t _exception, + integer_t code, + long_integer_t subcode) { ipc_thread_t self = current_thread(); task_t task = self->task; @@ -277,11 +277,17 @@ struct mach_exception { mach_msg_type_t codeType; integer_t code; mach_msg_type_t subcodeType; - integer_t subcode; + rpc_long_integer_t subcode; }; #define INTEGER_T_SIZE_IN_BITS (8 * sizeof(integer_t)) #define INTEGER_T_TYPE MACH_MSG_TYPE_INTEGER_T +#define RPC_LONG_INTEGER_T_SIZE_IN_BITS (8 * sizeof(rpc_long_integer_t)) +#if defined(__x86_64__) && !defined(USER32) +#define RPC_LONG_INTEGER_T_TYPE MACH_MSG_TYPE_INTEGER_64 +#else +#define RPC_LONG_INTEGER_T_TYPE MACH_MSG_TYPE_INTEGER_32 +#endif /* in mach/machine/vm_types.h */ mach_msg_type_t exc_port_proto = { @@ -304,6 +310,16 @@ mach_msg_type_t exc_code_proto = { /* msgt_unused = */ 0 }; +mach_msg_type_t exc_subcode_proto = { + /* msgt_name = */ RPC_LONG_INTEGER_T_TYPE, + /* msgt_size = */ RPC_LONG_INTEGER_T_SIZE_IN_BITS, + /* msgt_number = */ 1, + /* msgt_inline = */ TRUE, + /* msgt_longform = */ FALSE, + /* msgt_deallocate = */ FALSE, + /* msgt_unused = */ 0 +}; + /* * Routine: exception_raise * Purpose: @@ -329,9 +345,9 @@ exception_raise( ipc_port_t dest_port, ipc_port_t thread_port, ipc_port_t task_port, - integer_t _exception, - integer_t code, - integer_t subcode) + integer_t _exception, + integer_t code, + long_integer_t subcode) { ipc_thread_t self = current_thread(); ipc_thread_t receiver; @@ -521,7 +537,7 @@ exception_raise( exc->exception = _exception; exc->codeType = exc_code_proto; exc->code = code; - exc->subcodeType = exc_code_proto; + exc->subcodeType = exc_subcode_proto; exc->subcode = subcode; /* @@ -725,7 +741,7 @@ exception_raise( exc->exception = _exception; exc->codeType = exc_code_proto; exc->code = code; - exc->subcodeType = exc_code_proto; + exc->subcodeType = exc_subcode_proto; exc->subcode = subcode; ipc_mqueue_send_always(kmsg); |