[ViewVC] Diff of: cebix/BasiliskII/src/Unix/sigsegv.cpp

Comparing BasiliskII/src/Unix/sigsegv.cpp (file contents):
Revision 1.10 by gbeauche, 2002-05-12T11:10:50Z vs.
Revision 1.17 by gbeauche, 2002-05-20T17:49:04Z

#	Line 44 \| Line 44 \| *typedef RETSIGTYPE (signal_handler)(int**
44		static bool sigsegv_ignore_fault = false;
45
46		// User's SIGSEGV handler
47	<	static sigsegv_handler_t sigsegv_user_handler = 0;
47	>	static sigsegv_fault_handler_t sigsegv_fault_handler = 0;
48
49		// Function called to dump state if we can't handle the fault
50	<	static sigsegv_handler_t sigsegv_dump_state = 0;
50	>	static sigsegv_state_dumper_t sigsegv_state_dumper = 0;
51
52		// Actual SIGSEGV handler installer
53		static bool sigsegv_do_install_handler(int sig);
54
55
56		/*
57	+	* Instruction decoding aids
58	+	*/
59	+
60	+	// Transfer type
61	+	enum transfer_type_t {
62	+	TYPE_UNKNOWN,
63	+	TYPE_LOAD,
64	+	TYPE_STORE
65	+	};
66	+
67	+	// Transfer size
68	+	enum transfer_size_t {
69	+	SIZE_UNKNOWN,
70	+	SIZE_BYTE,
71	+	SIZE_WORD,
72	+	SIZE_LONG
73	+	};
74	+
75	+	#if (defined(powerpc) \|\| defined(__powerpc__) \|\| defined(__ppc__))
76	+	// Addressing mode
77	+	enum addressing_mode_t {
78	+	MODE_UNKNOWN,
79	+	MODE_NORM,
80	+	MODE_U,
81	+	MODE_X,
82	+	MODE_UX
83	+	};
84	+
85	+	// Decoded instruction
86	+	struct instruction_t {
87	+	transfer_type_t transfer_type;
88	+	transfer_size_t transfer_size;
89	+	addressing_mode_t addr_mode;
90	+	unsigned int addr;
91	+	char ra, rd;
92	+	};
93	+
94	+	static void powerpc_decode_instruction(instruction_t instruction, unsigned int nip, unsigned int gpr)
95	+	{
96	+	// Get opcode and divide into fields
97	+	unsigned int opcode = ((unsigned int )nip);
98	+	unsigned int primop = opcode >> 26;
99	+	unsigned int exop = (opcode >> 1) & 0x3ff;
100	+	unsigned int ra = (opcode >> 16) & 0x1f;
101	+	unsigned int rb = (opcode >> 11) & 0x1f;
102	+	unsigned int rd = (opcode >> 21) & 0x1f;
103	+	signed int imm = (signed short)(opcode & 0xffff);
104	+
105	+	// Analyze opcode
106	+	transfer_type_t transfer_type = TYPE_UNKNOWN;
107	+	transfer_size_t transfer_size = SIZE_UNKNOWN;
108	+	addressing_mode_t addr_mode = MODE_UNKNOWN;
109	+	switch (primop) {
110	+	case 31:
111	+	switch (exop) {
112	+	case 23: // lwzx
113	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_X; break;
114	+	case 55: // lwzux
115	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_UX; break;
116	+	case 87: // lbzx
117	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_X; break;
118	+	case 119: // lbzux
119	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_UX; break;
120	+	case 151: // stwx
121	+	transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_X; break;
122	+	case 183: // stwux
123	+	transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_UX; break;
124	+	case 215: // stbx
125	+	transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_X; break;
126	+	case 247: // stbux
127	+	transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_UX; break;
128	+	case 279: // lhzx
129	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_X; break;
130	+	case 311: // lhzux
131	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break;
132	+	case 343: // lhax
133	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_X; break;
134	+	case 375: // lhaux
135	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break;
136	+	case 407: // sthx
137	+	transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_X; break;
138	+	case 439: // sthux
139	+	transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break;
140	+	}
141	+	break;
142	+
143	+	case 32: // lwz
144	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_NORM; break;
145	+	case 33: // lwzu
146	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_U; break;
147	+	case 34: // lbz
148	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_NORM; break;
149	+	case 35: // lbzu
150	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_U; break;
151	+	case 36: // stw
152	+	transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_NORM; break;
153	+	case 37: // stwu
154	+	transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_U; break;
155	+	case 38: // stb
156	+	transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_NORM; break;
157	+	case 39: // stbu
158	+	transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_U; break;
159	+	case 40: // lhz
160	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break;
161	+	case 41: // lhzu
162	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_U; break;
163	+	case 42: // lha
164	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break;
165	+	case 43: // lhau
166	+	transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_U; break;
167	+	case 44: // sth
168	+	transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break;
169	+	case 45: // sthu
170	+	transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_U; break;
171	+	}
172	+
173	+	// Calculate effective address
174	+	unsigned int addr = 0;
175	+	switch (addr_mode) {
176	+	case MODE_X:
177	+	case MODE_UX:
178	+	if (ra == 0)
179	+	addr = gpr[rb];
180	+	else
181	+	addr = gpr[ra] + gpr[rb];
182	+	break;
183	+	case MODE_NORM:
184	+	case MODE_U:
185	+	if (ra == 0)
186	+	addr = (signed int)(signed short)imm;
187	+	else
188	+	addr = gpr[ra] + (signed int)(signed short)imm;
189	+	break;
190	+	default:
191	+	break;
192	+	}
193	+
194	+	// Commit decoded instruction
195	+	instruction->addr = addr;
196	+	instruction->addr_mode = addr_mode;
197	+	instruction->transfer_type = transfer_type;
198	+	instruction->transfer_size = transfer_size;
199	+	instruction->ra = ra;
200	+	instruction->rd = rd;
201	+	}
202	+	#endif
203	+
204	+
205	+	/*
206		* OS-dependant SIGSEGV signals support section
207		*/
208
#	Line 66 \| Line 215 \| static bool sigsegv_do_install_handler(i
215		#endif
216		#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, siginfo_t sip, void scp
217		#define SIGSEGV_FAULT_ADDRESS sip->si_addr
218	+	#if (defined(i386) \|\| defined(__i386__))
219	+	#define SIGSEGV_FAULT_INSTRUCTION (((struct sigcontext *)scp)->sc_eip)
220	+	#define SIGSEGV_REGISTER_FILE ((unsigned int )&(((struct sigcontext )scp)->sc_edi))
221	+	#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
222	+	#endif
223		#if defined(__linux__)
224		#if (defined(i386) \|\| defined(__i386__))
225		#include <sys/ucontext.h>
226	<	#define SIGSEGV_FAULT_INSTRUCTION (((ucontext_t )scp)->uc_mcontext.gregs[14]) / should use REG_EIP instead */
227	<	#define SIGSEGV_REGISTER_FILE (unsigned long )(((ucontext_t )scp)->uc_mcontext.gregs)
226	>	#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext.gregs)
227	>	#define SIGSEGV_FAULT_INSTRUCTION SIGSEGV_CONTEXT_REGS[14] /* should use REG_EIP instead */
228	>	#define SIGSEGV_REGISTER_FILE (unsigned int *)SIGSEGV_CONTEXT_REGS
229		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
230		#endif
231		#if (defined(ia64) \|\| defined(__ia64__))
#	Line 78 \| Line 233 \| static bool sigsegv_do_install_handler(i
233		#endif
234		#if (defined(powerpc) \|\| defined(__powerpc__))
235		#include <sys/ucontext.h>
236	<	#define SIGSEGV_FAULT_INSTRUCTION (((ucontext_t *)scp)->uc_mcontext.regs->nip)
236	>	#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext.regs)
237	>	#define SIGSEGV_FAULT_INSTRUCTION (SIGSEGV_CONTEXT_REGS->nip)
238	>	#define SIGSEGV_REGISTER_FILE (unsigned int )&SIGSEGV_CONTEXT_REGS->nip, (unsigned int )(SIGSEGV_CONTEXT_REGS->gpr)
239	>	#define SIGSEGV_SKIP_INSTRUCTION powerpc_skip_instruction
240		#endif
241		#endif
242		#endif
#	Line 92 \| Line 250 \| static bool sigsegv_do_install_handler(i
250		#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, struct sigcontext scs
251		#define SIGSEGV_FAULT_ADDRESS scs.cr2
252		#define SIGSEGV_FAULT_INSTRUCTION scs.eip
253	<	#define SIGSEGV_REGISTER_FILE (unsigned long *)(&scs)
253	>	#define SIGSEGV_REGISTER_FILE (unsigned int *)(&scs)
254		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
255		#endif
256		#if (defined(sparc) \|\| defined(__sparc__))
#	Line 105 \| Line 263 \| static bool sigsegv_do_install_handler(i
263		#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, struct sigcontext *scp
264		#define SIGSEGV_FAULT_ADDRESS scp->regs->dar
265		#define SIGSEGV_FAULT_INSTRUCTION scp->regs->nip
266	+	#define SIGSEGV_REGISTER_FILE (unsigned int )&scp->regs->nip, (unsigned int )(scp->regs->gpr)
267	+	#define SIGSEGV_SKIP_INSTRUCTION powerpc_skip_instruction
268		#endif
269		#if (defined(alpha) \|\| defined(__alpha__))
270		#include <asm/sigcontext.h>
#	Line 125 \| Line 285 \| static sigsegv_address_t get_fault_addre
285
286		// Irix 5 or 6 on MIPS
287		#if (defined(sgi) \|\| defined(__sgi)) && (defined(SYSTYPE_SVR4) \|\| defined(__SYSTYPE_SVR4))
288	+	#include <ucontext.h>
289		#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, struct sigcontext *scp
290		#define SIGSEGV_FAULT_ADDRESS scp->sc_badvaddr
291		#define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGSEGV)
292		#endif
293
294	+	// HP-UX
295	+	#if (defined(hpux) \|\| defined(__hpux__))
296	+	#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, struct sigcontext *scp
297	+	#define SIGSEGV_FAULT_ADDRESS scp->sc_sl.sl_ss.ss_narrow.ss_cr21
298	+	#define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGSEGV) FAULT_HANDLER(SIGBUS)
299	+	#endif
300	+
301		// OSF/1 on Alpha
302		#if defined(__osf__)
303	+	#include <ucontext.h>
304		#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, struct sigcontext *scp
305		#define SIGSEGV_FAULT_ADDRESS scp->sc_traparg_a0
306		#define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGSEGV)
#	Line 149 \| Line 318 \| static sigsegv_address_t get_fault_addre
318		#if (defined(m68k) \|\| defined(__m68k__))
319		#include <m68k/frame.h>
320		#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, struct sigcontext *scp
321	<	#define SIGSEGV_FAULT_ADDRESS ({ \
153	<	struct sigstate { \
154	<	int ss_flags; \
155	<	struct frame ss_frame; \
156	<	}; \
157	<	struct sigstate state = (struct sigstate )scp->sc_ap; \
158	<	char *fault_addr; \
159	<	switch (state->ss_frame.f_format) { \
160	<	case 7: /* 68040 access error */ \
161	<	/* "code" is sometimes unreliable (i.e. contains NULL or a bogus address), reason unknown */ \
162	<	fault_addr = state->ss_frame.f_fmt7.f_fa; \
163	<	break; \
164	<	default: \
165	<	fault_addr = (char *)code; \
166	<	break; \
167	<	} \
168	<	fault_addr; \
169	<	})
321	>	#define SIGSEGV_FAULT_ADDRESS get_fault_address(scp)
322		#define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGSEGV)
323	+
324	+	// Use decoding scheme from BasiliskII/m68k native
325	+	static sigsegv_address_t get_fault_address(struct sigcontext *scp)
326	+	{
327	+	struct sigstate {
328	+	int ss_flags;
329	+	struct frame ss_frame;
330	+	};
331	+	struct sigstate state = (struct sigstate )scp->sc_ap;
332	+	char *fault_addr;
333	+	switch (state->ss_frame.f_format) {
334	+	case 7: /* 68040 access error */
335	+	/* "code" is sometimes unreliable (i.e. contains NULL or a bogus address), reason unknown */
336	+	fault_addr = state->ss_frame.f_fmt7.f_fa;
337	+	break;
338	+	default:
339	+	fault_addr = (char *)code;
340	+	break;
341	+	}
342	+	return (sigsegv_address_t)fault_addr;
343	+	}
344		#else
345		#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, void scp, char addr
346		#define SIGSEGV_FAULT_ADDRESS addr
#	Line 182 \| Line 355 \| static sigsegv_address_t get_fault_addre
355		#define SIGSEGV_FAULT_ADDRESS get_fault_address(scp)
356		#define SIGSEGV_FAULT_INSTRUCTION scp->sc_ir
357		#define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGBUS)
358	+	#define SIGSEGV_REGISTER_FILE (unsigned int )&scp->sc_ir, &((unsigned int ) scp->sc_regs)[2]
359	+	#define SIGSEGV_SKIP_INSTRUCTION powerpc_skip_instruction
360
361	<	// From Boehm's GC 6.0alpha8
187	<	#define EXTRACT_OP1(iw) (((iw) & 0xFC000000) >> 26)
188	<	#define EXTRACT_OP2(iw) (((iw) & 0x000007FE) >> 1)
189	<	#define EXTRACT_REGA(iw) (((iw) & 0x001F0000) >> 16)
190	<	#define EXTRACT_REGB(iw) (((iw) & 0x03E00000) >> 21)
191	<	#define EXTRACT_REGC(iw) (((iw) & 0x0000F800) >> 11)
192	<	#define EXTRACT_DISP(iw) ((short *) &(iw))[1]
193	<
361	>	// Use decoding scheme from SheepShaver
362		static sigsegv_address_t get_fault_address(struct sigcontext *scp)
363		{
364	<	unsigned int instr = ((unsigned int ) scp->sc_ir);
365	<	unsigned int * regs = &((unsigned int *) scp->sc_regs)[2];
366	<	int disp = 0, tmp;
367	<	unsigned int baseA = 0, baseB = 0;
368	<	unsigned int addr, alignmask = 0xFFFFFFFF;
369	<
202	<	switch(EXTRACT_OP1(instr)) {
203	<	case 38: /* stb */
204	<	case 39: /* stbu */
205	<	case 54: /* stfd */
206	<	case 55: /* stfdu */
207	<	case 52: /* stfs */
208	<	case 53: /* stfsu */
209	<	case 44: /* sth */
210	<	case 45: /* sthu */
211	<	case 47: /* stmw */
212	<	case 36: /* stw */
213	<	case 37: /* stwu */
214	<	tmp = EXTRACT_REGA(instr);
215	<	if(tmp > 0)
216	<	baseA = regs[tmp];
217	<	disp = EXTRACT_DISP(instr);
218	<	break;
219	<	case 31:
220	<	switch(EXTRACT_OP2(instr)) {
221	<	case 86: /* dcbf */
222	<	case 54: /* dcbst */
223	<	case 1014: /* dcbz */
224	<	case 247: /* stbux */
225	<	case 215: /* stbx */
226	<	case 759: /* stfdux */
227	<	case 727: /* stfdx */
228	<	case 983: /* stfiwx */
229	<	case 695: /* stfsux */
230	<	case 663: /* stfsx */
231	<	case 918: /* sthbrx */
232	<	case 439: /* sthux */
233	<	case 407: /* sthx */
234	<	case 661: /* stswx */
235	<	case 662: /* stwbrx */
236	<	case 150: /* stwcx. */
237	<	case 183: /* stwux */
238	<	case 151: /* stwx */
239	<	case 135: /* stvebx */
240	<	case 167: /* stvehx */
241	<	case 199: /* stvewx */
242	<	case 231: /* stvx */
243	<	case 487: /* stvxl */
244	<	tmp = EXTRACT_REGA(instr);
245	<	if(tmp > 0)
246	<	baseA = regs[tmp];
247	<	baseB = regs[EXTRACT_REGC(instr)];
248	<	/* determine Altivec alignment mask */
249	<	switch(EXTRACT_OP2(instr)) {
250	<	case 167: /* stvehx */
251	<	alignmask = 0xFFFFFFFE;
252	<	break;
253	<	case 199: /* stvewx */
254	<	alignmask = 0xFFFFFFFC;
255	<	break;
256	<	case 231: /* stvx */
257	<	alignmask = 0xFFFFFFF0;
258	<	break;
259	<	case 487: /* stvxl */
260	<	alignmask = 0xFFFFFFF0;
261	<	break;
262	<	}
263	<	break;
264	<	case 725: /* stswi */
265	<	tmp = EXTRACT_REGA(instr);
266	<	if(tmp > 0)
267	<	baseA = regs[tmp];
268	<	break;
269	<	default: /* ignore instruction */
270	<	return 0;
271	<	break;
272	<	}
273	<	break;
274	<	default: /* ignore instruction */
275	<	return 0;
276	<	break;
277	<	}
278	<
279	<	addr = (baseA + baseB) + disp;
280	<	addr &= alignmask;
281	<	return (sigsegv_address_t)addr;
364	>	unsigned int nip = (unsigned int) scp->sc_ir;
365	>	unsigned int * gpr = &((unsigned int *) scp->sc_regs)[2];
366	>	instruction_t instr;
367	>
368	>	powerpc_decode_instruction(&instr, nip, gpr);
369	>	return (sigsegv_address_t)instr.addr;
370		}
371		#endif
372		#endif
373		#endif
374
375	+
376	+	/*
377	+	* Instruction skipping
378	+	*/
379	+
380		#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
381		// Decode and skip X86 instruction
382		#if (defined(i386) \|\| defined(__i386__))
#	Line 300 \| Line 393 \| enum {
393		X86_REG_EDI = 4
394		};
395		#endif
396	+	#if defined(__NetBSD__) \|\| defined(__FreeBSD__)
397	+	enum {
398	+	X86_REG_EIP = 10,
399	+	X86_REG_EAX = 7,
400	+	X86_REG_ECX = 6,
401	+	X86_REG_EDX = 5,
402	+	X86_REG_EBX = 4,
403	+	X86_REG_ESP = 13,
404	+	X86_REG_EBP = 2,
405	+	X86_REG_ESI = 1,
406	+	X86_REG_EDI = 0
407	+	};
408	+	#endif
409		// FIXME: this is partly redundant with the instruction decoding phase
410		// to discover transfer type and register number
411		static inline int ix86_step_over_modrm(unsigned char * p)
#	Line 334 \| Line 440 \| static inline int ix86_step_over_modrm(u
440		return offset;
441		}
442
443	<	static bool ix86_skip_instruction(sigsegv_address_t fault_instruction, unsigned long * regs)
443	>	static bool ix86_skip_instruction(unsigned int * regs)
444		{
445	<	unsigned char * eip = (unsigned char *)fault_instruction;
445	>	unsigned char * eip = (unsigned char *)regs[X86_REG_EIP];
446
447		if (eip == 0)
448		return false;
449
450	<	// Transfer type
451	<	enum {
346	<	TYPE_UNKNOWN,
347	<	TYPE_LOAD,
348	<	TYPE_STORE
349	<	} transfer_type = TYPE_UNKNOWN;
350	<
351	<	// Transfer size
352	<	enum {
353	<	SIZE_BYTE,
354	<	SIZE_WORD,
355	<	SIZE_LONG
356	<	} transfer_size = SIZE_LONG;
450	>	transfer_type_t transfer_type = TYPE_UNKNOWN;
451	>	transfer_size_t transfer_size = SIZE_LONG;
452
453		int reg = -1;
454		int len = 0;
#	Line 367 \| Line 462 \| static bool ix86_skip_instruction(sigseg
462
463		// Decode instruction
464		switch (eip[0]) {
465	+	case 0x0f:
466	+	if (eip[1] == 0xb7) { // MOVZX r32, r/m16
467	+	switch (eip[2] & 0xc0) {
468	+	case 0x80:
469	+	reg = (eip[2] >> 3) & 7;
470	+	transfer_type = TYPE_LOAD;
471	+	break;
472	+	case 0x40:
473	+	reg = (eip[2] >> 3) & 7;
474	+	transfer_type = TYPE_LOAD;
475	+	break;
476	+	case 0x00:
477	+	reg = (eip[2] >> 3) & 7;
478	+	transfer_type = TYPE_LOAD;
479	+	break;
480	+	}
481	+	len += 3 + ix86_step_over_modrm(eip + 2);
482	+	}
483	+	break;
484		case 0x8a: // MOV r8, r/m8
485		transfer_size = SIZE_BYTE;
486		case 0x8b: // MOV r32, r/m32 (or 16-bit operation)
#	Line 454 \| Line 568 \| static bool ix86_skip_instruction(sigseg
568		return true;
569		}
570		#endif
571	+
572	+	// Decode and skip PPC instruction
573	+	#if (defined(powerpc) \|\| defined(__powerpc__) \|\| defined(__ppc__))
574	+	static bool powerpc_skip_instruction(unsigned int * nip_p, unsigned int * regs)
575	+	{
576	+	instruction_t instr;
577	+	powerpc_decode_instruction(&instr, *nip_p, regs);
578	+
579	+	if (instr.transfer_type == TYPE_UNKNOWN) {
580	+	// Unknown machine code, let it crash. Then patch the decoder
581	+	return false;
582	+	}
583	+
584	+	#if DEBUG
585	+	printf("%08x: %s %s access", *nip_p,
586	+	instr.transfer_size == SIZE_BYTE ? "byte" : instr.transfer_size == SIZE_WORD ? "word" : "long",
587	+	instr.transfer_type == TYPE_LOAD ? "read" : "write");
588	+
589	+	if (instr.addr_mode == MODE_U \|\| instr.addr_mode == MODE_UX)
590	+	printf(" r%d (ra = %08x)\n", instr.ra, instr.addr);
591	+	if (instr.transfer_type == TYPE_LOAD)
592	+	printf(" r%d (rd = 0)\n", instr.rd);
593	+	#endif
594	+
595	+	if (instr.addr_mode == MODE_U \|\| instr.addr_mode == MODE_UX)
596	+	regs[instr.ra] = instr.addr;
597	+	if (instr.transfer_type == TYPE_LOAD)
598	+	regs[instr.rd] = 0;
599	+
600	+	*nip_p += 4;
601	+	return true;
602	+	}
603	+	#endif
604		#endif
605
606		// Fallbacks
#	Line 479 \| Line 626 \| static void sigsegv_handler(SIGSEGV_FAUL
626		bool fault_recovered = false;
627
628		// Call user's handler and reinstall the global handler, if required
629	<	if (sigsegv_user_handler(fault_address, fault_instruction)) {
629	>	if (sigsegv_fault_handler(fault_address, fault_instruction)) {
630		#if (defined(HAVE_SIGACTION) ? defined(SIGACTION_NEED_REINSTALL) : defined(SIGNAL_NEED_REINSTALL))
631		sigsegv_do_install_handler(sig);
632		#endif
#	Line 488 \| Line 635 \| static void sigsegv_handler(SIGSEGV_FAUL
635		#if HAVE_SIGSEGV_SKIP_INSTRUCTION
636		else if (sigsegv_ignore_fault) {
637		// Call the instruction skipper with the register file available
638	<	if (SIGSEGV_SKIP_INSTRUCTION(fault_instruction, SIGSEGV_REGISTER_FILE))
638	>	if (SIGSEGV_SKIP_INSTRUCTION(SIGSEGV_REGISTER_FILE))
639		fault_recovered = true;
640		}
641		#endif
#	Line 500 \| Line 647 \| static void sigsegv_handler(SIGSEGV_FAUL
647		#undef FAULT_HANDLER
648
649		// We can't do anything with the fault_address, dump state?
650	<	if (sigsegv_dump_state != 0)
651	<	sigsegv_dump_state(fault_address, fault_instruction);
650	>	if (sigsegv_state_dumper != 0)
651	>	sigsegv_state_dumper(fault_address, fault_instruction);
652		}
653		}
654		#endif
#	Line 548 \| Line 695 \| static bool sigsegv_do_install_handler(i
695		}
696		#endif
697
698	<	bool sigsegv_install_handler(sigsegv_handler_t handler)
698	>	bool sigsegv_install_handler(sigsegv_fault_handler_t handler)
699		{
700		#ifdef HAVE_SIGSEGV_RECOVERY
701	<	sigsegv_user_handler = handler;
701	>	sigsegv_fault_handler = handler;
702		bool success = true;
703		#define FAULT_HANDLER(sig) success = success && sigsegv_do_install_handler(sig);
704		SIGSEGV_ALL_SIGNALS
#	Line 571 \| Line 718 \| bool sigsegv_install_handler(sigsegv_han
718		void sigsegv_deinstall_handler(void)
719		{
720		#ifdef HAVE_SIGSEGV_RECOVERY
721	<	sigsegv_user_handler = 0;
721	>	sigsegv_fault_handler = 0;
722		#define FAULT_HANDLER(sig) signal(sig, SIG_DFL);
723		SIGSEGV_ALL_SIGNALS
724		#undef FAULT_HANDLER
#	Line 593 \| Line 740 \| void sigsegv_set_ignore_state(bool ignor
740		* Set callback function when we cannot handle the fault
741		*/
742
743	<	void sigsegv_set_dump_state(sigsegv_handler_t handler)
743	>	void sigsegv_set_dump_state(sigsegv_state_dumper_t handler)
744		{
745	<	sigsegv_dump_state = handler;
745	>	sigsegv_state_dumper = handler;
746		}
747
748
#	Line 656 \| Line 803 \| int main(void)
803		if (!sigsegv_install_handler(sigsegv_insn_handler))
804		return 1;
805
806	<	if (vm_protect((char *)page, page_size, VM_PAGE_WRITE) < 0)
806	>	if (vm_protect((char *)page, page_size, VM_PAGE_READ \| VM_PAGE_WRITE) < 0)
807		return 1;
808
809		for (int i = 0; i < page_size; i++)

Diff Legend

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

Comparing BasiliskII/src/Unix/sigsegv.cpp (file contents): Revision 1.10 by gbeauche, 2002-05-12T11:10:50Z vs. Revision 1.17 by gbeauche, 2002-05-20T17:49:04Z

Diff Legend

Comparing BasiliskII/src/Unix/sigsegv.cpp (file contents):
Revision 1.10 by gbeauche, 2002-05-12T11:10:50Z vs.
Revision 1.17 by gbeauche, 2002-05-20T17:49:04Z