yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-02-02 13:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue 164 - MACHINE_THREAD_STATE on older 10.4 versions. Patch by Dave Camp, r=Chris Rogers

Browse source 
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@162 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
ted.mielczarek 2007-05-08 19:04:14 +00:00
parent 980f6dc277
commit 0e668e0783
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/client/mac/handler/minidump_generator.cc
View file

@ -330,24 +330,24 @@ bool MinidumpGenerator::WriteContext(breakpad_thread_state_data_t state,
#elif TARGET_CPU_X86 #elif TARGET_CPU_X86
bool MinidumpGenerator::WriteStack(breakpad_thread_state_data_t state, bool MinidumpGenerator::WriteStack(breakpad_thread_state_data_t state,
MDMemoryDescriptor *stack_location) { MDMemoryDescriptor *stack_location) {
x86_thread_state_t *machine_state = i386_thread_state_t *machine_state =
reinterpret_cast<x86_thread_state_t *>(state); reinterpret_cast<i386_thread_state_t *>(state);
vm_address_t start_addr = machine_state->uts.ts32.esp; vm_address_t start_addr = machine_state->esp;
return WriteStackFromStartAddress(start_addr, stack_location); return WriteStackFromStartAddress(start_addr, stack_location);
} }
u_int64_t MinidumpGenerator::CurrentPCForStack(breakpad_thread_state_data_t state) { u_int64_t MinidumpGenerator::CurrentPCForStack(breakpad_thread_state_data_t state) {
x86_thread_state_t *machine_state = i386_thread_state_t *machine_state =
reinterpret_cast<x86_thread_state_t *>(state); reinterpret_cast<i386_thread_state_t *>(state);
return machine_state->uts.ts32.eip; return machine_state->eip;
} }
bool MinidumpGenerator::WriteContext(breakpad_thread_state_data_t state, bool MinidumpGenerator::WriteContext(breakpad_thread_state_data_t state,
MDLocationDescriptor *register_location) { MDLocationDescriptor *register_location) {
TypedMDRVA<MDRawContextX86> context(&writer_); TypedMDRVA<MDRawContextX86> context(&writer_);
x86_thread_state_t *machine_state = i386_thread_state_t *machine_state =
reinterpret_cast<x86_thread_state_t *>(state); reinterpret_cast<i386_thread_state_t *>(state);
if (!context.Allocate()) if (!context.Allocate())
return false; return false;
@ -355,7 +355,7 @@ bool MinidumpGenerator::WriteContext(breakpad_thread_state_data_t state,
*register_location = context.location(); *register_location = context.location();
MDRawContextX86 *context_ptr = context.get(); MDRawContextX86 *context_ptr = context.get();
context_ptr->context_flags = MD_CONTEXT_X86; context_ptr->context_flags = MD_CONTEXT_X86;
#define AddReg(a) context_ptr->a = machine_state->uts.ts32.a #define AddReg(a) context_ptr->a = machine_state->a
AddReg(cs); AddReg(cs);
AddReg(ds); AddReg(ds);
AddReg(ss); AddReg(ss);
@ -382,7 +382,8 @@ bool MinidumpGenerator::WriteThreadStream(mach_port_t thread_id,
breakpad_thread_state_data_t state; breakpad_thread_state_data_t state;
mach_msg_type_number_t state_count = sizeof(state); mach_msg_type_number_t state_count = sizeof(state);
if (thread_get_state(thread_id, MACHINE_THREAD_STATE, state, &state_count) == if (thread_get_state(thread_id, BREAKPAD_MACHINE_THREAD_STATE,
state, &state_count) ==
KERN_SUCCESS) { KERN_SUCCESS) {
if (!WriteStack(state, &thread->stack)) if (!WriteStack(state, &thread->stack))
return false; return false;
@ -455,7 +456,7 @@ bool MinidumpGenerator::WriteExceptionStream(MDRawDirectory *exception_stream) {
breakpad_thread_state_data_t state; breakpad_thread_state_data_t state;
mach_msg_type_number_t stateCount = sizeof(state); mach_msg_type_number_t stateCount = sizeof(state);
if (thread_get_state(exception_thread_, MACHINE_THREAD_STATE, state, if (thread_get_state(exception_thread_, BREAKPAD_MACHINE_THREAD_STATE, state,
&stateCount) != KERN_SUCCESS) &stateCount) != KERN_SUCCESS)
return false; return false;

5
src/common/mac/macho_utilities.h
View file

@ -54,6 +54,11 @@
# define LC_UUID 0x1b /* the uuid */ # define LC_UUID 0x1b /* the uuid */
#endif #endif
#if TARGET_CPU_X86
# define BREAKPAD_MACHINE_THREAD_STATE i386_THREAD_STATE
#else
# define BREAKPAD_MACHINE_THREAD_STATE MACHINE_THREAD_STATE
#endif
// The uuid_command struct/swap routines were added during the 10.4 series. // The uuid_command struct/swap routines were added during the 10.4 series.
// Their presence isn't guaranteed. // Their presence isn't guaranteed.