ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/sigsegv.cpp
(Generate patch)

Comparing BasiliskII/src/Unix/sigsegv.cpp (file contents):
Revision 1.30 by gbeauche, 2003-10-13T19:56:17Z vs.
Revision 1.62 by gbeauche, 2006-03-30T22:45:49Z

# 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-2002 Christian Bauer
13 > *  Basilisk II (C) 1997-2005 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 36 | Line 36
36   #endif
37  
38   #include <list>
39 + #include <stdio.h>
40   #include <signal.h>
41   #include "sigsegv.h"
42  
# Line 69 | Line 70 | static bool sigsegv_do_install_handler(i
70   enum transfer_size_t {
71          SIZE_UNKNOWN,
72          SIZE_BYTE,
73 <        SIZE_WORD,
74 <        SIZE_LONG
73 >        SIZE_WORD, // 2 bytes
74 >        SIZE_LONG, // 4 bytes
75 >        SIZE_QUAD, // 8 bytes
76   };
77  
78   // Transfer type
# Line 95 | Line 97 | struct instruction_t {
97          char                            ra, rd;
98   };
99  
100 < static void powerpc_decode_instruction(instruction_t *instruction, unsigned int nip, unsigned int * gpr)
100 > static void powerpc_decode_instruction(instruction_t *instruction, unsigned int nip, unsigned long * gpr)
101   {
102          // Get opcode and divide into fields
103 <        unsigned int opcode = *((unsigned int *)nip);
103 >        unsigned int opcode = *((unsigned int *)(unsigned long)nip);
104          unsigned int primop = opcode >> 26;
105          unsigned int exop = (opcode >> 1) & 0x3ff;
106          unsigned int ra = (opcode >> 16) & 0x1f;
# Line 172 | Line 174 | static void powerpc_decode_instruction(i
174                  transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break;
175          case 45:        // sthu
176                  transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_U; break;
177 +        case 58:        // ld, ldu, lwa
178 +                transfer_type = SIGSEGV_TRANSFER_LOAD;
179 +                transfer_size = SIZE_QUAD;
180 +                addr_mode = ((opcode & 3) == 1) ? MODE_U : MODE_NORM;
181 +                imm &= ~3;
182 +                break;
183 +        case 62:        // std, stdu, stq
184 +                transfer_type = SIGSEGV_TRANSFER_STORE;
185 +                transfer_size = SIZE_QUAD;
186 +                addr_mode = ((opcode & 3) == 1) ? MODE_U : MODE_NORM;
187 +                imm &= ~3;
188 +                break;
189          }
190          
191          // Calculate effective address
# Line 212 | Line 226 | static void powerpc_decode_instruction(i
226  
227   #if HAVE_SIGINFO_T
228   // Generic extended signal handler
229 < #define SIGSEGV_FAULT_HANDLER                   sigsegv_fault_handler
216 < #if defined(__NetBSD__) || defined(__FreeBSD__)
229 > #if defined(__FreeBSD__)
230   #define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGBUS)
231   #else
232   #define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGSEGV)
# Line 222 | Line 235 | static void powerpc_decode_instruction(i
235   #define SIGSEGV_FAULT_HANDLER_ARGLIST_1 siginfo_t *sip, void *scp
236   #define SIGSEGV_FAULT_HANDLER_ARGS              sip, scp
237   #define SIGSEGV_FAULT_ADDRESS                   sip->si_addr
238 < #if defined(__NetBSD__) || defined(__FreeBSD__)
238 > #if (defined(sgi) || defined(__sgi))
239 > #include <ucontext.h>
240 > #define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.gregs)
241 > #define SIGSEGV_FAULT_INSTRUCTION               (unsigned long)SIGSEGV_CONTEXT_REGS[CTX_EPC]
242 > #if (defined(mips) || defined(__mips))
243 > #define SIGSEGV_REGISTER_FILE                   SIGSEGV_CONTEXT_REGS
244 > #define SIGSEGV_SKIP_INSTRUCTION                mips_skip_instruction
245 > #endif
246 > #endif
247 > #if defined(__sun__)
248 > #if (defined(sparc) || defined(__sparc__))
249 > #include <sys/stack.h>
250 > #include <sys/regset.h>
251 > #include <sys/ucontext.h>
252 > #define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.gregs)
253 > #define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS[REG_PC]
254 > #define SIGSEGV_SPARC_GWINDOWS                  (((ucontext_t *)scp)->uc_mcontext.gwins)
255 > #define SIGSEGV_SPARC_RWINDOW                   (struct rwindow *)((char *)SIGSEGV_CONTEXT_REGS[REG_SP] + STACK_BIAS)
256 > #define SIGSEGV_REGISTER_FILE                   ((unsigned long *)SIGSEGV_CONTEXT_REGS), SIGSEGV_SPARC_GWINDOWS, SIGSEGV_SPARC_RWINDOW
257 > #define SIGSEGV_SKIP_INSTRUCTION                sparc_skip_instruction
258 > #endif
259 > #if defined(__i386__)
260 > #include <sys/regset.h>
261 > #define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.gregs)
262 > #define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS[EIP]
263 > #define SIGSEGV_REGISTER_FILE                   (unsigned long *)SIGSEGV_CONTEXT_REGS
264 > #define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
265 > #endif
266 > #endif
267 > #if defined(__FreeBSD__) || defined(__OpenBSD__)
268   #if (defined(i386) || defined(__i386__))
269   #define SIGSEGV_FAULT_INSTRUCTION               (((struct sigcontext *)scp)->sc_eip)
270 < #define SIGSEGV_REGISTER_FILE                   ((unsigned int *)&(((struct sigcontext *)scp)->sc_edi)) /* EDI is the first GPR (even below EIP) in sigcontext */
270 > #define SIGSEGV_REGISTER_FILE                   ((unsigned long *)&(((struct sigcontext *)scp)->sc_edi)) /* EDI is the first GPR (even below EIP) in sigcontext */
271 > #define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
272 > #endif
273 > #endif
274 > #if defined(__NetBSD__)
275 > #if (defined(i386) || defined(__i386__))
276 > #include <sys/ucontext.h>
277 > #define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.__gregs)
278 > #define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS[_REG_EIP]
279 > #define SIGSEGV_REGISTER_FILE                   (unsigned long *)SIGSEGV_CONTEXT_REGS
280   #define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
281   #endif
282 + #if (defined(powerpc) || defined(__powerpc__))
283 + #include <sys/ucontext.h>
284 + #define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.__gregs)
285 + #define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS[_REG_PC]
286 + #define SIGSEGV_REGISTER_FILE                   (unsigned long *)&SIGSEGV_CONTEXT_REGS[_REG_PC], (unsigned long *)&SIGSEGV_CONTEXT_REGS[_REG_R0]
287 + #define SIGSEGV_SKIP_INSTRUCTION                powerpc_skip_instruction
288 + #endif
289   #endif
290   #if defined(__linux__)
291   #if (defined(i386) || defined(__i386__))
292   #include <sys/ucontext.h>
293   #define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.gregs)
294   #define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS[14] /* should use REG_EIP instead */
295 < #define SIGSEGV_REGISTER_FILE                   (unsigned int *)SIGSEGV_CONTEXT_REGS
295 > #define SIGSEGV_REGISTER_FILE                   (unsigned long *)SIGSEGV_CONTEXT_REGS
296   #define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
297   #endif
298   #if (defined(x86_64) || defined(__x86_64__))
# Line 242 | Line 300 | static void powerpc_decode_instruction(i
300   #define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.gregs)
301   #define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS[16] /* should use REG_RIP instead */
302   #define SIGSEGV_REGISTER_FILE                   (unsigned long *)SIGSEGV_CONTEXT_REGS
303 + #define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
304   #endif
305   #if (defined(ia64) || defined(__ia64__))
306   #define SIGSEGV_FAULT_INSTRUCTION               (((struct sigcontext *)scp)->sc_ip & ~0x3ULL) /* slot number is in bits 0 and 1 */
# Line 250 | Line 309 | static void powerpc_decode_instruction(i
309   #include <sys/ucontext.h>
310   #define SIGSEGV_CONTEXT_REGS                    (((ucontext_t *)scp)->uc_mcontext.regs)
311   #define SIGSEGV_FAULT_INSTRUCTION               (SIGSEGV_CONTEXT_REGS->nip)
312 < #define SIGSEGV_REGISTER_FILE                   (unsigned int *)&SIGSEGV_CONTEXT_REGS->nip, (unsigned int *)(SIGSEGV_CONTEXT_REGS->gpr)
312 > #define SIGSEGV_REGISTER_FILE                   (unsigned long *)&SIGSEGV_CONTEXT_REGS->nip, (unsigned long *)(SIGSEGV_CONTEXT_REGS->gpr)
313   #define SIGSEGV_SKIP_INSTRUCTION                powerpc_skip_instruction
314   #endif
315 + #if (defined(hppa) || defined(__hppa__))
316 + #undef  SIGSEGV_FAULT_ADDRESS
317 + #define SIGSEGV_FAULT_ADDRESS                   sip->si_ptr
318 + #endif
319 + #if (defined(arm) || defined(__arm__))
320 + #include <asm/ucontext.h> /* use kernel structure, glibc may not be in sync */
321 + #define SIGSEGV_CONTEXT_REGS                    (((struct ucontext *)scp)->uc_mcontext)
322 + #define SIGSEGV_FAULT_INSTRUCTION               (SIGSEGV_CONTEXT_REGS.arm_pc)
323 + #define SIGSEGV_REGISTER_FILE                   (&SIGSEGV_CONTEXT_REGS.arm_r0)
324 + #define SIGSEGV_SKIP_INSTRUCTION                arm_skip_instruction
325 + #endif
326   #endif
327   #endif
328  
329   #if HAVE_SIGCONTEXT_SUBTERFUGE
260 #define SIGSEGV_FAULT_HANDLER                   sigsegv_fault_handler
330   // Linux kernels prior to 2.4 ?
331   #if defined(__linux__)
332   #define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGSEGV)
# Line 268 | Line 337 | static void powerpc_decode_instruction(i
337   #define SIGSEGV_FAULT_HANDLER_ARGS              &scs
338   #define SIGSEGV_FAULT_ADDRESS                   scp->cr2
339   #define SIGSEGV_FAULT_INSTRUCTION               scp->eip
340 < #define SIGSEGV_REGISTER_FILE                   (unsigned int *)scp
340 > #define SIGSEGV_REGISTER_FILE                   (unsigned long *)scp
341   #define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
342   #endif
343   #if (defined(sparc) || defined(__sparc__))
# Line 283 | Line 352 | static void powerpc_decode_instruction(i
352   #define SIGSEGV_FAULT_HANDLER_ARGS              sig, scp
353   #define SIGSEGV_FAULT_ADDRESS                   scp->regs->dar
354   #define SIGSEGV_FAULT_INSTRUCTION               scp->regs->nip
355 < #define SIGSEGV_REGISTER_FILE                   (unsigned int *)&scp->regs->nip, (unsigned int *)(scp->regs->gpr)
355 > #define SIGSEGV_REGISTER_FILE                   (unsigned long *)&scp->regs->nip, (unsigned long *)(scp->regs->gpr)
356   #define SIGSEGV_SKIP_INSTRUCTION                powerpc_skip_instruction
357   #endif
358   #if (defined(alpha) || defined(__alpha__))
# Line 292 | Line 361 | static void powerpc_decode_instruction(i
361   #define SIGSEGV_FAULT_HANDLER_ARGS              sig, code, scp
362   #define SIGSEGV_FAULT_ADDRESS                   get_fault_address(scp)
363   #define SIGSEGV_FAULT_INSTRUCTION               scp->sc_pc
364 <
365 < // From Boehm's GC 6.0alpha8
366 < static sigsegv_address_t get_fault_address(struct sigcontext *scp)
367 < {
368 <        unsigned int instruction = *((unsigned int *)(scp->sc_pc));
369 <        unsigned long fault_address = scp->sc_regs[(instruction >> 16) & 0x1f];
370 <        fault_address += (signed long)(signed short)(instruction & 0xffff);
371 <        return (sigsegv_address_t)fault_address;
372 < }
364 > #endif
365 > #if (defined(arm) || defined(__arm__))
366 > #define SIGSEGV_FAULT_HANDLER_ARGLIST   int sig, int r1, int r2, int r3, struct sigcontext sc
367 > #define SIGSEGV_FAULT_HANDLER_ARGLIST_1 struct sigcontext *scp
368 > #define SIGSEGV_FAULT_HANDLER_ARGS              &sc
369 > #define SIGSEGV_FAULT_ADDRESS                   scp->fault_address
370 > #define SIGSEGV_FAULT_INSTRUCTION               scp->arm_pc
371 > #define SIGSEGV_REGISTER_FILE                   &scp->arm_r0
372 > #define SIGSEGV_SKIP_INSTRUCTION                arm_skip_instruction
373   #endif
374   #endif
375  
376   // Irix 5 or 6 on MIPS
377 < #if (defined(sgi) || defined(__sgi)) && (defined(SYSTYPE_SVR4) || defined(__SYSTYPE_SVR4))
377 > #if (defined(sgi) || defined(__sgi)) && (defined(SYSTYPE_SVR4) || defined(_SYSTYPE_SVR4))
378   #include <ucontext.h>
379   #define SIGSEGV_FAULT_HANDLER_ARGLIST   int sig, int code, struct sigcontext *scp
380   #define SIGSEGV_FAULT_HANDLER_ARGS              sig, code, scp
381 < #define SIGSEGV_FAULT_ADDRESS                   scp->sc_badvaddr
381 > #define SIGSEGV_FAULT_ADDRESS                   (unsigned long)scp->sc_badvaddr
382 > #define SIGSEGV_FAULT_INSTRUCTION               (unsigned long)scp->sc_pc
383   #define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGSEGV)
384   #endif
385  
# Line 338 | Line 408 | static sigsegv_address_t get_fault_addre
408   #define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGSEGV)
409   #endif
410  
411 < // NetBSD or FreeBSD
412 < #if defined(__NetBSD__) || defined(__FreeBSD__)
411 > // NetBSD
412 > #if defined(__NetBSD__)
413   #if (defined(m68k) || defined(__m68k__))
414   #include <m68k/frame.h>
415   #define SIGSEGV_FAULT_HANDLER_ARGLIST   int sig, int code, struct sigcontext *scp
# Line 367 | Line 437 | static sigsegv_address_t get_fault_addre
437          }
438          return (sigsegv_address_t)fault_addr;
439   }
440 < #else
441 < #define SIGSEGV_FAULT_HANDLER_ARGLIST   int sig, int code, void *scp, char *addr
440 > #endif
441 > #if (defined(alpha) || defined(__alpha__))
442 > #define SIGSEGV_FAULT_HANDLER_ARGLIST   int sig, int code, struct sigcontext *scp
443 > #define SIGSEGV_FAULT_HANDLER_ARGS              sig, code, scp
444 > #define SIGSEGV_FAULT_ADDRESS                   get_fault_address(scp)
445 > #define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGBUS)
446 > #endif
447 > #if (defined(i386) || defined(__i386__))
448 > #error "FIXME: need to decode instruction and compute EA"
449 > #define SIGSEGV_FAULT_HANDLER_ARGLIST   int sig, int code, struct sigcontext *scp
450 > #define SIGSEGV_FAULT_HANDLER_ARGS              sig, code, scp
451 > #define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGSEGV)
452 > #endif
453 > #endif
454 > #if defined(__FreeBSD__)
455 > #if (defined(i386) || defined(__i386__))
456 > #define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGBUS)
457 > #define SIGSEGV_FAULT_HANDLER_ARGLIST   int sig, int code, struct sigcontext *scp, char *addr
458   #define SIGSEGV_FAULT_HANDLER_ARGS              sig, code, scp, addr
459   #define SIGSEGV_FAULT_ADDRESS                   addr
460 < #define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGBUS)
460 > #define SIGSEGV_FAULT_INSTRUCTION               scp->sc_eip
461 > #define SIGSEGV_REGISTER_FILE                   ((unsigned long *)&scp->sc_edi)
462 > #define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
463 > #endif
464 > #if (defined(alpha) || defined(__alpha__))
465 > #define SIGSEGV_ALL_SIGNALS                             FAULT_HANDLER(SIGSEGV)
466 > #define SIGSEGV_FAULT_HANDLER_ARGLIST   int sig, char *addr, struct sigcontext *scp
467 > #define SIGSEGV_FAULT_HANDLER_ARGS              sig, addr, scp
468 > #define SIGSEGV_FAULT_ADDRESS                   addr
469 > #define SIGSEGV_FAULT_INSTRUCTION               scp->sc_pc
470   #endif
471   #endif
472  
473 + // Extract fault address out of a sigcontext
474 + #if (defined(alpha) || defined(__alpha__))
475 + // From Boehm's GC 6.0alpha8
476 + static sigsegv_address_t get_fault_address(struct sigcontext *scp)
477 + {
478 +        unsigned int instruction = *((unsigned int *)(scp->sc_pc));
479 +        unsigned long fault_address = scp->sc_regs[(instruction >> 16) & 0x1f];
480 +        fault_address += (signed long)(signed short)(instruction & 0xffff);
481 +        return (sigsegv_address_t)fault_address;
482 + }
483 + #endif
484 +
485 +
486   // MacOS X, not sure which version this works in. Under 10.1
487   // vm_protect does not appear to work from a signal handler. Under
488   // 10.2 signal handlers get siginfo type arguments but the si_addr
# Line 408 | Line 516 | static sigsegv_address_t get_fault_addre
516   #endif
517   #endif
518  
519 + #if HAVE_WIN32_EXCEPTIONS
520 + #define WIN32_LEAN_AND_MEAN /* avoid including junk */
521 + #include <windows.h>
522 + #include <winerror.h>
523 +
524 + #define SIGSEGV_FAULT_HANDLER_ARGLIST   EXCEPTION_POINTERS *ExceptionInfo
525 + #define SIGSEGV_FAULT_HANDLER_ARGS              ExceptionInfo
526 + #define SIGSEGV_FAULT_ADDRESS                   ExceptionInfo->ExceptionRecord->ExceptionInformation[1]
527 + #define SIGSEGV_CONTEXT_REGS                    ExceptionInfo->ContextRecord
528 + #define SIGSEGV_FAULT_INSTRUCTION               SIGSEGV_CONTEXT_REGS->Eip
529 + #define SIGSEGV_REGISTER_FILE                   ((unsigned long *)&SIGSEGV_CONTEXT_REGS->Edi)
530 + #define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
531 + #endif
532 +
533   #if HAVE_MACH_EXCEPTIONS
534  
535   // This can easily be extended to other Mach systems, but really who
# Line 468 | Line 590 | if (ret != KERN_SUCCESS) { \
590          exit (1); \
591   }
592  
593 < #define SIGSEGV_FAULT_ADDRESS                   code[1]
594 < #define SIGSEGV_FAULT_INSTRUCTION               get_fault_instruction(thread, state)
595 < #define SIGSEGV_FAULT_HANDLER                   (code[0] == KERN_PROTECTION_FAILURE) && sigsegv_fault_handler
596 < #define SIGSEGV_FAULT_HANDLER_ARGLIST   mach_port_t thread, exception_data_t code, ppc_thread_state_t *state
597 < #define SIGSEGV_FAULT_HANDLER_ARGS              thread, code, &state
593 > #ifdef __ppc__
594 > #define SIGSEGV_THREAD_STATE_TYPE               ppc_thread_state_t
595 > #define SIGSEGV_THREAD_STATE_FLAVOR             PPC_THREAD_STATE
596 > #define SIGSEGV_THREAD_STATE_COUNT              PPC_THREAD_STATE_COUNT
597 > #define SIGSEGV_FAULT_INSTRUCTION               state->srr0
598   #define SIGSEGV_SKIP_INSTRUCTION                powerpc_skip_instruction
599 < #define SIGSEGV_REGISTER_FILE                   &state->srr0, &state->r0
478 <
479 < // Given a suspended thread, stuff the current instruction and
480 < // registers into state.
481 < //
482 < // It would have been nice to have this be ppc/x86 independant which
483 < // could have been done easily with a thread_state_t instead of
484 < // ppc_thread_state_t, but because of the way this is called it is
485 < // easier to do it this way.
486 < #if (defined(ppc) || defined(__ppc__))
487 < static inline sigsegv_address_t get_fault_instruction(mach_port_t thread, ppc_thread_state_t *state)
488 < {
489 <        kern_return_t krc;
490 <        mach_msg_type_number_t count;
491 <
492 <        count = MACHINE_THREAD_STATE_COUNT;
493 <        krc = thread_get_state(thread, MACHINE_THREAD_STATE, (thread_state_t)state, &count);
494 <        MACH_CHECK_ERROR (thread_get_state, krc);
495 <
496 <        return (sigsegv_address_t)state->srr0;
497 < }
599 > #define SIGSEGV_REGISTER_FILE                   (unsigned long *)&state->srr0, (unsigned long *)&state->r0
600   #endif
601 + #ifdef __i386__
602 + #ifdef i386_SAVED_STATE
603 + #define SIGSEGV_THREAD_STATE_TYPE               struct i386_saved_state
604 + #define SIGSEGV_THREAD_STATE_FLAVOR             i386_SAVED_STATE
605 + #define SIGSEGV_THREAD_STATE_COUNT              i386_SAVED_STATE_COUNT
606 + #define SIGSEGV_REGISTER_FILE                   ((unsigned long *)&state->edi) /* EDI is the first GPR we consider */
607 + #else
608 + #define SIGSEGV_THREAD_STATE_TYPE               struct i386_thread_state
609 + #define SIGSEGV_THREAD_STATE_FLAVOR             i386_THREAD_STATE
610 + #define SIGSEGV_THREAD_STATE_COUNT              i386_THREAD_STATE_COUNT
611 + #define SIGSEGV_REGISTER_FILE                   ((unsigned long *)&state->eax) /* EAX is the first GPR we consider */
612 + #endif
613 + #define SIGSEGV_FAULT_INSTRUCTION               state->eip
614 + #define SIGSEGV_SKIP_INSTRUCTION                ix86_skip_instruction
615 + #endif
616 + #define SIGSEGV_FAULT_ADDRESS                   code[1]
617 + #define SIGSEGV_FAULT_HANDLER_INVOKE(ADDR, IP)  ((code[0] == KERN_PROTECTION_FAILURE) ? sigsegv_fault_handler(ADDR, IP) : SIGSEGV_RETURN_FAILURE)
618 + #define SIGSEGV_FAULT_HANDLER_ARGLIST   mach_port_t thread, exception_data_t code, SIGSEGV_THREAD_STATE_TYPE *state
619 + #define SIGSEGV_FAULT_HANDLER_ARGS              thread, code, &state
620  
621   // Since there can only be one exception thread running at any time
622   // this is not a problem.
# Line 550 | Line 671 | handleExceptions(void *priv)
671  
672   #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
673   // Decode and skip X86 instruction
674 < #if (defined(i386) || defined(__i386__))
674 > #if (defined(i386) || defined(__i386__)) || defined(__x86_64__)
675   #if defined(__linux__)
676   enum {
677 + #if (defined(i386) || defined(__i386__))
678          X86_REG_EIP = 14,
679          X86_REG_EAX = 11,
680          X86_REG_ECX = 10,
# Line 562 | Line 684 | enum {
684          X86_REG_EBP = 6,
685          X86_REG_ESI = 5,
686          X86_REG_EDI = 4
687 + #endif
688 + #if defined(__x86_64__)
689 +        X86_REG_R8  = 0,
690 +        X86_REG_R9  = 1,
691 +        X86_REG_R10 = 2,
692 +        X86_REG_R11 = 3,
693 +        X86_REG_R12 = 4,
694 +        X86_REG_R13 = 5,
695 +        X86_REG_R14 = 6,
696 +        X86_REG_R15 = 7,
697 +        X86_REG_EDI = 8,
698 +        X86_REG_ESI = 9,
699 +        X86_REG_EBP = 10,
700 +        X86_REG_EBX = 11,
701 +        X86_REG_EDX = 12,
702 +        X86_REG_EAX = 13,
703 +        X86_REG_ECX = 14,
704 +        X86_REG_ESP = 15,
705 +        X86_REG_EIP = 16
706 + #endif
707   };
708   #endif
709 < #if defined(__NetBSD__) || defined(__FreeBSD__)
709 > #if defined(__NetBSD__)
710   enum {
711 + #if (defined(i386) || defined(__i386__))
712 +        X86_REG_EIP = _REG_EIP,
713 +        X86_REG_EAX = _REG_EAX,
714 +        X86_REG_ECX = _REG_ECX,
715 +        X86_REG_EDX = _REG_EDX,
716 +        X86_REG_EBX = _REG_EBX,
717 +        X86_REG_ESP = _REG_ESP,
718 +        X86_REG_EBP = _REG_EBP,
719 +        X86_REG_ESI = _REG_ESI,
720 +        X86_REG_EDI = _REG_EDI
721 + #endif
722 + };
723 + #endif
724 + #if defined(__FreeBSD__)
725 + enum {
726 + #if (defined(i386) || defined(__i386__))
727          X86_REG_EIP = 10,
728          X86_REG_EAX = 7,
729          X86_REG_ECX = 6,
# Line 575 | Line 733 | enum {
733          X86_REG_EBP = 2,
734          X86_REG_ESI = 1,
735          X86_REG_EDI = 0
736 + #endif
737 + };
738 + #endif
739 + #if defined(__OpenBSD__)
740 + enum {
741 + #if defined(__i386__)
742 +        // EDI is the first register we consider
743 + #define OREG(REG) offsetof(struct sigcontext, sc_##REG)
744 + #define DREG(REG) ((OREG(REG) - OREG(edi)) / 4)
745 +        X86_REG_EIP = DREG(eip), // 7
746 +        X86_REG_EAX = DREG(eax), // 6
747 +        X86_REG_ECX = DREG(ecx), // 5
748 +        X86_REG_EDX = DREG(edx), // 4
749 +        X86_REG_EBX = DREG(ebx), // 3
750 +        X86_REG_ESP = DREG(esp), // 10
751 +        X86_REG_EBP = DREG(ebp), // 2
752 +        X86_REG_ESI = DREG(esi), // 1
753 +        X86_REG_EDI = DREG(edi)  // 0
754 + #undef DREG
755 + #undef OREG
756 + #endif
757 + };
758 + #endif
759 + #if defined(__sun__)
760 + // Same as for Linux, need to check for x86-64
761 + enum {
762 + #if defined(__i386__)
763 +        X86_REG_EIP = EIP,
764 +        X86_REG_EAX = EAX,
765 +        X86_REG_ECX = ECX,
766 +        X86_REG_EDX = EDX,
767 +        X86_REG_EBX = EBX,
768 +        X86_REG_ESP = ESP,
769 +        X86_REG_EBP = EBP,
770 +        X86_REG_ESI = ESI,
771 +        X86_REG_EDI = EDI
772 + #endif
773 + };
774 + #endif
775 + #if defined(__APPLE__) && defined(__MACH__)
776 + enum {
777 + #ifdef i386_SAVED_STATE
778 +        // same as FreeBSD (in Open Darwin 8.0.1)
779 +        X86_REG_EIP = 10,
780 +        X86_REG_EAX = 7,
781 +        X86_REG_ECX = 6,
782 +        X86_REG_EDX = 5,
783 +        X86_REG_EBX = 4,
784 +        X86_REG_ESP = 13,
785 +        X86_REG_EBP = 2,
786 +        X86_REG_ESI = 1,
787 +        X86_REG_EDI = 0
788 + #else
789 +        // new layout (MacOS X 10.4.4 for x86)
790 +        X86_REG_EIP = 10,
791 +        X86_REG_EAX = 0,
792 +        X86_REG_ECX = 2,
793 +        X86_REG_EDX = 4,
794 +        X86_REG_EBX = 1,
795 +        X86_REG_ESP = 7,
796 +        X86_REG_EBP = 6,
797 +        X86_REG_ESI = 5,
798 +        X86_REG_EDI = 4
799 + #endif
800 + };
801 + #endif
802 + #if defined(_WIN32)
803 + enum {
804 + #if (defined(i386) || defined(__i386__))
805 +        X86_REG_EIP = 7,
806 +        X86_REG_EAX = 5,
807 +        X86_REG_ECX = 4,
808 +        X86_REG_EDX = 3,
809 +        X86_REG_EBX = 2,
810 +        X86_REG_ESP = 10,
811 +        X86_REG_EBP = 6,
812 +        X86_REG_ESI = 1,
813 +        X86_REG_EDI = 0
814 + #endif
815   };
816   #endif
817   // FIXME: this is partly redundant with the instruction decoding phase
# Line 611 | Line 848 | static inline int ix86_step_over_modrm(u
848          return offset;
849   }
850  
851 < static bool ix86_skip_instruction(unsigned int * regs)
851 > static bool ix86_skip_instruction(unsigned long * regs)
852   {
853          unsigned char * eip = (unsigned char *)regs[X86_REG_EIP];
854  
855          if (eip == 0)
856                  return false;
857 + #ifdef _WIN32
858 +        if (IsBadCodePtr((FARPROC)eip))
859 +                return false;
860 + #endif
861          
862          transfer_type_t transfer_type = SIGSEGV_TRANSFER_UNKNOWN;
863          transfer_size_t transfer_size = SIZE_LONG;
864          
865          int reg = -1;
866          int len = 0;
867 <        
867 >
868 > #if DEBUG
869 >        printf("IP: %p [%02x %02x %02x %02x...]\n",
870 >                   eip, eip[0], eip[1], eip[2], eip[3]);
871 > #endif
872 >
873          // Operand size prefix
874          if (*eip == 0x66) {
875                  eip++;
# Line 631 | Line 877 | static bool ix86_skip_instruction(unsign
877                  transfer_size = SIZE_WORD;
878          }
879  
880 +        // REX prefix
881 + #if defined(__x86_64__)
882 +        struct rex_t {
883 +                unsigned char W;
884 +                unsigned char R;
885 +                unsigned char X;
886 +                unsigned char B;
887 +        };
888 +        rex_t rex = { 0, 0, 0, 0 };
889 +        bool has_rex = false;
890 +        if ((*eip & 0xf0) == 0x40) {
891 +                has_rex = true;
892 +                const unsigned char b = *eip;
893 +                rex.W = b & (1 << 3);
894 +                rex.R = b & (1 << 2);
895 +                rex.X = b & (1 << 1);
896 +                rex.B = b & (1 << 0);
897 + #if DEBUG
898 +                printf("REX: %c,%c,%c,%c\n",
899 +                           rex.W ? 'W' : '_',
900 +                           rex.R ? 'R' : '_',
901 +                           rex.X ? 'X' : '_',
902 +                           rex.B ? 'B' : '_');
903 + #endif
904 +                eip++;
905 +                len++;
906 +                if (rex.W)
907 +                        transfer_size = SIZE_QUAD;
908 +        }
909 + #else
910 +        const bool has_rex = false;
911 + #endif
912 +
913          // Decode instruction
914 +        int target_size = SIZE_UNKNOWN;
915          switch (eip[0]) {
916          case 0x0f:
917 +                target_size = transfer_size;
918              switch (eip[1]) {
919 +                case 0xbe: // MOVSX r32, r/m8
920              case 0xb6: // MOVZX r32, r/m8
921 +                        transfer_size = SIZE_BYTE;
922 +                        goto do_mov_extend;
923 +                case 0xbf: // MOVSX r32, r/m16
924              case 0xb7: // MOVZX r32, r/m16
925 <                switch (eip[2] & 0xc0) {
925 >                        transfer_size = SIZE_WORD;
926 >                        goto do_mov_extend;
927 >                  do_mov_extend:
928 >                        switch (eip[2] & 0xc0) {
929 >                        case 0x80:
930 >                                reg = (eip[2] >> 3) & 7;
931 >                                transfer_type = SIGSEGV_TRANSFER_LOAD;
932 >                                break;
933 >                        case 0x40:
934 >                                reg = (eip[2] >> 3) & 7;
935 >                                transfer_type = SIGSEGV_TRANSFER_LOAD;
936 >                                break;
937 >                        case 0x00:
938 >                                reg = (eip[2] >> 3) & 7;
939 >                                transfer_type = SIGSEGV_TRANSFER_LOAD;
940 >                                break;
941 >                        }
942 >                        len += 3 + ix86_step_over_modrm(eip + 2);
943 >                        break;
944 >            }
945 >          break;
946 > #if defined(__x86_64__)
947 >        case 0x63: // MOVSXD r64, r/m32
948 >                if (has_rex && rex.W) {
949 >                        transfer_size = SIZE_LONG;
950 >                        target_size = SIZE_QUAD;
951 >                }
952 >                else if (transfer_size != SIZE_WORD) {
953 >                        transfer_size = SIZE_LONG;
954 >                        target_size = SIZE_QUAD;
955 >                }
956 >                switch (eip[1] & 0xc0) {
957                  case 0x80:
958 <                    reg = (eip[2] >> 3) & 7;
959 <                    transfer_type = SIGSEGV_TRANSFER_LOAD;
960 <                    break;
958 >                        reg = (eip[1] >> 3) & 7;
959 >                        transfer_type = SIGSEGV_TRANSFER_LOAD;
960 >                        break;
961                  case 0x40:
962 <                    reg = (eip[2] >> 3) & 7;
963 <                    transfer_type = SIGSEGV_TRANSFER_LOAD;
964 <                    break;
962 >                        reg = (eip[1] >> 3) & 7;
963 >                        transfer_type = SIGSEGV_TRANSFER_LOAD;
964 >                        break;
965                  case 0x00:
966 <                    reg = (eip[2] >> 3) & 7;
967 <                    transfer_type = SIGSEGV_TRANSFER_LOAD;
968 <                    break;
966 >                        reg = (eip[1] >> 3) & 7;
967 >                        transfer_type = SIGSEGV_TRANSFER_LOAD;
968 >                        break;
969                  }
970 <                len += 3 + ix86_step_over_modrm(eip + 2);
970 >                len += 2 + ix86_step_over_modrm(eip + 1);
971                  break;
972 <            }
657 <          break;
972 > #endif
973          case 0x8a: // MOV r8, r/m8
974                  transfer_size = SIZE_BYTE;
975          case 0x8b: // MOV r32, r/m32 (or 16-bit operation)
# Line 694 | Line 1009 | static bool ix86_skip_instruction(unsign
1009                  len += 2 + ix86_step_over_modrm(eip + 1);
1010                  break;
1011          }
1012 +        if (target_size == SIZE_UNKNOWN)
1013 +                target_size = transfer_size;
1014  
1015          if (transfer_type == SIGSEGV_TRANSFER_UNKNOWN) {
1016                  // Unknown machine code, let it crash. Then patch the decoder
1017                  return false;
1018          }
1019  
1020 + #if defined(__x86_64__)
1021 +        if (rex.R)
1022 +                reg += 8;
1023 + #endif
1024 +
1025          if (transfer_type == SIGSEGV_TRANSFER_LOAD && reg != -1) {
1026 <                static const int x86_reg_map[8] = {
1026 >                static const int x86_reg_map[] = {
1027                          X86_REG_EAX, X86_REG_ECX, X86_REG_EDX, X86_REG_EBX,
1028 <                        X86_REG_ESP, X86_REG_EBP, X86_REG_ESI, X86_REG_EDI
1028 >                        X86_REG_ESP, X86_REG_EBP, X86_REG_ESI, X86_REG_EDI,
1029 > #if defined(__x86_64__)
1030 >                        X86_REG_R8,  X86_REG_R9,  X86_REG_R10, X86_REG_R11,
1031 >                        X86_REG_R12, X86_REG_R13, X86_REG_R14, X86_REG_R15,
1032 > #endif
1033                  };
1034                  
1035 <                if (reg < 0 || reg >= 8)
1035 >                if (reg < 0 || reg >= (sizeof(x86_reg_map)/sizeof(x86_reg_map[0]) - 1))
1036                          return false;
1037  
1038 +                // Set 0 to the relevant register part
1039 +                // NOTE: this is only valid for MOV alike instructions
1040                  int rloc = x86_reg_map[reg];
1041 <                switch (transfer_size) {
1041 >                switch (target_size) {
1042                  case SIZE_BYTE:
1043 <                        regs[rloc] = (regs[rloc] & ~0xff);
1043 >                        if (has_rex || reg < 4)
1044 >                                regs[rloc] = (regs[rloc] & ~0x00ffL);
1045 >                        else {
1046 >                                rloc = x86_reg_map[reg - 4];
1047 >                                regs[rloc] = (regs[rloc] & ~0xff00L);
1048 >                        }
1049                          break;
1050                  case SIZE_WORD:
1051 <                        regs[rloc] = (regs[rloc] & ~0xffff);
1051 >                        regs[rloc] = (regs[rloc] & ~0xffffL);
1052                          break;
1053                  case SIZE_LONG:
1054 +                case SIZE_QUAD: // zero-extension
1055                          regs[rloc] = 0;
1056                          break;
1057                  }
# Line 725 | Line 1059 | static bool ix86_skip_instruction(unsign
1059  
1060   #if DEBUG
1061          printf("%08x: %s %s access", regs[X86_REG_EIP],
1062 <                   transfer_size == SIZE_BYTE ? "byte" : transfer_size == SIZE_WORD ? "word" : "long",
1062 >                   transfer_size == SIZE_BYTE ? "byte" :
1063 >                   transfer_size == SIZE_WORD ? "word" :
1064 >                   transfer_size == SIZE_LONG ? "long" :
1065 >                   transfer_size == SIZE_QUAD ? "quad" : "unknown",
1066                     transfer_type == SIGSEGV_TRANSFER_LOAD ? "read" : "write");
1067          
1068          if (reg != -1) {
1069 <                static const char * x86_reg_str_map[8] = {
1070 <                        "eax", "ecx", "edx", "ebx",
1071 <                        "esp", "ebp", "esi", "edi"
1069 >                static const char * x86_byte_reg_str_map[] = {
1070 >                        "al",   "cl",   "dl",   "bl",
1071 >                        "spl",  "bpl",  "sil",  "dil",
1072 >                        "r8b",  "r9b",  "r10b", "r11b",
1073 >                        "r12b", "r13b", "r14b", "r15b",
1074 >                        "ah",   "ch",   "dh",   "bh",
1075 >                };
1076 >                static const char * x86_word_reg_str_map[] = {
1077 >                        "ax",   "cx",   "dx",   "bx",
1078 >                        "sp",   "bp",   "si",   "di",
1079 >                        "r8w",  "r9w",  "r10w", "r11w",
1080 >                        "r12w", "r13w", "r14w", "r15w",
1081 >                };
1082 >                static const char *x86_long_reg_str_map[] = {
1083 >                        "eax",  "ecx",  "edx",  "ebx",
1084 >                        "esp",  "ebp",  "esi",  "edi",
1085 >                        "r8d",  "r9d",  "r10d", "r11d",
1086 >                        "r12d", "r13d", "r14d", "r15d",
1087                  };
1088 <                printf(" %s register %%%s", transfer_type == SIGSEGV_TRANSFER_LOAD ? "to" : "from", x86_reg_str_map[reg]);
1088 >                static const char *x86_quad_reg_str_map[] = {
1089 >                        "rax", "rcx", "rdx", "rbx",
1090 >                        "rsp", "rbp", "rsi", "rdi",
1091 >                        "r8",  "r9",  "r10", "r11",
1092 >                        "r12", "r13", "r14", "r15",
1093 >                };
1094 >                const char * reg_str = NULL;
1095 >                switch (target_size) {
1096 >                case SIZE_BYTE:
1097 >                        reg_str = x86_byte_reg_str_map[(!has_rex && reg >= 4 ? 12 : 0) + reg];
1098 >                        break;
1099 >                case SIZE_WORD: reg_str = x86_word_reg_str_map[reg]; break;
1100 >                case SIZE_LONG: reg_str = x86_long_reg_str_map[reg]; break;
1101 >                case SIZE_QUAD: reg_str = x86_quad_reg_str_map[reg]; break;
1102 >                }
1103 >                if (reg_str)
1104 >                        printf(" %s register %%%s",
1105 >                                   transfer_type == SIGSEGV_TRANSFER_LOAD ? "to" : "from",
1106 >                                   reg_str);
1107          }
1108          printf(", %d bytes instruction\n", len);
1109   #endif
# Line 745 | Line 1115 | static bool ix86_skip_instruction(unsign
1115  
1116   // Decode and skip PPC instruction
1117   #if (defined(powerpc) || defined(__powerpc__) || defined(__ppc__))
1118 < static bool powerpc_skip_instruction(unsigned int * nip_p, unsigned int * regs)
1118 > static bool powerpc_skip_instruction(unsigned long * nip_p, unsigned long * regs)
1119   {
1120          instruction_t instr;
1121          powerpc_decode_instruction(&instr, *nip_p, regs);
# Line 757 | Line 1127 | static bool powerpc_skip_instruction(uns
1127  
1128   #if DEBUG
1129          printf("%08x: %s %s access", *nip_p,
1130 <                   instr.transfer_size == SIZE_BYTE ? "byte" : instr.transfer_size == SIZE_WORD ? "word" : "long",
1130 >                   instr.transfer_size == SIZE_BYTE ? "byte" :
1131 >                   instr.transfer_size == SIZE_WORD ? "word" :
1132 >                   instr.transfer_size == SIZE_LONG ? "long" : "quad",
1133                     instr.transfer_type == SIGSEGV_TRANSFER_LOAD ? "read" : "write");
1134          
1135          if (instr.addr_mode == MODE_U || instr.addr_mode == MODE_UX)
# Line 775 | Line 1147 | static bool powerpc_skip_instruction(uns
1147          return true;
1148   }
1149   #endif
1150 +
1151 + // Decode and skip MIPS instruction
1152 + #if (defined(mips) || defined(__mips))
1153 + enum {
1154 + #if (defined(sgi) || defined(__sgi))
1155 +  MIPS_REG_EPC = 35,
1156 + #endif
1157 + };
1158 + static bool mips_skip_instruction(greg_t * regs)
1159 + {
1160 +  unsigned int * epc = (unsigned int *)(unsigned long)regs[MIPS_REG_EPC];
1161 +
1162 +  if (epc == 0)
1163 +        return false;
1164 +
1165 + #if DEBUG
1166 +  printf("IP: %p [%08x]\n", epc, epc[0]);
1167 + #endif
1168 +
1169 +  transfer_type_t transfer_type = SIGSEGV_TRANSFER_UNKNOWN;
1170 +  transfer_size_t transfer_size = SIZE_LONG;
1171 +  int direction = 0;
1172 +
1173 +  const unsigned int opcode = epc[0];
1174 +  switch (opcode >> 26) {
1175 +  case 32: // Load Byte
1176 +  case 36: // Load Byte Unsigned
1177 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1178 +        transfer_size = SIZE_BYTE;
1179 +        break;
1180 +  case 33: // Load Halfword
1181 +  case 37: // Load Halfword Unsigned
1182 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1183 +        transfer_size = SIZE_WORD;
1184 +        break;
1185 +  case 35: // Load Word
1186 +  case 39: // Load Word Unsigned
1187 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1188 +        transfer_size = SIZE_LONG;
1189 +        break;
1190 +  case 34: // Load Word Left
1191 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1192 +        transfer_size = SIZE_LONG;
1193 +        direction = -1;
1194 +        break;
1195 +  case 38: // Load Word Right
1196 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1197 +        transfer_size = SIZE_LONG;
1198 +        direction = 1;
1199 +        break;
1200 +  case 55: // Load Doubleword
1201 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1202 +        transfer_size = SIZE_QUAD;
1203 +        break;
1204 +  case 26: // Load Doubleword Left
1205 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1206 +        transfer_size = SIZE_QUAD;
1207 +        direction = -1;
1208 +        break;
1209 +  case 27: // Load Doubleword Right
1210 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1211 +        transfer_size = SIZE_QUAD;
1212 +        direction = 1;
1213 +        break;
1214 +  case 40: // Store Byte
1215 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1216 +        transfer_size = SIZE_BYTE;
1217 +        break;
1218 +  case 41: // Store Halfword
1219 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1220 +        transfer_size = SIZE_WORD;
1221 +        break;
1222 +  case 43: // Store Word
1223 +  case 42: // Store Word Left
1224 +  case 46: // Store Word Right
1225 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1226 +        transfer_size = SIZE_LONG;
1227 +        break;
1228 +  case 63: // Store Doubleword
1229 +  case 44: // Store Doubleword Left
1230 +  case 45: // Store Doubleword Right
1231 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1232 +        transfer_size = SIZE_QUAD;
1233 +        break;
1234 +  /* Misc instructions unlikely to be used within CPU emulators */
1235 +  case 48: // Load Linked Word
1236 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1237 +        transfer_size = SIZE_LONG;
1238 +        break;
1239 +  case 52: // Load Linked Doubleword
1240 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1241 +        transfer_size = SIZE_QUAD;
1242 +        break;
1243 +  case 56: // Store Conditional Word
1244 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1245 +        transfer_size = SIZE_LONG;
1246 +        break;
1247 +  case 60: // Store Conditional Doubleword
1248 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1249 +        transfer_size = SIZE_QUAD;
1250 +        break;
1251 +  }
1252 +
1253 +  if (transfer_type == SIGSEGV_TRANSFER_UNKNOWN) {
1254 +        // Unknown machine code, let it crash. Then patch the decoder
1255 +        return false;
1256 +  }
1257 +
1258 +  // Zero target register in case of a load operation
1259 +  const int reg = (opcode >> 16) & 0x1f;
1260 +  if (transfer_type == SIGSEGV_TRANSFER_LOAD) {
1261 +        if (direction == 0)
1262 +          regs[reg] = 0;
1263 +        else {
1264 +          // FIXME: untested code
1265 +          unsigned long ea = regs[(opcode >> 21) & 0x1f];
1266 +          ea += (signed long)(signed int)(signed short)(opcode & 0xffff);
1267 +          const int offset = ea & (transfer_size == SIZE_LONG ? 3 : 7);
1268 +          unsigned long value;
1269 +          if (direction > 0) {
1270 +                const unsigned long rmask = ~((1L << ((offset + 1) * 8)) - 1);
1271 +                value = regs[reg] & rmask;
1272 +          }
1273 +          else {
1274 +                const unsigned long lmask = (1L << (offset * 8)) - 1;
1275 +                value = regs[reg] & lmask;
1276 +          }
1277 +          // restore most significant bits
1278 +          if (transfer_size == SIZE_LONG)
1279 +                value = (signed long)(signed int)value;
1280 +          regs[reg] = value;
1281 +        }
1282 +  }
1283 +
1284 + #if DEBUG
1285 + #if (defined(_ABIN32) || defined(_ABI64))
1286 +  static const char * mips_gpr_names[32] = {
1287 +        "zero", "at",   "v0",   "v1",   "a0",   "a1",   "a2",   "a3",
1288 +        "t0",   "t1",   "t2",   "t3",   "t4",   "t5",   "t6",   "t7",
1289 +        "s0",   "s1",   "s2",   "s3",   "s4",   "s5",   "s6",   "s7",
1290 +        "t8",   "t9",   "k0",   "k1",   "gp",   "sp",   "s8",   "ra"
1291 +  };
1292 + #else
1293 +  static const char * mips_gpr_names[32] = {
1294 +        "zero", "at",   "v0",   "v1",   "a0",   "a1",   "a2",   "a3",
1295 +        "a4",   "a5",   "a6",   "a7",   "t0",   "t1",   "t2",   "t3",
1296 +        "s0",   "s1",   "s2",   "s3",   "s4",   "s5",   "s6",   "s7",
1297 +        "t8",   "t9",   "k0",   "k1",   "gp",   "sp",   "s8",   "ra"
1298 +  };
1299 + #endif
1300 +  printf("%s %s register %s\n",
1301 +                 transfer_size == SIZE_BYTE ? "byte" :
1302 +                 transfer_size == SIZE_WORD ? "word" :
1303 +                 transfer_size == SIZE_LONG ? "long" :
1304 +                 transfer_size == SIZE_QUAD ? "quad" : "unknown",
1305 +                 transfer_type == SIGSEGV_TRANSFER_LOAD ? "load to" : "store from",
1306 +                 mips_gpr_names[reg]);
1307 + #endif
1308 +
1309 +  regs[MIPS_REG_EPC] += 4;
1310 +  return true;
1311 + }
1312 + #endif
1313 +
1314 + // Decode and skip SPARC instruction
1315 + #if (defined(sparc) || defined(__sparc__))
1316 + enum {
1317 + #if (defined(__sun__))
1318 +  SPARC_REG_G1 = REG_G1,
1319 +  SPARC_REG_O0 = REG_O0,
1320 +  SPARC_REG_PC = REG_PC,
1321 +  SPARC_REG_nPC = REG_nPC
1322   #endif
1323 + };
1324 + static bool sparc_skip_instruction(unsigned long * regs, gwindows_t * gwins, struct rwindow * rwin)
1325 + {
1326 +  unsigned int * pc = (unsigned int *)regs[SPARC_REG_PC];
1327 +
1328 +  if (pc == 0)
1329 +        return false;
1330 +
1331 + #if DEBUG
1332 +  printf("IP: %p [%08x]\n", pc, pc[0]);
1333 + #endif
1334 +
1335 +  transfer_type_t transfer_type = SIGSEGV_TRANSFER_UNKNOWN;
1336 +  transfer_size_t transfer_size = SIZE_LONG;
1337 +  bool register_pair = false;
1338 +
1339 +  const unsigned int opcode = pc[0];
1340 +  if ((opcode >> 30) != 3)
1341 +        return false;
1342 +  switch ((opcode >> 19) & 0x3f) {
1343 +  case 9: // Load Signed Byte
1344 +  case 1: // Load Unsigned Byte
1345 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1346 +        transfer_size = SIZE_BYTE;
1347 +        break;
1348 +  case 10:// Load Signed Halfword
1349 +  case 2: // Load Unsigned Word
1350 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1351 +        transfer_size = SIZE_WORD;
1352 +        break;
1353 +  case 8: // Load Word
1354 +  case 0: // Load Unsigned Word
1355 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1356 +        transfer_size = SIZE_LONG;
1357 +        break;
1358 +  case 11:// Load Extended Word
1359 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1360 +        transfer_size = SIZE_QUAD;
1361 +        break;
1362 +  case 3: // Load Doubleword
1363 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1364 +        transfer_size = SIZE_LONG;
1365 +        register_pair = true;
1366 +        break;
1367 +  case 5: // Store Byte
1368 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1369 +        transfer_size = SIZE_BYTE;
1370 +        break;
1371 +  case 6: // Store Halfword
1372 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1373 +        transfer_size = SIZE_WORD;
1374 +        break;
1375 +  case 4: // Store Word
1376 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1377 +        transfer_size = SIZE_LONG;
1378 +        break;
1379 +  case 14:// Store Extended Word
1380 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1381 +        transfer_size = SIZE_QUAD;
1382 +        break;
1383 +  case 7: // Store Doubleword
1384 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1385 +        transfer_size = SIZE_LONG;
1386 +        register_pair = true;
1387 +        break;
1388 +  }
1389 +
1390 +  if (transfer_type == SIGSEGV_TRANSFER_UNKNOWN) {
1391 +        // Unknown machine code, let it crash. Then patch the decoder
1392 +        return false;
1393 +  }
1394 +
1395 +  const int reg = (opcode >> 25) & 0x1f;
1396 +
1397 + #if DEBUG
1398 +  static const char * reg_names[] = {
1399 +        "g0", "g1", "g2", "g3", "g4", "g5", "g6", "g7",
1400 +        "o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7",
1401 +        "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7",
1402 +        "i0", "i1", "i2", "i3", "i4", "i5", "fp", "i7"
1403 +  };
1404 +  printf("%s %s register %s\n",
1405 +                 transfer_size == SIZE_BYTE ? "byte" :
1406 +                 transfer_size == SIZE_WORD ? "word" :
1407 +                 transfer_size == SIZE_LONG ? "long" :
1408 +                 transfer_size == SIZE_QUAD ? "quad" : "unknown",
1409 +                 transfer_type == SIGSEGV_TRANSFER_LOAD ? "load to" : "store from",
1410 +                 reg_names[reg]);
1411 + #endif
1412 +
1413 +  // Zero target register in case of a load operation
1414 +  if (transfer_type == SIGSEGV_TRANSFER_LOAD && reg != 0) {
1415 +        // FIXME: code to handle local & input registers is not tested
1416 +        if (reg >= 1 && reg < 8) {
1417 +          // global registers
1418 +          regs[reg - 1 + SPARC_REG_G1] = 0;
1419 +        }
1420 +        else if (reg >= 8 && reg < 16) {
1421 +          // output registers
1422 +          regs[reg - 8 + SPARC_REG_O0] = 0;
1423 +        }
1424 +        else if (reg >= 16 && reg < 24) {
1425 +          // local registers (in register windows)
1426 +          if (gwins)
1427 +                gwins->wbuf->rw_local[reg - 16] = 0;
1428 +          else
1429 +                rwin->rw_local[reg - 16] = 0;
1430 +        }
1431 +        else {
1432 +          // input registers (in register windows)
1433 +          if (gwins)
1434 +                gwins->wbuf->rw_in[reg - 24] = 0;
1435 +          else
1436 +                rwin->rw_in[reg - 24] = 0;
1437 +        }
1438 +  }
1439 +
1440 +  regs[SPARC_REG_PC] += 4;
1441 +  regs[SPARC_REG_nPC] += 4;
1442 +  return true;
1443 + }
1444 + #endif
1445 + #endif
1446 +
1447 + // Decode and skip ARM instruction
1448 + #if (defined(arm) || defined(__arm__))
1449 + enum {
1450 + #if (defined(__linux__))
1451 +  ARM_REG_PC = 15,
1452 +  ARM_REG_CPSR = 16
1453 + #endif
1454 + };
1455 + static bool arm_skip_instruction(unsigned long * regs)
1456 + {
1457 +  unsigned int * pc = (unsigned int *)regs[ARM_REG_PC];
1458 +
1459 +  if (pc == 0)
1460 +        return false;
1461 +
1462 + #if DEBUG
1463 +  printf("IP: %p [%08x]\n", pc, pc[0]);
1464 + #endif
1465 +
1466 +  transfer_type_t transfer_type = SIGSEGV_TRANSFER_UNKNOWN;
1467 +  transfer_size_t transfer_size = SIZE_UNKNOWN;
1468 +  enum { op_sdt = 1, op_sdth = 2 };
1469 +  int op = 0;
1470 +
1471 +  // Handle load/store instructions only
1472 +  const unsigned int opcode = pc[0];
1473 +  switch ((opcode >> 25) & 7) {
1474 +  case 0: // Halfword and Signed Data Transfer (LDRH, STRH, LDRSB, LDRSH)
1475 +        op = op_sdth;
1476 +        // Determine transfer size (S/H bits)
1477 +        switch ((opcode >> 5) & 3) {
1478 +        case 0: // SWP instruction
1479 +          break;
1480 +        case 1: // Unsigned halfwords
1481 +        case 3: // Signed halfwords
1482 +          transfer_size = SIZE_WORD;
1483 +          break;
1484 +        case 2: // Signed byte
1485 +          transfer_size = SIZE_BYTE;
1486 +          break;
1487 +        }
1488 +        break;
1489 +  case 2:
1490 +  case 3: // Single Data Transfer (LDR, STR)
1491 +        op = op_sdt;
1492 +        // Determine transfer size (B bit)
1493 +        if (((opcode >> 22) & 1) == 1)
1494 +          transfer_size = SIZE_BYTE;
1495 +        else
1496 +          transfer_size = SIZE_LONG;
1497 +        break;
1498 +  default:
1499 +        // FIXME: support load/store mutliple?
1500 +        return false;
1501 +  }
1502 +
1503 +  // Check for invalid transfer size (SWP instruction?)
1504 +  if (transfer_size == SIZE_UNKNOWN)
1505 +        return false;
1506 +
1507 +  // Determine transfer type (L bit)
1508 +  if (((opcode >> 20) & 1) == 1)
1509 +        transfer_type = SIGSEGV_TRANSFER_LOAD;
1510 +  else
1511 +        transfer_type = SIGSEGV_TRANSFER_STORE;
1512 +
1513 +  // Compute offset
1514 +  int offset;
1515 +  if (((opcode >> 25) & 1) == 0) {
1516 +        if (op == op_sdt)
1517 +          offset = opcode & 0xfff;
1518 +        else if (op == op_sdth) {
1519 +          int rm = opcode & 0xf;
1520 +          if (((opcode >> 22) & 1) == 0) {
1521 +                // register offset
1522 +                offset = regs[rm];
1523 +          }
1524 +          else {
1525 +                // immediate offset
1526 +                offset = ((opcode >> 4) & 0xf0) | (opcode & 0x0f);
1527 +          }
1528 +        }
1529 +  }
1530 +  else {
1531 +        const int rm = opcode & 0xf;
1532 +        const int sh = (opcode >> 7) & 0x1f;
1533 +        if (((opcode >> 4) & 1) == 1) {
1534 +          // we expect only legal load/store instructions
1535 +          printf("FATAL: invalid shift operand\n");
1536 +          return false;
1537 +        }
1538 +        const unsigned int v = regs[rm];
1539 +        switch ((opcode >> 5) & 3) {
1540 +        case 0: // logical shift left
1541 +          offset = sh ? v << sh : v;
1542 +          break;
1543 +        case 1: // logical shift right
1544 +          offset = sh ? v >> sh : 0;
1545 +          break;
1546 +        case 2: // arithmetic shift right
1547 +          if (sh)
1548 +                offset = ((signed int)v) >> sh;
1549 +          else
1550 +                offset = (v & 0x80000000) ? 0xffffffff : 0;
1551 +          break;
1552 +        case 3: // rotate right
1553 +          if (sh)
1554 +                offset = (v >> sh) | (v << (32 - sh));
1555 +          else
1556 +                offset = (v >> 1) | ((regs[ARM_REG_CPSR] << 2) & 0x80000000);
1557 +          break;
1558 +        }
1559 +  }
1560 +  if (((opcode >> 23) & 1) == 0)
1561 +        offset = -offset;
1562 +
1563 +  int rd = (opcode >> 12) & 0xf;
1564 +  int rn = (opcode >> 16) & 0xf;
1565 + #if DEBUG
1566 +  static const char * reg_names[] = {
1567 +        "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
1568 +        "r9", "r9", "sl", "fp", "ip", "sp", "lr", "pc"
1569 +  };
1570 +  printf("%s %s register %s\n",
1571 +                 transfer_size == SIZE_BYTE ? "byte" :
1572 +                 transfer_size == SIZE_WORD ? "word" :
1573 +                 transfer_size == SIZE_LONG ? "long" : "unknown",
1574 +                 transfer_type == SIGSEGV_TRANSFER_LOAD ? "load to" : "store from",
1575 +                 reg_names[rd]);
1576 + #endif
1577 +
1578 +  unsigned int base = regs[rn];
1579 +  if (((opcode >> 24) & 1) == 1)
1580 +        base += offset;
1581 +
1582 +  if (transfer_type == SIGSEGV_TRANSFER_LOAD)
1583 +        regs[rd] = 0;
1584 +
1585 +  if (((opcode >> 24) & 1) == 0)                // post-index addressing
1586 +        regs[rn] += offset;
1587 +  else if (((opcode >> 21) & 1) == 1)   // write-back address into base
1588 +        regs[rn] = base;
1589 +
1590 +  regs[ARM_REG_PC] += 4;
1591 +  return true;
1592 + }
1593 + #endif
1594 +
1595  
1596   // Fallbacks
1597   #ifndef SIGSEGV_FAULT_INSTRUCTION
# Line 784 | Line 1600 | static bool powerpc_skip_instruction(uns
1600   #ifndef SIGSEGV_FAULT_HANDLER_ARGLIST_1
1601   #define SIGSEGV_FAULT_HANDLER_ARGLIST_1 SIGSEGV_FAULT_HANDLER_ARGLIST
1602   #endif
1603 + #ifndef SIGSEGV_FAULT_HANDLER_INVOKE
1604 + #define SIGSEGV_FAULT_HANDLER_INVOKE(ADDR, IP)  sigsegv_fault_handler(ADDR, IP)
1605 + #endif
1606  
1607   // SIGSEGV recovery supported ?
1608   #if defined(SIGSEGV_ALL_SIGNALS) && defined(SIGSEGV_FAULT_HANDLER_ARGLIST) && defined(SIGSEGV_FAULT_ADDRESS)
# Line 795 | Line 1614 | static bool powerpc_skip_instruction(uns
1614   *  SIGSEGV global handler
1615   */
1616  
798 #if defined(HAVE_SIGSEGV_RECOVERY) || defined(HAVE_MACH_EXCEPTIONS)
1617   // This function handles the badaccess to memory.
1618   // It is called from the signal handler or the exception handler.
1619   static bool handle_badaccess(SIGSEGV_FAULT_HANDLER_ARGLIST_1)
1620   {
1621 + #ifdef HAVE_MACH_EXCEPTIONS
1622 +        // We must match the initial count when writing back the CPU state registers
1623 +        kern_return_t krc;
1624 +        mach_msg_type_number_t count;
1625 +
1626 +        count = SIGSEGV_THREAD_STATE_COUNT;
1627 +        krc = thread_get_state(thread, SIGSEGV_THREAD_STATE_FLAVOR, (thread_state_t)state, &count);
1628 +        MACH_CHECK_ERROR (thread_get_state, krc);
1629 + #endif
1630 +
1631          sigsegv_address_t fault_address = (sigsegv_address_t)SIGSEGV_FAULT_ADDRESS;
1632          sigsegv_address_t fault_instruction = (sigsegv_address_t)SIGSEGV_FAULT_INSTRUCTION;
1633          
1634          // Call user's handler and reinstall the global handler, if required
1635 <        switch (sigsegv_fault_handler(fault_address, fault_instruction)) {
1635 >        switch (SIGSEGV_FAULT_HANDLER_INVOKE(fault_address, fault_instruction)) {
1636          case SIGSEGV_RETURN_SUCCESS:
1637                  return true;
1638  
# Line 818 | Line 1646 | static bool handle_badaccess(SIGSEGV_FAU
1646                          // is modified off of the stack, in Mach we
1647                          // need to actually call thread_set_state to
1648                          // have the register values updated.
821                        kern_return_t krc;
822
1649                          krc = thread_set_state(thread,
1650 <                                                                   MACHINE_THREAD_STATE, (thread_state_t)state,
1651 <                                                                   MACHINE_THREAD_STATE_COUNT);
1652 <                        MACH_CHECK_ERROR (thread_get_state, krc);
1650 >                                                                   SIGSEGV_THREAD_STATE_FLAVOR, (thread_state_t)state,
1651 >                                                                   count);
1652 >                        MACH_CHECK_ERROR (thread_set_state, krc);
1653   #endif
1654                          return true;
1655                  }
1656                  break;
1657   #endif
1658 +        case SIGSEGV_RETURN_FAILURE:
1659 +                // We can't do anything with the fault_address, dump state?
1660 +                if (sigsegv_state_dumper != 0)
1661 +                        sigsegv_state_dumper(fault_address, fault_instruction);
1662 +                break;
1663          }
833        
834        // We can't do anything with the fault_address, dump state?
835        if (sigsegv_state_dumper != 0)
836                sigsegv_state_dumper(fault_address, fault_instruction);
1664  
1665          return false;
1666   }
840 #endif
1667  
1668  
1669   /*
# Line 874 | Line 1700 | forward_exception(mach_port_t thread_por
1700          mach_port_t port;
1701          exception_behavior_t behavior;
1702          thread_state_flavor_t flavor;
1703 <        thread_state_t thread_state;
1703 >        thread_state_data_t thread_state;
1704          mach_msg_type_number_t thread_state_count;
1705  
1706          for (portIndex = 0; portIndex < oldExceptionPorts->maskCount; portIndex++) {
# Line 899 | Line 1725 | forward_exception(mach_port_t thread_por
1725  
1726          if (behavior != EXCEPTION_DEFAULT) {
1727                  thread_state_count = THREAD_STATE_MAX;
1728 <                kret = thread_get_state (thread_port, flavor, thread_state,
1728 >                kret = thread_get_state (thread_port, flavor, (natural_t *)&thread_state,
1729                                                                   &thread_state_count);
1730                  MACH_CHECK_ERROR (thread_get_state, kret);
1731          }
# Line 915 | Line 1741 | forward_exception(mach_port_t thread_por
1741            // fprintf(stderr, "forwarding to exception_raise_state\n");
1742            kret = exception_raise_state(port, exception_type, exception_data,
1743                                                                     data_count, &flavor,
1744 <                                                                   thread_state, thread_state_count,
1745 <                                                                   thread_state, &thread_state_count);
1744 >                                                                   (natural_t *)&thread_state, thread_state_count,
1745 >                                                                   (natural_t *)&thread_state, &thread_state_count);
1746            MACH_CHECK_ERROR (exception_raise_state, kret);
1747            break;
1748          case EXCEPTION_STATE_IDENTITY:
# Line 924 | Line 1750 | forward_exception(mach_port_t thread_por
1750            kret = exception_raise_state_identity(port, thread_port, task_port,
1751                                                                                          exception_type, exception_data,
1752                                                                                          data_count, &flavor,
1753 <                                                                                        thread_state, thread_state_count,
1754 <                                                                                        thread_state, &thread_state_count);
1753 >                                                                                        (natural_t *)&thread_state, thread_state_count,
1754 >                                                                                        (natural_t *)&thread_state, &thread_state_count);
1755            MACH_CHECK_ERROR (exception_raise_state_identity, kret);
1756            break;
1757          default:
# Line 934 | Line 1760 | forward_exception(mach_port_t thread_por
1760          }
1761  
1762          if (behavior != EXCEPTION_DEFAULT) {
1763 <                kret = thread_set_state (thread_port, flavor, thread_state,
1763 >                kret = thread_set_state (thread_port, flavor, (natural_t *)&thread_state,
1764                                                                   thread_state_count);
1765                  MACH_CHECK_ERROR (thread_set_state, kret);
1766          }
# Line 969 | Line 1795 | catch_exception_raise(mach_port_t except
1795                                            exception_data_t code,
1796                                            mach_msg_type_number_t codeCount)
1797   {
1798 <        ppc_thread_state_t state;
1798 >        SIGSEGV_THREAD_STATE_TYPE state;
1799          kern_return_t krc;
1800  
1801          if ((exception == EXC_BAD_ACCESS)  && (codeCount >= 2)) {
# Line 1108 | Line 1934 | static bool sigsegv_do_install_handler(s
1934          // addressing modes) used in PPC instructions, you will need the
1935          // GPR state anyway.
1936          krc = thread_set_exception_ports(mach_thread_self(), EXC_MASK_BAD_ACCESS, _exceptionPort,
1937 <                                EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
1937 >                                EXCEPTION_DEFAULT, SIGSEGV_THREAD_STATE_FLAVOR);
1938          if (krc != KERN_SUCCESS) {
1939                  mach_error("thread_set_exception_ports", krc);
1940                  return false;
# Line 1131 | Line 1957 | static bool sigsegv_do_install_handler(s
1957   }
1958   #endif
1959  
1960 + #ifdef HAVE_WIN32_EXCEPTIONS
1961 + static LONG WINAPI main_exception_filter(EXCEPTION_POINTERS *ExceptionInfo)
1962 + {
1963 +        if (sigsegv_fault_handler != NULL
1964 +                && ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION
1965 +                && ExceptionInfo->ExceptionRecord->NumberParameters == 2
1966 +                && handle_badaccess(ExceptionInfo))
1967 +                return EXCEPTION_CONTINUE_EXECUTION;
1968 +
1969 +        return EXCEPTION_CONTINUE_SEARCH;
1970 + }
1971 +
1972 + #if defined __CYGWIN__ && defined __i386__
1973 + /* In Cygwin programs, SetUnhandledExceptionFilter has no effect because Cygwin
1974 +   installs a global exception handler.  We have to dig deep in order to install
1975 +   our main_exception_filter.  */
1976 +
1977 + /* Data structures for the current thread's exception handler chain.
1978 +   On the x86 Windows uses register fs, offset 0 to point to the current
1979 +   exception handler; Cygwin mucks with it, so we must do the same... :-/ */
1980 +
1981 + /* Magic taken from winsup/cygwin/include/exceptions.h.  */
1982 +
1983 + struct exception_list {
1984 +    struct exception_list *prev;
1985 +    int (*handler) (EXCEPTION_RECORD *, void *, CONTEXT *, void *);
1986 + };
1987 + typedef struct exception_list exception_list;
1988 +
1989 + /* Magic taken from winsup/cygwin/exceptions.cc.  */
1990 +
1991 + __asm__ (".equ __except_list,0");
1992 +
1993 + extern exception_list *_except_list __asm__ ("%fs:__except_list");
1994 +
1995 + /* For debugging.  _except_list is not otherwise accessible from gdb.  */
1996 + static exception_list *
1997 + debug_get_except_list ()
1998 + {
1999 +  return _except_list;
2000 + }
2001 +
2002 + /* Cygwin's original exception handler.  */
2003 + static int (*cygwin_exception_handler) (EXCEPTION_RECORD *, void *, CONTEXT *, void *);
2004 +
2005 + /* Our exception handler.  */
2006 + static int
2007 + libsigsegv_exception_handler (EXCEPTION_RECORD *exception, void *frame, CONTEXT *context, void *dispatch)
2008 + {
2009 +  EXCEPTION_POINTERS ExceptionInfo;
2010 +  ExceptionInfo.ExceptionRecord = exception;
2011 +  ExceptionInfo.ContextRecord = context;
2012 +  if (main_exception_filter (&ExceptionInfo) == EXCEPTION_CONTINUE_SEARCH)
2013 +    return cygwin_exception_handler (exception, frame, context, dispatch);
2014 +  else
2015 +    return 0;
2016 + }
2017 +
2018 + static void
2019 + do_install_main_exception_filter ()
2020 + {
2021 +  /* We cannot insert any handler into the chain, because such handlers
2022 +     must lie on the stack (?).  Instead, we have to replace(!) Cygwin's
2023 +     global exception handler.  */
2024 +  cygwin_exception_handler = _except_list->handler;
2025 +  _except_list->handler = libsigsegv_exception_handler;
2026 + }
2027 +
2028 + #else
2029 +
2030 + static void
2031 + do_install_main_exception_filter ()
2032 + {
2033 +  SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) &main_exception_filter);
2034 + }
2035 + #endif
2036 +
2037 + static bool sigsegv_do_install_handler(sigsegv_fault_handler_t handler)
2038 + {
2039 +        static bool main_exception_filter_installed = false;
2040 +        if (!main_exception_filter_installed) {
2041 +                do_install_main_exception_filter();
2042 +                main_exception_filter_installed = true;
2043 +        }
2044 +        sigsegv_fault_handler = handler;
2045 +        return true;
2046 + }
2047 + #endif
2048 +
2049   bool sigsegv_install_handler(sigsegv_fault_handler_t handler)
2050   {
2051   #if defined(HAVE_SIGSEGV_RECOVERY)
# Line 1141 | Line 2056 | bool sigsegv_install_handler(sigsegv_fau
2056          if (success)
2057              sigsegv_fault_handler = handler;
2058          return success;
2059 < #elif defined(HAVE_MACH_EXCEPTIONS)
2059 > #elif defined(HAVE_MACH_EXCEPTIONS) || defined(HAVE_WIN32_EXCEPTIONS)
2060          return sigsegv_do_install_handler(handler);
2061   #else
2062          // FAIL: no siginfo_t nor sigcontext subterfuge is available
# Line 1167 | Line 2082 | void sigsegv_deinstall_handler(void)
2082          SIGSEGV_ALL_SIGNALS
2083   #undef FAULT_HANDLER
2084   #endif
2085 + #ifdef HAVE_WIN32_EXCEPTIONS
2086 +        sigsegv_fault_handler = NULL;
2087 + #endif
2088   }
2089  
2090  
# Line 1188 | Line 2106 | void sigsegv_set_dump_state(sigsegv_stat
2106   #include <stdio.h>
2107   #include <stdlib.h>
2108   #include <fcntl.h>
2109 + #ifdef HAVE_SYS_MMAN_H
2110   #include <sys/mman.h>
2111 + #endif
2112   #include "vm_alloc.h"
2113  
2114 + const int REF_INDEX = 123;
2115 + const int REF_VALUE = 45;
2116 +
2117   static int page_size;
2118   static volatile char * page = 0;
2119   static volatile int handler_called = 0;
2120  
2121 + /* Barriers */
2122 + #ifdef __GNUC__
2123 + #define BARRIER() asm volatile ("" : : : "memory")
2124 + #else
2125 + #define BARRIER() /* nothing */
2126 + #endif
2127 +
2128 + #ifdef __GNUC__
2129 + // Code range where we expect the fault to come from
2130 + static void *b_region, *e_region;
2131 + #endif
2132 +
2133   static sigsegv_return_t sigsegv_test_handler(sigsegv_address_t fault_address, sigsegv_address_t instruction_address)
2134   {
2135 + #if DEBUG
2136 +        printf("sigsegv_test_handler(%p, %p)\n", fault_address, instruction_address);
2137 +        printf("expected fault at %p\n", page + REF_INDEX);
2138 + #ifdef __GNUC__
2139 +        printf("expected instruction address range: %p-%p\n", b_region, e_region);
2140 + #endif
2141 + #endif
2142          handler_called++;
2143 <        if ((fault_address - 123) != page)
2143 >        if ((fault_address - REF_INDEX) != page)
2144                  exit(10);
2145 <        if (vm_protect((char *)((unsigned long)fault_address & -page_size), page_size, VM_PAGE_READ | VM_PAGE_WRITE) != 0)
2145 > #ifdef __GNUC__
2146 >        // Make sure reported fault instruction address falls into
2147 >        // expected code range
2148 >        if (instruction_address != SIGSEGV_INVALID_PC
2149 >                && ((instruction_address <  (sigsegv_address_t)b_region) ||
2150 >                        (instruction_address >= (sigsegv_address_t)e_region)))
2151                  exit(11);
2152 + #endif
2153 +        if (vm_protect((char *)((unsigned long)fault_address & -page_size), page_size, VM_PAGE_READ | VM_PAGE_WRITE) != 0)
2154 +                exit(12);
2155          return SIGSEGV_RETURN_SUCCESS;
2156   }
2157  
2158   #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
1209 #ifdef __GNUC__
1210 // Code range where we expect the fault to come from
1211 static void *b_region, *e_region;
1212 #endif
1213
2159   static sigsegv_return_t sigsegv_insn_handler(sigsegv_address_t fault_address, sigsegv_address_t instruction_address)
2160   {
2161 + #if DEBUG
2162 +        printf("sigsegv_insn_handler(%p, %p)\n", fault_address, instruction_address);
2163 + #endif
2164          if (((unsigned long)fault_address - (unsigned long)page) < page_size) {
2165   #ifdef __GNUC__
2166                  // Make sure reported fault instruction address falls into
# Line 1227 | Line 2175 | static sigsegv_return_t sigsegv_insn_han
2175  
2176          return SIGSEGV_RETURN_FAILURE;
2177   }
2178 +
2179 + // More sophisticated tests for instruction skipper
2180 + static bool arch_insn_skipper_tests()
2181 + {
2182 + #if (defined(i386) || defined(__i386__)) || defined(__x86_64__)
2183 +        static const unsigned char code[] = {
2184 +                0x8a, 0x00,                    // mov    (%eax),%al
2185 +                0x8a, 0x2c, 0x18,              // mov    (%eax,%ebx,1),%ch
2186 +                0x88, 0x20,                    // mov    %ah,(%eax)
2187 +                0x88, 0x08,                    // mov    %cl,(%eax)
2188 +                0x66, 0x8b, 0x00,              // mov    (%eax),%ax
2189 +                0x66, 0x8b, 0x0c, 0x18,        // mov    (%eax,%ebx,1),%cx
2190 +                0x66, 0x89, 0x00,              // mov    %ax,(%eax)
2191 +                0x66, 0x89, 0x0c, 0x18,        // mov    %cx,(%eax,%ebx,1)
2192 +                0x8b, 0x00,                    // mov    (%eax),%eax
2193 +                0x8b, 0x0c, 0x18,              // mov    (%eax,%ebx,1),%ecx
2194 +                0x89, 0x00,                    // mov    %eax,(%eax)
2195 +                0x89, 0x0c, 0x18,              // mov    %ecx,(%eax,%ebx,1)
2196 + #if defined(__x86_64__)
2197 +                0x44, 0x8a, 0x00,              // mov    (%rax),%r8b
2198 +                0x44, 0x8a, 0x20,              // mov    (%rax),%r12b
2199 +                0x42, 0x8a, 0x3c, 0x10,        // mov    (%rax,%r10,1),%dil
2200 +                0x44, 0x88, 0x00,              // mov    %r8b,(%rax)
2201 +                0x44, 0x88, 0x20,              // mov    %r12b,(%rax)
2202 +                0x42, 0x88, 0x3c, 0x10,        // mov    %dil,(%rax,%r10,1)
2203 +                0x66, 0x44, 0x8b, 0x00,        // mov    (%rax),%r8w
2204 +                0x66, 0x42, 0x8b, 0x0c, 0x10,  // mov    (%rax,%r10,1),%cx
2205 +                0x66, 0x44, 0x89, 0x00,        // mov    %r8w,(%rax)
2206 +                0x66, 0x42, 0x89, 0x0c, 0x10,  // mov    %cx,(%rax,%r10,1)
2207 +                0x44, 0x8b, 0x00,              // mov    (%rax),%r8d
2208 +                0x42, 0x8b, 0x0c, 0x10,        // mov    (%rax,%r10,1),%ecx
2209 +                0x44, 0x89, 0x00,              // mov    %r8d,(%rax)
2210 +                0x42, 0x89, 0x0c, 0x10,        // mov    %ecx,(%rax,%r10,1)
2211 +                0x48, 0x8b, 0x08,              // mov    (%rax),%rcx
2212 +                0x4c, 0x8b, 0x18,              // mov    (%rax),%r11
2213 +                0x4a, 0x8b, 0x0c, 0x10,        // mov    (%rax,%r10,1),%rcx
2214 +                0x4e, 0x8b, 0x1c, 0x10,        // mov    (%rax,%r10,1),%r11
2215 +                0x48, 0x89, 0x08,              // mov    %rcx,(%rax)
2216 +                0x4c, 0x89, 0x18,              // mov    %r11,(%rax)
2217 +                0x4a, 0x89, 0x0c, 0x10,        // mov    %rcx,(%rax,%r10,1)
2218 +                0x4e, 0x89, 0x1c, 0x10,        // mov    %r11,(%rax,%r10,1)
2219 +                0x63, 0x47, 0x04,              // movslq 4(%rdi),%eax
2220 +                0x48, 0x63, 0x47, 0x04,        // movslq 4(%rdi),%rax
2221 + #endif
2222 +                0                              // end
2223 +        };
2224 +        const int N_REGS = 20;
2225 +        unsigned long regs[N_REGS];
2226 +        for (int i = 0; i < N_REGS; i++)
2227 +                regs[i] = i;
2228 +        const unsigned long start_code = (unsigned long)&code;
2229 +        regs[X86_REG_EIP] = start_code;
2230 +        while ((regs[X86_REG_EIP] - start_code) < (sizeof(code) - 1)
2231 +                   && ix86_skip_instruction(regs))
2232 +                ; /* simply iterate */
2233 +        return (regs[X86_REG_EIP] - start_code) == (sizeof(code) - 1);
2234 + #endif
2235 +        return true;
2236 + }
2237   #endif
2238  
2239   int main(void)
# Line 1234 | Line 2241 | int main(void)
2241          if (vm_init() < 0)
2242                  return 1;
2243  
2244 <        page_size = getpagesize();
2244 >        page_size = vm_get_page_size();
2245          if ((page = (char *)vm_acquire(page_size)) == VM_MAP_FAILED)
2246                  return 2;
2247          
2248 +        memset((void *)page, 0, page_size);
2249          if (vm_protect((char *)page, page_size, VM_PAGE_READ) < 0)
2250                  return 3;
2251          
2252          if (!sigsegv_install_handler(sigsegv_test_handler))
2253                  return 4;
2254          
2255 <        page[123] = 45;
2256 <        page[123] = 45;
2257 <        
2255 > #ifdef __GNUC__
2256 >        b_region = &&L_b_region1;
2257 >        e_region = &&L_e_region1;
2258 > #endif
2259 > L_b_region1:
2260 >        page[REF_INDEX] = REF_VALUE;
2261 >        if (page[REF_INDEX] != REF_VALUE)
2262 >          exit(20);
2263 >        page[REF_INDEX] = REF_VALUE;
2264 >        BARRIER();
2265 > L_e_region1:
2266 >
2267          if (handler_called != 1)
2268                  return 5;
2269  
# Line 1264 | Line 2281 | int main(void)
2281                  return 8;
2282          
2283   #define TEST_SKIP_INSTRUCTION(TYPE) do {                                \
2284 <                const unsigned int TAG = 0x12345678;                    \
2284 >                const unsigned long TAG = 0x12345678 |                  \
2285 >                (sizeof(long) == 8 ? 0x9abcdef0UL << 31 : 0);   \
2286                  TYPE data = *((TYPE *)(page + sizeof(TYPE)));   \
2287 <                volatile unsigned int effect = data + TAG;              \
2287 >                volatile unsigned long effect = data + TAG;             \
2288                  if (effect != TAG)                                                              \
2289                          return 9;                                                                       \
2290          } while (0)
2291          
2292   #ifdef __GNUC__
2293 <        b_region = &&L_b_region;
2294 <        e_region = &&L_e_region;
2293 >        b_region = &&L_b_region2;
2294 >        e_region = &&L_e_region2;
2295   #endif
2296 < L_b_region:
2296 > L_b_region2:
2297          TEST_SKIP_INSTRUCTION(unsigned char);
2298          TEST_SKIP_INSTRUCTION(unsigned short);
2299          TEST_SKIP_INSTRUCTION(unsigned int);
2300 < L_e_region:
2300 >        TEST_SKIP_INSTRUCTION(unsigned long);
2301 >        TEST_SKIP_INSTRUCTION(signed char);
2302 >        TEST_SKIP_INSTRUCTION(signed short);
2303 >        TEST_SKIP_INSTRUCTION(signed int);
2304 >        TEST_SKIP_INSTRUCTION(signed long);
2305 >        BARRIER();
2306 > L_e_region2:
2307 >
2308 >        if (!arch_insn_skipper_tests())
2309 >                return 20;
2310   #endif
2311  
2312          vm_exit();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines