ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/sigsegv.cpp

Comparing BasiliskII/src/Unix/sigsegv.cpp (file contents):
Revision 1.41 by cebix, 2004-01-12T15:29:25Z vs.
Revision 1.73 by gbeauche, 2008-01-06T16:10:30Z

#	Line 10 | Line 10
10		*    tjw@omnigroup.com Sun, 4 Jun 2000
11		*    www.omnigroup.com/mailman/archive/macosx-dev/2000-June/002030.html
12		*
13	<	*  Basilisk II (C) 1997-2004 Christian Bauer
13	>	*  Basilisk II (C) 1997-2008 Christian Bauer
14		*
15		*  This program is free software; you can redistribute it and/or modify
16		*  it under the terms of the GNU General Public License as published by
#	Line 66 | Line 66 | static bool sigsegv_do_install_handler(i
66		*  Instruction decoding aids
67		*/
68
69	+	// Transfer type
70	+	enum transfer_type_t {
71	+	SIGSEGV_TRANSFER_UNKNOWN        = 0,
72	+	SIGSEGV_TRANSFER_LOAD           = 1,
73	+	SIGSEGV_TRANSFER_STORE          = 2
74	+	};
75	+
76		// Transfer size
77		enum transfer_size_t {
78		SIZE_UNKNOWN,
79		SIZE_BYTE,
80		SIZE_WORD, // 2 bytes
81		SIZE_LONG, // 4 bytes
82	<	SIZE_QUAD, // 8 bytes
82	>	SIZE_QUAD  // 8 bytes
83		};
84
85	<	// Transfer type
79	<	typedef sigsegv_transfer_type_t transfer_type_t;
80	<
81	<	#if (defined(powerpc) || defined(__powerpc__) || defined(__ppc__))
85	>	#if (defined(powerpc) || defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__))
86		// Addressing mode
87		enum addressing_mode_t {
88		MODE_UNKNOWN,
#	Line 97 | Line 101 | struct instruction_t {
101		char                            ra, rd;
102		};
103
104	<	static void powerpc_decode_instruction(instruction_t *instruction, unsigned int nip, unsigned int * gpr)
104	>	static void powerpc_decode_instruction(instruction_t *instruction, unsigned int nip, unsigned long * gpr)
105		{
106		// Get opcode and divide into fields
107	<	unsigned int opcode = *((unsigned int *)nip);
107	>	unsigned int opcode = *((unsigned int *)(unsigned long)nip);
108		unsigned int primop = opcode >> 26;
109		unsigned int exop = (opcode >> 1) & 0x3ff;
110		unsigned int ra = (opcode >> 16) & 0x1f;
#	Line 174 | Line 178 | static void powerpc_decode_instruction(i
178		transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break;
179		case 45:        // sthu
180		transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_U; break;
181	+	case 58:        // ld, ldu, lwa
182	+	transfer_type = SIGSEGV_TRANSFER_LOAD;
183	+	transfer_size = SIZE_QUAD;
184	+	addr_mode = ((opcode & 3) == 1) ? MODE_U : MODE_NORM;
185	+	imm &= ~3;
186	+	break;
187	+	case 62:        // std, stdu, stq
188	+	transfer_type = SIGSEGV_TRANSFER_STORE;
189	+	transfer_size = SIZE_QUAD;
190	+	addr_mode = ((opcode & 3) == 1) ? MODE_U : MODE_NORM;
191	+	imm &= ~3;
192	+	break;
193		}
194
195		// Calculate effective address
#	Line 214 | Line 230 | static void powerpc_decode_instruction(i
230
231		#if HAVE_SIGINFO_T
232		// Generic extended signal handler
233	<	#if defined(__NetBSD__) || defined(__FreeBSD__)
233	>	#if defined(__FreeBSD__)
234		#define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGBUS)
235		#else
236		#define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGSEGV)
#	Line 228 | Line 244 | static void powerpc_decode_instruction(i
244		#define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.gregs)
245		#define SIGSEGV_FAULT_INSTRUCTION               (unsigned long)SIGSEGV_CONTEXT_REGS[CTX_EPC]
246		#if (defined(mips) || defined(__mips))
247	<	#define SIGSEGV_REGISTER_FILE                   SIGSEGV_CONTEXT_REGS
247	>	#define SIGSEGV_REGISTER_FILE                   &SIGSEGV_CONTEXT_REGS[CTX_EPC], &SIGSEGV_CONTEXT_REGS[CTX_R0]
248		#define SIGSEGV_SKIP_INSTRUCTION                mips_skip_instruction
249		#endif
250		#endif
#	Line 244 | Line 260 | static void powerpc_decode_instruction(i
260		#define SIGSEGV_REGISTER_FILE                   ((unsigned long *)SIGSEGV_CONTEXT_REGS), SIGSEGV_SPARC_GWINDOWS, SIGSEGV_SPARC_RWINDOW
261		#define SIGSEGV_SKIP_INSTRUCTION                sparc_skip_instruction
262		#endif
263	+	#if defined(__i386__)
264	+	#include <sys/regset.h>
265	+	#define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.gregs)
266	+	#define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS[EIP]
267	+	#define SIGSEGV_REGISTER_FILE                   (unsigned long *)SIGSEGV_CONTEXT_REGS
268	+	#define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
269		#endif
270	<	#if defined(__FreeBSD__)
270	>	#endif
271	>	#if defined(__FreeBSD__) || defined(__OpenBSD__)
272		#if (defined(i386) || defined(__i386__))
273		#define SIGSEGV_FAULT_INSTRUCTION               (((struct sigcontext *)scp)->sc_eip)
274		#define SIGSEGV_REGISTER_FILE                   ((unsigned long *)&(((struct sigcontext *)scp)->sc_edi)) /* EDI is the first GPR (even below EIP) in sigcontext */
275		#define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
276		#endif
277		#endif
278	+	#if defined(__NetBSD__)
279	+	#if (defined(i386) || defined(__i386__))
280	+	#include <sys/ucontext.h>
281	+	#define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.__gregs)
282	+	#define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS[_REG_EIP]
283	+	#define SIGSEGV_REGISTER_FILE                   (unsigned long *)SIGSEGV_CONTEXT_REGS
284	+	#define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
285	+	#endif
286	+	#if (defined(powerpc) || defined(__powerpc__))
287	+	#include <sys/ucontext.h>
288	+	#define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.__gregs)
289	+	#define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS[_REG_PC]
290	+	#define SIGSEGV_REGISTER_FILE                   (unsigned long *)&SIGSEGV_CONTEXT_REGS[_REG_PC], (unsigned long *)&SIGSEGV_CONTEXT_REGS[_REG_R0]
291	+	#define SIGSEGV_SKIP_INSTRUCTION                powerpc_skip_instruction
292	+	#endif
293	+	#endif
294		#if defined(__linux__)
295		#if (defined(i386) || defined(__i386__))
296		#include <sys/ucontext.h>
#	Line 274 | Line 313 | static void powerpc_decode_instruction(i
313		#include <sys/ucontext.h>
314		#define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.regs)
315		#define SIGSEGV_FAULT_INSTRUCTION               (SIGSEGV_CONTEXT_REGS->nip)
316	<	#define SIGSEGV_REGISTER_FILE                   (unsigned int *)&SIGSEGV_CONTEXT_REGS->nip, (unsigned int *)(SIGSEGV_CONTEXT_REGS->gpr)
316	>	#define SIGSEGV_REGISTER_FILE                   (unsigned long *)&SIGSEGV_CONTEXT_REGS->nip, (unsigned long *)(SIGSEGV_CONTEXT_REGS->gpr)
317		#define SIGSEGV_SKIP_INSTRUCTION                powerpc_skip_instruction
318		#endif
319		#if (defined(hppa) || defined(__hppa__))
320		#undef  SIGSEGV_FAULT_ADDRESS
321		#define SIGSEGV_FAULT_ADDRESS                   sip->si_ptr
322		#endif
323	+	#if (defined(arm) || defined(__arm__))
324	+	#include <asm/ucontext.h> /* use kernel structure, glibc may not be in sync */
325	+	#define SIGSEGV_CONTEXT_REGS                    (((struct ucontext *)scp)->uc_mcontext)
326	+	#define SIGSEGV_FAULT_INSTRUCTION               (SIGSEGV_CONTEXT_REGS.arm_pc)
327	+	#define SIGSEGV_REGISTER_FILE                   (&SIGSEGV_CONTEXT_REGS.arm_r0)
328	+	#define SIGSEGV_SKIP_INSTRUCTION                arm_skip_instruction
329	+	#endif
330	+	#if (defined(mips) || defined(__mips__))
331	+	#include <sys/ucontext.h>
332	+	#define SIGSEGV_CONTEXT_REGS                    (((struct ucontext *)scp)->uc_mcontext)
333	+	#define SIGSEGV_FAULT_INSTRUCTION               (SIGSEGV_CONTEXT_REGS.pc)
334	+	#define SIGSEGV_REGISTER_FILE                   &SIGSEGV_CONTEXT_REGS.pc, &SIGSEGV_CONTEXT_REGS.gregs[0]
335	+	#define SIGSEGV_SKIP_INSTRUCTION                mips_skip_instruction
336	+	#endif
337		#endif
338		#endif
339
#	Line 310 | Line 363 | static void powerpc_decode_instruction(i
363		#define SIGSEGV_FAULT_HANDLER_ARGS              sig, scp
364		#define SIGSEGV_FAULT_ADDRESS                   scp->regs->dar
365		#define SIGSEGV_FAULT_INSTRUCTION               scp->regs->nip
366	<	#define SIGSEGV_REGISTER_FILE                   (unsigned int *)&scp->regs->nip, (unsigned int *)(scp->regs->gpr)
366	>	#define SIGSEGV_REGISTER_FILE                   (unsigned long *)&scp->regs->nip, (unsigned long *)(scp->regs->gpr)
367		#define SIGSEGV_SKIP_INSTRUCTION                powerpc_skip_instruction
368		#endif
369		#if (defined(alpha) || defined(__alpha__))
#	Line 320 | Line 373 | static void powerpc_decode_instruction(i
373		#define SIGSEGV_FAULT_ADDRESS                   get_fault_address(scp)
374		#define SIGSEGV_FAULT_INSTRUCTION               scp->sc_pc
375		#endif
376	+	#if (defined(arm) || defined(__arm__))
377	+	#define SIGSEGV_FAULT_HANDLER_ARGLIST   int sig, int r1, int r2, int r3, struct sigcontext sc
378	+	#define SIGSEGV_FAULT_HANDLER_ARGLIST_1 struct sigcontext *scp
379	+	#define SIGSEGV_FAULT_HANDLER_ARGS              &sc
380	+	#define SIGSEGV_FAULT_ADDRESS                   scp->fault_address
381	+	#define SIGSEGV_FAULT_INSTRUCTION               scp->arm_pc
382	+	#define SIGSEGV_REGISTER_FILE                   &scp->arm_r0
383	+	#define SIGSEGV_SKIP_INSTRUCTION                arm_skip_instruction
384	+	#endif
385		#endif
386
387		// Irix 5 or 6 on MIPS
#	Line 465 | Line 527 | static sigsegv_address_t get_fault_addre
527		#endif
528		#endif
529
530	+	#if HAVE_WIN32_EXCEPTIONS
531	+	#define WIN32_LEAN_AND_MEAN /* avoid including junk */
532	+	#include <windows.h>
533	+	#include <winerror.h>
534	+
535	+	#define SIGSEGV_FAULT_HANDLER_ARGLIST   EXCEPTION_POINTERS *ExceptionInfo
536	+	#define SIGSEGV_FAULT_HANDLER_ARGS              ExceptionInfo
537	+	#define SIGSEGV_FAULT_ADDRESS                   ExceptionInfo->ExceptionRecord->ExceptionInformation[1]
538	+	#define SIGSEGV_CONTEXT_REGS                    ExceptionInfo->ContextRecord
539	+	#define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS->Eip
540	+	#define SIGSEGV_REGISTER_FILE                   ((unsigned long *)&SIGSEGV_CONTEXT_REGS->Edi)
541	+	#define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
542	+	#endif
543	+
544		#if HAVE_MACH_EXCEPTIONS
545
546		// This can easily be extended to other Mach systems, but really who
#	Line 525 | Line 601 | if (ret != KERN_SUCCESS) { \
601		exit (1); \
602		}
603
604	<	#define SIGSEGV_FAULT_ADDRESS                   code[1]
605	<	#define SIGSEGV_FAULT_INSTRUCTION               get_fault_instruction(thread, state)
606	<	#define SIGSEGV_FAULT_HANDLER_INVOKE(ADDR, IP)  ((code[0] == KERN_PROTECTION_FAILURE) ? sigsegv_fault_handler(ADDR, IP) : SIGSEGV_RETURN_FAILURE)
607	<	#define SIGSEGV_FAULT_HANDLER_ARGLIST   mach_port_t thread, exception_data_t code, ppc_thread_state_t *state
608	<	#define SIGSEGV_FAULT_HANDLER_ARGS              thread, code, &state
604	>	#ifdef __ppc__
605	>	#define SIGSEGV_EXCEPTION_STATE_TYPE    ppc_exception_state_t
606	>	#define SIGSEGV_EXCEPTION_STATE_FLAVOR  PPC_EXCEPTION_STATE
607	>	#define SIGSEGV_EXCEPTION_STATE_COUNT   PPC_EXCEPTION_STATE_COUNT
608	>	#define SIGSEGV_FAULT_ADDRESS                   SIP->exc_state.dar
609	>	#define SIGSEGV_THREAD_STATE_TYPE               ppc_thread_state_t
610	>	#define SIGSEGV_THREAD_STATE_FLAVOR             PPC_THREAD_STATE
611	>	#define SIGSEGV_THREAD_STATE_COUNT              PPC_THREAD_STATE_COUNT
612	>	#define SIGSEGV_FAULT_INSTRUCTION               SIP->thr_state.srr0
613		#define SIGSEGV_SKIP_INSTRUCTION                powerpc_skip_instruction
614	<	#define SIGSEGV_REGISTER_FILE                   &state->srr0, &state->r0
615	<
616	<	// Given a suspended thread, stuff the current instruction and
617	<	// registers into state.
618	<	//
619	<	// It would have been nice to have this be ppc/x86 independant which
620	<	// could have been done easily with a thread_state_t instead of
621	<	// ppc_thread_state_t, but because of the way this is called it is
622	<	// easier to do it this way.
623	<	#if (defined(ppc) || defined(__ppc__))
624	<	static inline sigsegv_address_t get_fault_instruction(mach_port_t thread, ppc_thread_state_t *state)
625	<	{
626	<	kern_return_t krc;
627	<	mach_msg_type_number_t count;
628	<
629	<	count = MACHINE_THREAD_STATE_COUNT;
630	<	krc = thread_get_state(thread, MACHINE_THREAD_STATE, (thread_state_t)state, &count);
631	<	MACH_CHECK_ERROR (thread_get_state, krc);
632	<
633	<	return (sigsegv_address_t)state->srr0;
634	<	}
614	>	#define SIGSEGV_REGISTER_FILE                   (unsigned long *)&SIP->thr_state.srr0, (unsigned long *)&SIP->thr_state.r0
615	>	#endif
616	>	#ifdef __ppc64__
617	>	#define SIGSEGV_EXCEPTION_STATE_TYPE    ppc_exception_state64_t
618	>	#define SIGSEGV_EXCEPTION_STATE_FLAVOR  PPC_EXCEPTION_STATE64
619	>	#define SIGSEGV_EXCEPTION_STATE_COUNT   PPC_EXCEPTION_STATE64_COUNT
620	>	#define SIGSEGV_FAULT_ADDRESS                   SIP->exc_state.dar
621	>	#define SIGSEGV_THREAD_STATE_TYPE               ppc_thread_state64_t
622	>	#define SIGSEGV_THREAD_STATE_FLAVOR             PPC_THREAD_STATE64
623	>	#define SIGSEGV_THREAD_STATE_COUNT              PPC_THREAD_STATE64_COUNT
624	>	#define SIGSEGV_FAULT_INSTRUCTION               SIP->thr_state.srr0
625	>	#define SIGSEGV_SKIP_INSTRUCTION                powerpc_skip_instruction
626	>	#define SIGSEGV_REGISTER_FILE                   (unsigned long *)&SIP->thr_state.srr0, (unsigned long *)&SIP->thr_state.r0
627	>	#endif
628	>	#ifdef __i386__
629	>	#define SIGSEGV_EXCEPTION_STATE_TYPE    struct i386_exception_state
630	>	#define SIGSEGV_EXCEPTION_STATE_FLAVOR  i386_EXCEPTION_STATE
631	>	#define SIGSEGV_EXCEPTION_STATE_COUNT   i386_EXCEPTION_STATE_COUNT
632	>	#define SIGSEGV_FAULT_ADDRESS                   SIP->exc_state.faultvaddr
633	>	#define SIGSEGV_THREAD_STATE_TYPE               struct i386_thread_state
634	>	#define SIGSEGV_THREAD_STATE_FLAVOR             i386_THREAD_STATE
635	>	#define SIGSEGV_THREAD_STATE_COUNT              i386_THREAD_STATE_COUNT
636	>	#define SIGSEGV_FAULT_INSTRUCTION               SIP->thr_state.eip
637	>	#define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
638	>	#define SIGSEGV_REGISTER_FILE                   ((unsigned long *)&SIP->thr_state.eax) /* EAX is the first GPR we consider */
639	>	#endif
640	>	#ifdef __x86_64__
641	>	#define SIGSEGV_EXCEPTION_STATE_TYPE    struct x86_exception_state64
642	>	#define SIGSEGV_EXCEPTION_STATE_FLAVOR  x86_EXCEPTION_STATE64
643	>	#define SIGSEGV_EXCEPTION_STATE_COUNT   x86_EXCEPTION_STATE64_COUNT
644	>	#define SIGSEGV_FAULT_ADDRESS                   SIP->exc_state.faultvaddr
645	>	#define SIGSEGV_THREAD_STATE_TYPE               struct x86_thread_state64
646	>	#define SIGSEGV_THREAD_STATE_FLAVOR             x86_THREAD_STATE64
647	>	#define SIGSEGV_THREAD_STATE_COUNT              x86_THREAD_STATE64_COUNT
648	>	#define SIGSEGV_FAULT_INSTRUCTION               SIP->thr_state.rip
649	>	#define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
650	>	#define SIGSEGV_REGISTER_FILE                   ((unsigned long *)&SIP->thr_state.rax) /* RAX is the first GPR we consider */
651		#endif
652	+	#define SIGSEGV_FAULT_ADDRESS_FAST              code[1]
653	+	#define SIGSEGV_FAULT_INSTRUCTION_FAST  SIGSEGV_INVALID_ADDRESS
654	+	#define SIGSEGV_FAULT_HANDLER_ARGLIST   mach_port_t thread, exception_data_t code
655	+	#define SIGSEGV_FAULT_HANDLER_ARGS              thread, code
656
657		// Since there can only be one exception thread running at any time
658		// this is not a problem.
#	Line 642 | Line 742 | enum {
742		#endif
743		};
744		#endif
745	<	#if defined(__NetBSD__) || defined(__FreeBSD__)
745	>	#if defined(__NetBSD__)
746	>	enum {
747	>	#if (defined(i386) || defined(__i386__))
748	>	X86_REG_EIP = _REG_EIP,
749	>	X86_REG_EAX = _REG_EAX,
750	>	X86_REG_ECX = _REG_ECX,
751	>	X86_REG_EDX = _REG_EDX,
752	>	X86_REG_EBX = _REG_EBX,
753	>	X86_REG_ESP = _REG_ESP,
754	>	X86_REG_EBP = _REG_EBP,
755	>	X86_REG_ESI = _REG_ESI,
756	>	X86_REG_EDI = _REG_EDI
757	>	#endif
758	>	};
759	>	#endif
760	>	#if defined(__FreeBSD__)
761		enum {
762		#if (defined(i386) || defined(__i386__))
763		X86_REG_EIP = 10,
#	Line 657 | Line 772 | enum {
772		#endif
773		};
774		#endif
775	+	#if defined(__OpenBSD__)
776	+	enum {
777	+	#if defined(__i386__)
778	+	// EDI is the first register we consider
779	+	#define OREG(REG) offsetof(struct sigcontext, sc_##REG)
780	+	#define DREG(REG) ((OREG(REG) - OREG(edi)) / 4)
781	+	X86_REG_EIP = DREG(eip), // 7
782	+	X86_REG_EAX = DREG(eax), // 6
783	+	X86_REG_ECX = DREG(ecx), // 5
784	+	X86_REG_EDX = DREG(edx), // 4
785	+	X86_REG_EBX = DREG(ebx), // 3
786	+	X86_REG_ESP = DREG(esp), // 10
787	+	X86_REG_EBP = DREG(ebp), // 2
788	+	X86_REG_ESI = DREG(esi), // 1
789	+	X86_REG_EDI = DREG(edi)  // 0
790	+	#undef DREG
791	+	#undef OREG
792	+	#endif
793	+	};
794	+	#endif
795	+	#if defined(__sun__)
796	+	// Same as for Linux, need to check for x86-64
797	+	enum {
798	+	#if defined(__i386__)
799	+	X86_REG_EIP = EIP,
800	+	X86_REG_EAX = EAX,
801	+	X86_REG_ECX = ECX,
802	+	X86_REG_EDX = EDX,
803	+	X86_REG_EBX = EBX,
804	+	X86_REG_ESP = ESP,
805	+	X86_REG_EBP = EBP,
806	+	X86_REG_ESI = ESI,
807	+	X86_REG_EDI = EDI
808	+	#endif
809	+	};
810	+	#endif
811	+	#if defined(__APPLE__) && defined(__MACH__)
812	+	enum {
813	+	#if (defined(i386) || defined(__i386__))
814	+	#ifdef i386_SAVED_STATE
815	+	// same as FreeBSD (in Open Darwin 8.0.1)
816	+	X86_REG_EIP = 10,
817	+	X86_REG_EAX = 7,
818	+	X86_REG_ECX = 6,
819	+	X86_REG_EDX = 5,
820	+	X86_REG_EBX = 4,
821	+	X86_REG_ESP = 13,
822	+	X86_REG_EBP = 2,
823	+	X86_REG_ESI = 1,
824	+	X86_REG_EDI = 0
825	+	#else
826	+	// new layout (MacOS X 10.4.4 for x86)
827	+	X86_REG_EIP = 10,
828	+	X86_REG_EAX = 0,
829	+	X86_REG_ECX = 2,
830	+	X86_REG_EDX = 3,
831	+	X86_REG_EBX = 1,
832	+	X86_REG_ESP = 7,
833	+	X86_REG_EBP = 6,
834	+	X86_REG_ESI = 5,
835	+	X86_REG_EDI = 4
836	+	#endif
837	+	#endif
838	+	#if defined(__x86_64__)
839	+	X86_REG_R8  = 8,
840	+	X86_REG_R9  = 9,
841	+	X86_REG_R10 = 10,
842	+	X86_REG_R11 = 11,
843	+	X86_REG_R12 = 12,
844	+	X86_REG_R13 = 13,
845	+	X86_REG_R14 = 14,
846	+	X86_REG_R15 = 15,
847	+	X86_REG_EDI = 4,
848	+	X86_REG_ESI = 5,
849	+	X86_REG_EBP = 6,
850	+	X86_REG_EBX = 1,
851	+	X86_REG_EDX = 3,
852	+	X86_REG_EAX = 0,
853	+	X86_REG_ECX = 2,
854	+	X86_REG_ESP = 7,
855	+	X86_REG_EIP = 16
856	+	#endif
857	+	};
858	+	#endif
859	+	#if defined(_WIN32)
860	+	enum {
861	+	#if (defined(i386) || defined(__i386__))
862	+	X86_REG_EIP = 7,
863	+	X86_REG_EAX = 5,
864	+	X86_REG_ECX = 4,
865	+	X86_REG_EDX = 3,
866	+	X86_REG_EBX = 2,
867	+	X86_REG_ESP = 10,
868	+	X86_REG_EBP = 6,
869	+	X86_REG_ESI = 1,
870	+	X86_REG_EDI = 0
871	+	#endif
872	+	};
873	+	#endif
874		// FIXME: this is partly redundant with the instruction decoding phase
875		// to discover transfer type and register number
876		static inline int ix86_step_over_modrm(unsigned char * p)
#	Line 697 | Line 911 | static bool ix86_skip_instruction(unsign
911
912		if (eip == 0)
913		return false;
914	+	#ifdef _WIN32
915	+	if (IsBadCodePtr((FARPROC)eip))
916	+	return false;
917	+	#endif
918
919	+	enum instruction_type_t {
920	+	i_MOV,
921	+	i_ADD
922	+	};
923	+
924		transfer_type_t transfer_type = SIGSEGV_TRANSFER_UNKNOWN;
925		transfer_size_t transfer_size = SIZE_LONG;
926	+	instruction_type_t instruction_type = i_MOV;
927
928		int reg = -1;
929		int len = 0;
#	Line 750 | Line 974 | static bool ix86_skip_instruction(unsign
974		#endif
975
976		// Decode instruction
977	+	int op_len = 1;
978	+	int target_size = SIZE_UNKNOWN;
979		switch (eip[0]) {
980		case 0x0f:
981	+	target_size = transfer_size;
982		switch (eip[1]) {
983	+	case 0xbe: // MOVSX r32, r/m8
984		case 0xb6: // MOVZX r32, r/m8
985	+	transfer_size = SIZE_BYTE;
986	+	goto do_mov_extend;
987	+	case 0xbf: // MOVSX r32, r/m16
988		case 0xb7: // MOVZX r32, r/m16
989	<	switch (eip[2] & 0xc0) {
990	<	case 0x80:
991	<	reg = (eip[2] >> 3) & 7;
992	<	transfer_type = SIGSEGV_TRANSFER_LOAD;
993	<	break;
763	<	case 0x40:
764	<	reg = (eip[2] >> 3) & 7;
765	<	transfer_type = SIGSEGV_TRANSFER_LOAD;
766	<	break;
767	<	case 0x00:
768	<	reg = (eip[2] >> 3) & 7;
769	<	transfer_type = SIGSEGV_TRANSFER_LOAD;
770	<	break;
989	>	transfer_size = SIZE_WORD;
990	>	goto do_mov_extend;
991	>	do_mov_extend:
992	>	op_len = 2;
993	>	goto do_transfer_load;
994		}
772	–	len += 3 + ix86_step_over_modrm(eip + 2);
995		break;
996	<	}
997	<	break;
996	>	#if defined(__x86_64__)
997	>	case 0x63: // MOVSXD r64, r/m32
998	>	if (has_rex && rex.W) {
999	>	transfer_size = SIZE_LONG;
1000	>	target_size = SIZE_QUAD;
1001	>	}
1002	>	else if (transfer_size != SIZE_WORD) {
1003	>	transfer_size = SIZE_LONG;
1004	>	target_size = SIZE_QUAD;
1005	>	}
1006	>	goto do_transfer_load;
1007	>	#endif
1008	>	case 0x02: // ADD r8, r/m8
1009	>	transfer_size = SIZE_BYTE;
1010	>	case 0x03: // ADD r32, r/m32
1011	>	instruction_type = i_ADD;
1012	>	goto do_transfer_load;
1013		case 0x8a: // MOV r8, r/m8
1014		transfer_size = SIZE_BYTE;
1015		case 0x8b: // MOV r32, r/m32 (or 16-bit operation)
1016	<	switch (eip[1] & 0xc0) {
1016	>	do_transfer_load:
1017	>	switch (eip[op_len] & 0xc0) {
1018		case 0x80:
1019	<	reg = (eip[1] >> 3) & 7;
1019	>	reg = (eip[op_len] >> 3) & 7;
1020		transfer_type = SIGSEGV_TRANSFER_LOAD;
1021		break;
1022		case 0x40:
1023	<	reg = (eip[1] >> 3) & 7;
1023	>	reg = (eip[op_len] >> 3) & 7;
1024		transfer_type = SIGSEGV_TRANSFER_LOAD;
1025		break;
1026		case 0x00:
1027	<	reg = (eip[1] >> 3) & 7;
1027	>	reg = (eip[op_len] >> 3) & 7;
1028		transfer_type = SIGSEGV_TRANSFER_LOAD;
1029		break;
1030		}
1031	<	len += 2 + ix86_step_over_modrm(eip + 1);
1031	>	len += 1 + op_len + ix86_step_over_modrm(eip + op_len);
1032		break;
1033	+	case 0x00: // ADD r/m8, r8
1034	+	transfer_size = SIZE_BYTE;
1035	+	case 0x01: // ADD r/m32, r32
1036	+	instruction_type = i_ADD;
1037	+	goto do_transfer_store;
1038		case 0x88: // MOV r/m8, r8
1039		transfer_size = SIZE_BYTE;
1040		case 0x89: // MOV r/m32, r32 (or 16-bit operation)
1041	<	switch (eip[1] & 0xc0) {
1041	>	do_transfer_store:
1042	>	switch (eip[op_len] & 0xc0) {
1043		case 0x80:
1044	<	reg = (eip[1] >> 3) & 7;
1044	>	reg = (eip[op_len] >> 3) & 7;
1045		transfer_type = SIGSEGV_TRANSFER_STORE;
1046		break;
1047		case 0x40:
1048	<	reg = (eip[1] >> 3) & 7;
1048	>	reg = (eip[op_len] >> 3) & 7;
1049		transfer_type = SIGSEGV_TRANSFER_STORE;
1050		break;
1051		case 0x00:
1052	<	reg = (eip[1] >> 3) & 7;
1052	>	reg = (eip[op_len] >> 3) & 7;
1053		transfer_type = SIGSEGV_TRANSFER_STORE;
1054		break;
1055		}
1056	<	len += 2 + ix86_step_over_modrm(eip + 1);
1056	>	len += 1 + op_len + ix86_step_over_modrm(eip + op_len);
1057		break;
1058		}
1059	+	if (target_size == SIZE_UNKNOWN)
1060	+	target_size = transfer_size;
1061
1062		if (transfer_type == SIGSEGV_TRANSFER_UNKNOWN) {
1063		// Unknown machine code, let it crash. Then patch the decoder
#	Line 823 | Line 1069 | static bool ix86_skip_instruction(unsign
1069		reg += 8;
1070		#endif
1071
1072	<	if (transfer_type == SIGSEGV_TRANSFER_LOAD && reg != -1) {
1072	>	if (instruction_type == i_MOV && transfer_type == SIGSEGV_TRANSFER_LOAD && reg != -1) {
1073		static const int x86_reg_map[] = {
1074		X86_REG_EAX, X86_REG_ECX, X86_REG_EDX, X86_REG_EBX,
1075		X86_REG_ESP, X86_REG_EBP, X86_REG_ESI, X86_REG_EDI,
#	Line 839 | Line 1085 | static bool ix86_skip_instruction(unsign
1085		// Set 0 to the relevant register part
1086		// NOTE: this is only valid for MOV alike instructions
1087		int rloc = x86_reg_map[reg];
1088	<	switch (transfer_size) {
1088	>	switch (target_size) {
1089		case SIZE_BYTE:
1090		if (has_rex || reg < 4)
1091		regs[rloc] = (regs[rloc] & ~0x00ffL);
#	Line 859 | Line 1105 | static bool ix86_skip_instruction(unsign
1105		}
1106
1107		#if DEBUG
1108	<	printf("%08x: %s %s access", regs[X86_REG_EIP],
1108	>	printf("%p: %s %s access", (void *)regs[X86_REG_EIP],
1109		transfer_size == SIZE_BYTE ? "byte" :
1110		transfer_size == SIZE_WORD ? "word" :
1111		transfer_size == SIZE_LONG ? "long" :
#	Line 893 | Line 1139 | static bool ix86_skip_instruction(unsign
1139		"r12", "r13", "r14", "r15",
1140		};
1141		const char * reg_str = NULL;
1142	<	switch (transfer_size) {
1142	>	switch (target_size) {
1143		case SIZE_BYTE:
1144		reg_str = x86_byte_reg_str_map[(!has_rex && reg >= 4 ? 12 : 0) + reg];
1145		break;
#	Line 915 | Line 1161 | static bool ix86_skip_instruction(unsign
1161		#endif
1162
1163		// Decode and skip PPC instruction
1164	<	#if (defined(powerpc) || defined(__powerpc__) || defined(__ppc__))
1165	<	static bool powerpc_skip_instruction(unsigned int * nip_p, unsigned int * regs)
1164	>	#if (defined(powerpc) || defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__))
1165	>	static bool powerpc_skip_instruction(unsigned long * nip_p, unsigned long * regs)
1166		{
1167		instruction_t instr;
1168		powerpc_decode_instruction(&instr, *nip_p, regs);
#	Line 928 | Line 1174 | static bool powerpc_skip_instruction(uns
1174
1175		#if DEBUG
1176		printf("%08x: %s %s access", *nip_p,
1177	<	instr.transfer_size == SIZE_BYTE ? "byte" : instr.transfer_size == SIZE_WORD ? "word" : "long",
1177	>	instr.transfer_size == SIZE_BYTE ? "byte" :
1178	>	instr.transfer_size == SIZE_WORD ? "word" :
1179	>	instr.transfer_size == SIZE_LONG ? "long" : "quad",
1180		instr.transfer_type == SIGSEGV_TRANSFER_LOAD ? "read" : "write");
1181
1182		if (instr.addr_mode == MODE_U || instr.addr_mode == MODE_UX)
#	Line 949 | Line 1197 | static bool powerpc_skip_instruction(uns
1197
1198		// Decode and skip MIPS instruction
1199		#if (defined(mips) || defined(__mips))
1200	<	enum {
953	<	#if (defined(sgi) || defined(__sgi))
954	<	MIPS_REG_EPC = 35,
955	<	#endif
956	<	};
957	<	static bool mips_skip_instruction(greg_t * regs)
1200	>	static bool mips_skip_instruction(greg_t * pc_p, greg_t * regs)
1201		{
1202	<	unsigned int * epc = (unsigned int *)(unsigned long)regs[MIPS_REG_EPC];
1202	>	unsigned int * epc = (unsigned int *)(unsigned long)*pc_p;
1203
1204		if (epc == 0)
1205		return false;
#	Line 1105 | Line 1348 | static bool mips_skip_instruction(greg_t
1348		mips_gpr_names[reg]);
1349		#endif
1350
1351	<	regs[MIPS_REG_EPC] += 4;
1351	>	*pc_p += 4;
1352		return true;
1353		}
1354		#endif
#	Line 1117 | Line 1360 | enum {
1360		SPARC_REG_G1 = REG_G1,
1361		SPARC_REG_O0 = REG_O0,
1362		SPARC_REG_PC = REG_PC,
1363	+	SPARC_REG_nPC = REG_nPC
1364		#endif
1365		};
1366		static bool sparc_skip_instruction(unsigned long * regs, gwindows_t * gwins, struct rwindow * rwin)
#	Line 1180 | Line 1424 | static bool sparc_skip_instruction(unsig
1424		break;
1425		case 7: // Store Doubleword
1426		transfer_type = SIGSEGV_TRANSFER_STORE;
1427	<	transfer_size = SIZE_WORD;
1427	>	transfer_size = SIZE_LONG;
1428		register_pair = true;
1429		break;
1430		}
#	Line 1190 | Line 1434 | static bool sparc_skip_instruction(unsig
1434		return false;
1435		}
1436
1193	–	// Zero target register in case of a load operation
1437		const int reg = (opcode >> 25) & 0x1f;
1438	+
1439	+	#if DEBUG
1440	+	static const char * reg_names[] = {
1441	+	"g0", "g1", "g2", "g3", "g4", "g5", "g6", "g7",
1442	+	"o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7",
1443	+	"l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7",
1444	+	"i0", "i1", "i2", "i3", "i4", "i5", "fp", "i7"
1445	+	};
1446	+	printf("%s %s register %s\n",
1447	+	transfer_size == SIZE_BYTE ? "byte" :
1448	+	transfer_size == SIZE_WORD ? "word" :
1449	+	transfer_size == SIZE_LONG ? "long" :
1450	+	transfer_size == SIZE_QUAD ? "quad" : "unknown",
1451	+	transfer_type == SIGSEGV_TRANSFER_LOAD ? "load to" : "store from",
1452	+	reg_names[reg]);
1453	+	#endif
1454	+
1455	+	// Zero target register in case of a load operation
1456		if (transfer_type == SIGSEGV_TRANSFER_LOAD && reg != 0) {
1457		// FIXME: code to handle local & input registers is not tested
1458	<	if (reg >= 1 && reg <= 7) {
1458	>	if (reg >= 1 && reg < 8) {
1459		// global registers
1460		regs[reg - 1 + SPARC_REG_G1] = 0;
1461		}
1462	<	else if (reg >= 8 && reg <= 15) {
1462	>	else if (reg >= 8 && reg < 16) {
1463		// output registers
1464		regs[reg - 8 + SPARC_REG_O0] = 0;
1465		}
1466	<	else if (reg >= 16 && reg <= 23) {
1466	>	else if (reg >= 16 && reg < 24) {
1467		// local registers (in register windows)
1468		if (gwins)
1469		gwins->wbuf->rw_local[reg - 16] = 0;
#	Line 1218 | Line 1479 | static bool sparc_skip_instruction(unsig
1479		}
1480		}
1481
1482	+	regs[SPARC_REG_PC] += 4;
1483	+	regs[SPARC_REG_nPC] += 4;
1484	+	return true;
1485	+	}
1486	+	#endif
1487	+	#endif
1488	+
1489	+	// Decode and skip ARM instruction
1490	+	#if (defined(arm) || defined(__arm__))
1491	+	enum {
1492	+	#if (defined(__linux__))
1493	+	ARM_REG_PC = 15,
1494	+	ARM_REG_CPSR = 16
1495	+	#endif
1496	+	};
1497	+	static bool arm_skip_instruction(unsigned long * regs)
1498	+	{
1499	+	unsigned int * pc = (unsigned int *)regs[ARM_REG_PC];
1500	+
1501	+	if (pc == 0)
1502	+	return false;
1503	+
1504	+	#if DEBUG
1505	+	printf("IP: %p [%08x]\n", pc, pc[0]);
1506	+	#endif
1507	+
1508	+	transfer_type_t transfer_type = SIGSEGV_TRANSFER_UNKNOWN;
1509	+	transfer_size_t transfer_size = SIZE_UNKNOWN;
1510	+	enum { op_sdt = 1, op_sdth = 2 };
1511	+	int op = 0;
1512	+
1513	+	// Handle load/store instructions only
1514	+	const unsigned int opcode = pc[0];
1515	+	switch ((opcode >> 25) & 7) {
1516	+	case 0: // Halfword and Signed Data Transfer (LDRH, STRH, LDRSB, LDRSH)
1517	+	op = op_sdth;
1518	+	// Determine transfer size (S/H bits)
1519	+	switch ((opcode >> 5) & 3) {
1520	+	case 0: // SWP instruction
1521	+	break;
1522	+	case 1: // Unsigned halfwords
1523	+	case 3: // Signed halfwords
1524	+	transfer_size = SIZE_WORD;
1525	+	break;
1526	+	case 2: // Signed byte
1527	+	transfer_size = SIZE_BYTE;
1528	+	break;
1529	+	}
1530	+	break;
1531	+	case 2:
1532	+	case 3: // Single Data Transfer (LDR, STR)
1533	+	op = op_sdt;
1534	+	// Determine transfer size (B bit)
1535	+	if (((opcode >> 22) & 1) == 1)
1536	+	transfer_size = SIZE_BYTE;
1537	+	else
1538	+	transfer_size = SIZE_LONG;
1539	+	break;
1540	+	default:
1541	+	// FIXME: support load/store mutliple?
1542	+	return false;
1543	+	}
1544	+
1545	+	// Check for invalid transfer size (SWP instruction?)
1546	+	if (transfer_size == SIZE_UNKNOWN)
1547	+	return false;
1548	+
1549	+	// Determine transfer type (L bit)
1550	+	if (((opcode >> 20) & 1) == 1)
1551	+	transfer_type = SIGSEGV_TRANSFER_LOAD;
1552	+	else
1553	+	transfer_type = SIGSEGV_TRANSFER_STORE;
1554	+
1555	+	// Compute offset
1556	+	int offset;
1557	+	if (((opcode >> 25) & 1) == 0) {
1558	+	if (op == op_sdt)
1559	+	offset = opcode & 0xfff;
1560	+	else if (op == op_sdth) {
1561	+	int rm = opcode & 0xf;
1562	+	if (((opcode >> 22) & 1) == 0) {
1563	+	// register offset
1564	+	offset = regs[rm];
1565	+	}
1566	+	else {
1567	+	// immediate offset
1568	+	offset = ((opcode >> 4) & 0xf0) | (opcode & 0x0f);
1569	+	}
1570	+	}
1571	+	}
1572	+	else {
1573	+	const int rm = opcode & 0xf;
1574	+	const int sh = (opcode >> 7) & 0x1f;
1575	+	if (((opcode >> 4) & 1) == 1) {
1576	+	// we expect only legal load/store instructions
1577	+	printf("FATAL: invalid shift operand\n");
1578	+	return false;
1579	+	}
1580	+	const unsigned int v = regs[rm];
1581	+	switch ((opcode >> 5) & 3) {
1582	+	case 0: // logical shift left
1583	+	offset = sh ? v << sh : v;
1584	+	break;
1585	+	case 1: // logical shift right
1586	+	offset = sh ? v >> sh : 0;
1587	+	break;
1588	+	case 2: // arithmetic shift right
1589	+	if (sh)
1590	+	offset = ((signed int)v) >> sh;
1591	+	else
1592	+	offset = (v & 0x80000000) ? 0xffffffff : 0;
1593	+	break;
1594	+	case 3: // rotate right
1595	+	if (sh)
1596	+	offset = (v >> sh) | (v << (32 - sh));
1597	+	else
1598	+	offset = (v >> 1) | ((regs[ARM_REG_CPSR] << 2) & 0x80000000);
1599	+	break;
1600	+	}
1601	+	}
1602	+	if (((opcode >> 23) & 1) == 0)
1603	+	offset = -offset;
1604	+
1605	+	int rd = (opcode >> 12) & 0xf;
1606	+	int rn = (opcode >> 16) & 0xf;
1607		#if DEBUG
1608		static const char * reg_names[] = {
1609	<	"g0", "g1", "g2", "g3", "g4", "g5", "g6", "g7",
1610	<	"o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7",
1225	<	"l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7",
1226	<	"i0", "i1", "i2", "i3", "i4", "i5", "fp", "i7"
1609	>	"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
1610	>	"r9", "r9", "sl", "fp", "ip", "sp", "lr", "pc"
1611		};
1612		printf("%s %s register %s\n",
1613		transfer_size == SIZE_BYTE ? "byte" :
1614		transfer_size == SIZE_WORD ? "word" :
1615	<	transfer_size == SIZE_LONG ? "long" :
1232	<	transfer_size == SIZE_QUAD ? "quad" : "unknown",
1615	>	transfer_size == SIZE_LONG ? "long" : "unknown",
1616		transfer_type == SIGSEGV_TRANSFER_LOAD ? "load to" : "store from",
1617	<	reg_names[reg]);
1617	>	reg_names[rd]);
1618		#endif
1619
1620	<	regs[SPARC_REG_PC] += 4;
1620	>	unsigned int base = regs[rn];
1621	>	if (((opcode >> 24) & 1) == 1)
1622	>	base += offset;
1623	>
1624	>	if (transfer_type == SIGSEGV_TRANSFER_LOAD)
1625	>	regs[rd] = 0;
1626	>
1627	>	if (((opcode >> 24) & 1) == 0)                // post-index addressing
1628	>	regs[rn] += offset;
1629	>	else if (((opcode >> 21) & 1) == 1)   // write-back address into base
1630	>	regs[rn] = base;
1631	>
1632	>	regs[ARM_REG_PC] += 4;
1633		return true;
1634		}
1635		#endif
1636	<	#endif
1636	>
1637
1638		// Fallbacks
1639	+	#ifndef SIGSEGV_FAULT_ADDRESS_FAST
1640	+	#define SIGSEGV_FAULT_ADDRESS_FAST              SIGSEGV_FAULT_ADDRESS
1641	+	#endif
1642	+	#ifndef SIGSEGV_FAULT_INSTRUCTION_FAST
1643	+	#define SIGSEGV_FAULT_INSTRUCTION_FAST  SIGSEGV_FAULT_INSTRUCTION
1644	+	#endif
1645		#ifndef SIGSEGV_FAULT_INSTRUCTION
1646	<	#define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_INVALID_PC
1646	>	#define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_INVALID_ADDRESS
1647		#endif
1648		#ifndef SIGSEGV_FAULT_HANDLER_ARGLIST_1
1649		#define SIGSEGV_FAULT_HANDLER_ARGLIST_1 SIGSEGV_FAULT_HANDLER_ARGLIST
1650		#endif
1651		#ifndef SIGSEGV_FAULT_HANDLER_INVOKE
1652	<	#define SIGSEGV_FAULT_HANDLER_INVOKE(ADDR, IP)  sigsegv_fault_handler(ADDR, IP)
1652	>	#define SIGSEGV_FAULT_HANDLER_INVOKE(P) sigsegv_fault_handler(P)
1653		#endif
1654
1655		// SIGSEGV recovery supported ?
#	Line 1261 | Line 1662 | static bool sparc_skip_instruction(unsig
1662		*  SIGSEGV global handler
1663		*/
1664
1665	<	#if defined(HAVE_SIGSEGV_RECOVERY) || defined(HAVE_MACH_EXCEPTIONS)
1665	>	struct sigsegv_info_t {
1666	>	sigsegv_address_t addr;
1667	>	sigsegv_address_t pc;
1668	>	#ifdef HAVE_MACH_EXCEPTIONS
1669	>	mach_port_t thread;
1670	>	bool has_exc_state;
1671	>	SIGSEGV_EXCEPTION_STATE_TYPE exc_state;
1672	>	mach_msg_type_number_t exc_state_count;
1673	>	bool has_thr_state;
1674	>	SIGSEGV_THREAD_STATE_TYPE thr_state;
1675	>	mach_msg_type_number_t thr_state_count;
1676	>	#endif
1677	>	};
1678	>
1679	>	#ifdef HAVE_MACH_EXCEPTIONS
1680	>	static void mach_get_exception_state(sigsegv_info_t *SIP)
1681	>	{
1682	>	SIP->exc_state_count = SIGSEGV_EXCEPTION_STATE_COUNT;
1683	>	kern_return_t krc = thread_get_state(SIP->thread,
1684	>	SIGSEGV_EXCEPTION_STATE_FLAVOR,
1685	>	(natural_t *)&SIP->exc_state,
1686	>	&SIP->exc_state_count);
1687	>	MACH_CHECK_ERROR(thread_get_state, krc);
1688	>	SIP->has_exc_state = true;
1689	>	}
1690	>
1691	>	static void mach_get_thread_state(sigsegv_info_t *SIP)
1692	>	{
1693	>	SIP->thr_state_count = SIGSEGV_THREAD_STATE_COUNT;
1694	>	kern_return_t krc = thread_get_state(SIP->thread,
1695	>	SIGSEGV_THREAD_STATE_FLAVOR,
1696	>	(natural_t *)&SIP->thr_state,
1697	>	&SIP->thr_state_count);
1698	>	MACH_CHECK_ERROR(thread_get_state, krc);
1699	>	SIP->has_thr_state = true;
1700	>	}
1701	>
1702	>	static void mach_set_thread_state(sigsegv_info_t *SIP)
1703	>	{
1704	>	kern_return_t krc = thread_set_state(SIP->thread,
1705	>	SIGSEGV_THREAD_STATE_FLAVOR,
1706	>	(natural_t *)&SIP->thr_state,
1707	>	SIP->thr_state_count);
1708	>	MACH_CHECK_ERROR(thread_set_state, krc);
1709	>	}
1710	>	#endif
1711	>
1712	>	// Return the address of the invalid memory reference
1713	>	sigsegv_address_t sigsegv_get_fault_address(sigsegv_info_t *SIP)
1714	>	{
1715	>	#ifdef HAVE_MACH_EXCEPTIONS
1716	>	static int use_fast_path = -1;
1717	>	if (use_fast_path != 1 && !SIP->has_exc_state) {
1718	>	mach_get_exception_state(SIP);
1719	>
1720	>	sigsegv_address_t addr = (sigsegv_address_t)SIGSEGV_FAULT_ADDRESS;
1721	>	if (use_fast_path < 0)
1722	>	use_fast_path = addr == SIP->addr;
1723	>	SIP->addr = addr;
1724	>	}
1725	>	#endif
1726	>	return SIP->addr;
1727	>	}
1728	>
1729	>	// Return the address of the instruction that caused the fault, or
1730	>	// SIGSEGV_INVALID_ADDRESS if we could not retrieve this information
1731	>	sigsegv_address_t sigsegv_get_fault_instruction_address(sigsegv_info_t *SIP)
1732	>	{
1733	>	#ifdef HAVE_MACH_EXCEPTIONS
1734	>	if (!SIP->has_thr_state) {
1735	>	mach_get_thread_state(SIP);
1736	>
1737	>	SIP->pc = (sigsegv_address_t)SIGSEGV_FAULT_INSTRUCTION;
1738	>	}
1739	>	#endif
1740	>	return SIP->pc;
1741	>	}
1742	>
1743		// This function handles the badaccess to memory.
1744		// It is called from the signal handler or the exception handler.
1745		static bool handle_badaccess(SIGSEGV_FAULT_HANDLER_ARGLIST_1)
1746		{
1747	<	sigsegv_address_t fault_address = (sigsegv_address_t)SIGSEGV_FAULT_ADDRESS;
1748	<	sigsegv_address_t fault_instruction = (sigsegv_address_t)SIGSEGV_FAULT_INSTRUCTION;
1749	<
1747	>	sigsegv_info_t SI;
1748	>	SI.addr = (sigsegv_address_t)SIGSEGV_FAULT_ADDRESS_FAST;
1749	>	SI.pc = (sigsegv_address_t)SIGSEGV_FAULT_INSTRUCTION_FAST;
1750	>	#ifdef HAVE_MACH_EXCEPTIONS
1751	>	SI.thread = thread;
1752	>	SI.has_exc_state = false;
1753	>	SI.has_thr_state = false;
1754	>	#endif
1755	>	sigsegv_info_t * const SIP = &SI;
1756	>
1757		// Call user's handler and reinstall the global handler, if required
1758	<	switch (SIGSEGV_FAULT_HANDLER_INVOKE(fault_address, fault_instruction)) {
1758	>	switch (SIGSEGV_FAULT_HANDLER_INVOKE(SIP)) {
1759		case SIGSEGV_RETURN_SUCCESS:
1760		return true;
1761
#	Line 1278 | Line 1763 | static bool handle_badaccess(SIGSEGV_FAU
1763		case SIGSEGV_RETURN_SKIP_INSTRUCTION:
1764		// Call the instruction skipper with the register file
1765		// available
1766	+	#ifdef HAVE_MACH_EXCEPTIONS
1767	+	if (!SIP->has_thr_state)
1768	+	mach_get_thread_state(SIP);
1769	+	#endif
1770		if (SIGSEGV_SKIP_INSTRUCTION(SIGSEGV_REGISTER_FILE)) {
1771		#ifdef HAVE_MACH_EXCEPTIONS
1772		// Unlike UNIX signals where the thread state
1773		// is modified off of the stack, in Mach we
1774		// need to actually call thread_set_state to
1775		// have the register values updated.
1776	<	kern_return_t krc;
1288	<
1289	<	krc = thread_set_state(thread,
1290	<	MACHINE_THREAD_STATE, (thread_state_t)state,
1291	<	MACHINE_THREAD_STATE_COUNT);
1292	<	MACH_CHECK_ERROR (thread_get_state, krc);
1776	>	mach_set_thread_state(SIP);
1777		#endif
1778		return true;
1779		}
1780		break;
1781		#endif
1782	+	case SIGSEGV_RETURN_FAILURE:
1783	+	// We can't do anything with the fault_address, dump state?
1784	+	if (sigsegv_state_dumper != 0)
1785	+	sigsegv_state_dumper(SIP);
1786	+	break;
1787		}
1299	–
1300	–	// We can't do anything with the fault_address, dump state?
1301	–	if (sigsegv_state_dumper != 0)
1302	–	sigsegv_state_dumper(fault_address, fault_instruction);
1788
1789		return false;
1790		}
1306	–	#endif
1791
1792
1793		/*
#	Line 1340 | Line 1824 | forward_exception(mach_port_t thread_por
1824		mach_port_t port;
1825		exception_behavior_t behavior;
1826		thread_state_flavor_t flavor;
1827	<	thread_state_t thread_state;
1827	>	thread_state_data_t thread_state;
1828		mach_msg_type_number_t thread_state_count;
1829
1830		for (portIndex = 0; portIndex < oldExceptionPorts->maskCount; portIndex++) {
#	Line 1359 | Line 1843 | forward_exception(mach_port_t thread_por
1843		behavior = oldExceptionPorts->behaviors[portIndex];
1844		flavor = oldExceptionPorts->flavors[portIndex];
1845
1846	+	if (!VALID_THREAD_STATE_FLAVOR(flavor)) {
1847	+	fprintf(stderr, "Invalid thread_state flavor = %d. Not forwarding\n", flavor);
1848	+	return KERN_FAILURE;
1849	+	}
1850	+
1851		/*
1852		fprintf(stderr, "forwarding exception, port = 0x%x, behaviour = %d, flavor = %d\n", port, behavior, flavor);
1853		*/
1854
1855		if (behavior != EXCEPTION_DEFAULT) {
1856		thread_state_count = THREAD_STATE_MAX;
1857	<	kret = thread_get_state (thread_port, flavor, thread_state,
1857	>	kret = thread_get_state (thread_port, flavor, (natural_t *)&thread_state,
1858		&thread_state_count);
1859		MACH_CHECK_ERROR (thread_get_state, kret);
1860		}
#	Line 1381 | Line 1870 | forward_exception(mach_port_t thread_por
1870		// fprintf(stderr, "forwarding to exception_raise_state\n");
1871		kret = exception_raise_state(port, exception_type, exception_data,
1872		data_count, &flavor,
1873	<	thread_state, thread_state_count,
1874	<	thread_state, &thread_state_count);
1873	>	(natural_t *)&thread_state, thread_state_count,
1874	>	(natural_t *)&thread_state, &thread_state_count);
1875		MACH_CHECK_ERROR (exception_raise_state, kret);
1876		break;
1877		case EXCEPTION_STATE_IDENTITY:
#	Line 1390 | Line 1879 | forward_exception(mach_port_t thread_por
1879		kret = exception_raise_state_identity(port, thread_port, task_port,
1880		exception_type, exception_data,
1881		data_count, &flavor,
1882	<	thread_state, thread_state_count,
1883	<	thread_state, &thread_state_count);
1882	>	(natural_t *)&thread_state, thread_state_count,
1883	>	(natural_t *)&thread_state, &thread_state_count);
1884		MACH_CHECK_ERROR (exception_raise_state_identity, kret);
1885		break;
1886		default:
1887		fprintf(stderr, "forward_exception got unknown behavior\n");
1888	+	kret = KERN_FAILURE;
1889		break;
1890		}
1891
1892		if (behavior != EXCEPTION_DEFAULT) {
1893	<	kret = thread_set_state (thread_port, flavor, thread_state,
1893	>	kret = thread_set_state (thread_port, flavor, (natural_t *)&thread_state,
1894		thread_state_count);
1895		MACH_CHECK_ERROR (thread_set_state, kret);
1896		}
1897
1898	<	return KERN_SUCCESS;
1898	>	return kret;
1899		}
1900
1901		/*
#	Line 1433 | Line 1923 | catch_exception_raise(mach_port_t except
1923		mach_port_t task,
1924		exception_type_t exception,
1925		exception_data_t code,
1926	<	mach_msg_type_number_t codeCount)
1926	>	mach_msg_type_number_t code_count)
1927		{
1438	–	ppc_thread_state_t state;
1928		kern_return_t krc;
1929
1930	<	if ((exception == EXC_BAD_ACCESS)  && (codeCount >= 2)) {
1931	<	if (handle_badaccess(SIGSEGV_FAULT_HANDLER_ARGS))
1932	<	return KERN_SUCCESS;
1930	>	if (exception == EXC_BAD_ACCESS) {
1931	>	switch (code[0]) {
1932	>	case KERN_PROTECTION_FAILURE:
1933	>	case KERN_INVALID_ADDRESS:
1934	>	if (handle_badaccess(SIGSEGV_FAULT_HANDLER_ARGS))
1935	>	return KERN_SUCCESS;
1936	>	break;
1937	>	}
1938		}
1939
1940		// In Mach we do not need to remove the exception handler.
1941		// If we forward the exception, eventually some exception handler
1942		// will take care of this exception.
1943	<	krc = forward_exception(thread, task, exception, code, codeCount, &ports);
1943	>	krc = forward_exception(thread, task, exception, code, code_count, &ports);
1944
1945		return krc;
1946		}
#	Line 1574 | Line 2068 | static bool sigsegv_do_install_handler(s
2068		// addressing modes) used in PPC instructions, you will need the
2069		// GPR state anyway.
2070		krc = thread_set_exception_ports(mach_thread_self(), EXC_MASK_BAD_ACCESS, _exceptionPort,
2071	<	EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
2071	>	EXCEPTION_DEFAULT, SIGSEGV_THREAD_STATE_FLAVOR);
2072		if (krc != KERN_SUCCESS) {
2073		mach_error("thread_set_exception_ports", krc);
2074		return false;
#	Line 1597 | Line 2091 | static bool sigsegv_do_install_handler(s
2091		}
2092		#endif
2093
2094	+	#ifdef HAVE_WIN32_EXCEPTIONS
2095	+	static LONG WINAPI main_exception_filter(EXCEPTION_POINTERS *ExceptionInfo)
2096	+	{
2097	+	if (sigsegv_fault_handler != NULL
2098	+	&& ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION
2099	+	&& ExceptionInfo->ExceptionRecord->NumberParameters == 2
2100	+	&& handle_badaccess(ExceptionInfo))
2101	+	return EXCEPTION_CONTINUE_EXECUTION;
2102	+
2103	+	return EXCEPTION_CONTINUE_SEARCH;
2104	+	}
2105	+
2106	+	#if defined __CYGWIN__ && defined __i386__
2107	+	/* In Cygwin programs, SetUnhandledExceptionFilter has no effect because Cygwin
2108	+	installs a global exception handler.  We have to dig deep in order to install
2109	+	our main_exception_filter.  */
2110	+
2111	+	/* Data structures for the current thread's exception handler chain.
2112	+	On the x86 Windows uses register fs, offset 0 to point to the current
2113	+	exception handler; Cygwin mucks with it, so we must do the same... :-/ */
2114	+
2115	+	/* Magic taken from winsup/cygwin/include/exceptions.h.  */
2116	+
2117	+	struct exception_list {
2118	+	struct exception_list *prev;
2119	+	int (*handler) (EXCEPTION_RECORD *, void *, CONTEXT *, void *);
2120	+	};
2121	+	typedef struct exception_list exception_list;
2122	+
2123	+	/* Magic taken from winsup/cygwin/exceptions.cc.  */
2124	+
2125	+	__asm__ (".equ __except_list,0");
2126	+
2127	+	extern exception_list *_except_list __asm__ ("%fs:__except_list");
2128	+
2129	+	/* For debugging.  _except_list is not otherwise accessible from gdb.  */
2130	+	static exception_list *
2131	+	debug_get_except_list ()
2132	+	{
2133	+	return _except_list;
2134	+	}
2135	+
2136	+	/* Cygwin's original exception handler.  */
2137	+	static int (*cygwin_exception_handler) (EXCEPTION_RECORD *, void *, CONTEXT *, void *);
2138	+
2139	+	/* Our exception handler.  */
2140	+	static int
2141	+	libsigsegv_exception_handler (EXCEPTION_RECORD *exception, void *frame, CONTEXT *context, void *dispatch)
2142	+	{
2143	+	EXCEPTION_POINTERS ExceptionInfo;
2144	+	ExceptionInfo.ExceptionRecord = exception;
2145	+	ExceptionInfo.ContextRecord = context;
2146	+	if (main_exception_filter (&ExceptionInfo) == EXCEPTION_CONTINUE_SEARCH)
2147	+	return cygwin_exception_handler (exception, frame, context, dispatch);
2148	+	else
2149	+	return 0;
2150	+	}
2151	+
2152	+	static void
2153	+	do_install_main_exception_filter ()
2154	+	{
2155	+	/* We cannot insert any handler into the chain, because such handlers
2156	+	must lie on the stack (?).  Instead, we have to replace(!) Cygwin's
2157	+	global exception handler.  */
2158	+	cygwin_exception_handler = _except_list->handler;
2159	+	_except_list->handler = libsigsegv_exception_handler;
2160	+	}
2161	+
2162	+	#else
2163	+
2164	+	static void
2165	+	do_install_main_exception_filter ()
2166	+	{
2167	+	SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) &main_exception_filter);
2168	+	}
2169	+	#endif
2170	+
2171	+	static bool sigsegv_do_install_handler(sigsegv_fault_handler_t handler)
2172	+	{
2173	+	static bool main_exception_filter_installed = false;
2174	+	if (!main_exception_filter_installed) {
2175	+	do_install_main_exception_filter();
2176	+	main_exception_filter_installed = true;
2177	+	}
2178	+	sigsegv_fault_handler = handler;
2179	+	return true;
2180	+	}
2181	+	#endif
2182	+
2183		bool sigsegv_install_handler(sigsegv_fault_handler_t handler)
2184		{
2185		#if defined(HAVE_SIGSEGV_RECOVERY)
#	Line 1607 | Line 2190 | bool sigsegv_install_handler(sigsegv_fau
2190		if (success)
2191		sigsegv_fault_handler = handler;
2192		return success;
2193	<	#elif defined(HAVE_MACH_EXCEPTIONS)
2193	>	#elif defined(HAVE_MACH_EXCEPTIONS) || defined(HAVE_WIN32_EXCEPTIONS)
2194		return sigsegv_do_install_handler(handler);
2195		#else
2196		// FAIL: no siginfo_t nor sigcontext subterfuge is available
#	Line 1633 | Line 2216 | void sigsegv_deinstall_handler(void)
2216		SIGSEGV_ALL_SIGNALS
2217		#undef FAULT_HANDLER
2218		#endif
2219	+	#ifdef HAVE_WIN32_EXCEPTIONS
2220	+	sigsegv_fault_handler = NULL;
2221	+	#endif
2222		}
2223
2224
#	Line 1654 | Line 2240 | void sigsegv_set_dump_state(sigsegv_stat
2240		#include <stdio.h>
2241		#include <stdlib.h>
2242		#include <fcntl.h>
2243	+	#ifdef HAVE_SYS_MMAN_H
2244		#include <sys/mman.h>
2245	+	#endif
2246		#include "vm_alloc.h"
2247
2248		const int REF_INDEX = 123;
#	Line 1664 | Line 2252 | static int page_size;
2252		static volatile char * page = 0;
2253		static volatile int handler_called = 0;
2254
2255	+	/* Barriers */
2256	+	#ifdef __GNUC__
2257	+	#define BARRIER() asm volatile ("" : : : "memory")
2258	+	#else
2259	+	#define BARRIER() /* nothing */
2260	+	#endif
2261	+
2262		#ifdef __GNUC__
2263		// Code range where we expect the fault to come from
2264		static void *b_region, *e_region;
2265		#endif
2266
2267	<	static sigsegv_return_t sigsegv_test_handler(sigsegv_address_t fault_address, sigsegv_address_t instruction_address)
2267	>	static sigsegv_return_t sigsegv_test_handler(sigsegv_info_t *sip)
2268		{
2269	+	const sigsegv_address_t fault_address = sigsegv_get_fault_address(sip);
2270	+	const sigsegv_address_t instruction_address = sigsegv_get_fault_instruction_address(sip);
2271		#if DEBUG
2272		printf("sigsegv_test_handler(%p, %p)\n", fault_address, instruction_address);
2273		printf("expected fault at %p\n", page + REF_INDEX);
#	Line 1684 | Line 2281 | static sigsegv_return_t sigsegv_test_han
2281		#ifdef __GNUC__
2282		// Make sure reported fault instruction address falls into
2283		// expected code range
2284	<	if (instruction_address != SIGSEGV_INVALID_PC
2284	>	if (instruction_address != SIGSEGV_INVALID_ADDRESS
2285		&& ((instruction_address <  (sigsegv_address_t)b_region) ||
2286		(instruction_address >= (sigsegv_address_t)e_region)))
2287		exit(11);
#	Line 1695 | Line 2292 | static sigsegv_return_t sigsegv_test_han
2292		}
2293
2294		#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
2295	<	static sigsegv_return_t sigsegv_insn_handler(sigsegv_address_t fault_address, sigsegv_address_t instruction_address)
2295	>	static sigsegv_return_t sigsegv_insn_handler(sigsegv_info_t *sip)
2296		{
2297	+	const sigsegv_address_t fault_address = sigsegv_get_fault_address(sip);
2298	+	const sigsegv_address_t instruction_address = sigsegv_get_fault_instruction_address(sip);
2299	+	#if DEBUG
2300	+	printf("sigsegv_insn_handler(%p, %p)\n", fault_address, instruction_address);
2301	+	#endif
2302		if (((unsigned long)fault_address - (unsigned long)page) < page_size) {
2303		#ifdef __GNUC__
2304		// Make sure reported fault instruction address falls into
2305		// expected code range
2306	<	if (instruction_address != SIGSEGV_INVALID_PC
2306	>	if (instruction_address != SIGSEGV_INVALID_ADDRESS
2307		&& ((instruction_address <  (sigsegv_address_t)b_region) ||
2308		(instruction_address >= (sigsegv_address_t)e_region)))
2309		return SIGSEGV_RETURN_FAILURE;
#	Line 1752 | Line 2354 | static bool arch_insn_skipper_tests()
2354		0x4c, 0x89, 0x18,              // mov    %r11,(%rax)
2355		0x4a, 0x89, 0x0c, 0x10,        // mov    %rcx,(%rax,%r10,1)
2356		0x4e, 0x89, 0x1c, 0x10,        // mov    %r11,(%rax,%r10,1)
2357	+	0x63, 0x47, 0x04,              // movslq 4(%rdi),%eax
2358	+	0x48, 0x63, 0x47, 0x04,        // movslq 4(%rdi),%rax
2359		#endif
2360		0                              // end
2361		};
#	Line 1775 | Line 2379 | int main(void)
2379		if (vm_init() < 0)
2380		return 1;
2381
2382	<	page_size = getpagesize();
2382	>	page_size = vm_get_page_size();
2383		if ((page = (char *)vm_acquire(page_size)) == VM_MAP_FAILED)
2384		return 2;
2385
#	Line 1795 | Line 2399 | int main(void)
2399		if (page[REF_INDEX] != REF_VALUE)
2400		exit(20);
2401		page[REF_INDEX] = REF_VALUE;
2402	+	BARRIER();
2403		L_e_region1:
2404
2405		if (handler_called != 1)
#	Line 1831 | Line 2436 | int main(void)
2436		TEST_SKIP_INSTRUCTION(unsigned short);
2437		TEST_SKIP_INSTRUCTION(unsigned int);
2438		TEST_SKIP_INSTRUCTION(unsigned long);
2439	+	TEST_SKIP_INSTRUCTION(signed char);
2440	+	TEST_SKIP_INSTRUCTION(signed short);
2441	+	TEST_SKIP_INSTRUCTION(signed int);
2442	+	TEST_SKIP_INSTRUCTION(signed long);
2443	+	BARRIER();
2444		L_e_region2:
2445
2446		if (!arch_insn_skipper_tests())

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines