29 |
|
#include "config.h" |
30 |
|
#endif |
31 |
|
|
32 |
+ |
#include <list> |
33 |
|
#include <signal.h> |
34 |
|
#include "sigsegv.h" |
35 |
|
|
36 |
+ |
#ifndef NO_STD_NAMESPACE |
37 |
+ |
using std::list; |
38 |
+ |
#endif |
39 |
+ |
|
40 |
|
// Return value type of a signal handler (standard type if not defined) |
41 |
|
#ifndef RETSIGTYPE |
42 |
|
#define RETSIGTYPE void |
45 |
|
// Type of the system signal handler |
46 |
|
typedef RETSIGTYPE (*signal_handler)(int); |
47 |
|
|
48 |
< |
// Is the fault to be ignored? |
49 |
< |
static bool sigsegv_ignore_fault = false; |
48 |
> |
// Ignore range chain |
49 |
> |
struct ignore_range_t { |
50 |
> |
sigsegv_address_t start; |
51 |
> |
unsigned long length; |
52 |
> |
int transfer_type; |
53 |
> |
}; |
54 |
> |
|
55 |
> |
typedef list<ignore_range_t> ignore_range_list_t; |
56 |
> |
ignore_range_list_t sigsegv_ignore_ranges; |
57 |
|
|
58 |
|
// User's SIGSEGV handler |
59 |
|
static sigsegv_fault_handler_t sigsegv_fault_handler = 0; |
64 |
|
// Actual SIGSEGV handler installer |
65 |
|
static bool sigsegv_do_install_handler(int sig); |
66 |
|
|
67 |
+ |
// Find ignore range matching address |
68 |
+ |
static inline ignore_range_list_t::iterator sigsegv_find_ignore_range(sigsegv_address_t address) |
69 |
+ |
{ |
70 |
+ |
ignore_range_list_t::iterator it; |
71 |
+ |
for (it = sigsegv_ignore_ranges.begin(); it != sigsegv_ignore_ranges.end(); it++) |
72 |
+ |
if (address >= it->start && address < it->start + it->length) |
73 |
+ |
break; |
74 |
+ |
return it; |
75 |
+ |
} |
76 |
+ |
|
77 |
|
|
78 |
|
/* |
79 |
|
* Instruction decoding aids |
80 |
|
*/ |
81 |
|
|
60 |
– |
// Transfer type |
61 |
– |
enum transfer_type_t { |
62 |
– |
TYPE_UNKNOWN, |
63 |
– |
TYPE_LOAD, |
64 |
– |
TYPE_STORE |
65 |
– |
}; |
66 |
– |
|
82 |
|
// Transfer size |
83 |
|
enum transfer_size_t { |
84 |
|
SIZE_UNKNOWN, |
87 |
|
SIZE_LONG |
88 |
|
}; |
89 |
|
|
90 |
+ |
// Transfer type |
91 |
+ |
typedef sigsegv_transfer_type_t transfer_type_t; |
92 |
+ |
|
93 |
|
#if (defined(powerpc) || defined(__powerpc__) || defined(__ppc__)) |
94 |
|
// Addressing mode |
95 |
|
enum addressing_mode_t { |
121 |
|
signed int imm = (signed short)(opcode & 0xffff); |
122 |
|
|
123 |
|
// Analyze opcode |
124 |
< |
transfer_type_t transfer_type = TYPE_UNKNOWN; |
124 |
> |
transfer_type_t transfer_type = SIGSEGV_TRANSFER_UNKNOWN; |
125 |
|
transfer_size_t transfer_size = SIZE_UNKNOWN; |
126 |
|
addressing_mode_t addr_mode = MODE_UNKNOWN; |
127 |
|
switch (primop) { |
128 |
|
case 31: |
129 |
|
switch (exop) { |
130 |
|
case 23: // lwzx |
131 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_X; break; |
131 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_X; break; |
132 |
|
case 55: // lwzux |
133 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_UX; break; |
133 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_UX; break; |
134 |
|
case 87: // lbzx |
135 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_X; break; |
135 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_X; break; |
136 |
|
case 119: // lbzux |
137 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_UX; break; |
137 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_UX; break; |
138 |
|
case 151: // stwx |
139 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_X; break; |
139 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_X; break; |
140 |
|
case 183: // stwux |
141 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_UX; break; |
141 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_UX; break; |
142 |
|
case 215: // stbx |
143 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_X; break; |
143 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_X; break; |
144 |
|
case 247: // stbux |
145 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_UX; break; |
145 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_UX; break; |
146 |
|
case 279: // lhzx |
147 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_X; break; |
147 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_X; break; |
148 |
|
case 311: // lhzux |
149 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break; |
149 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break; |
150 |
|
case 343: // lhax |
151 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_X; break; |
151 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_X; break; |
152 |
|
case 375: // lhaux |
153 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break; |
153 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break; |
154 |
|
case 407: // sthx |
155 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_X; break; |
155 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_X; break; |
156 |
|
case 439: // sthux |
157 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break; |
157 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break; |
158 |
|
} |
159 |
|
break; |
160 |
|
|
161 |
|
case 32: // lwz |
162 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_NORM; break; |
162 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_NORM; break; |
163 |
|
case 33: // lwzu |
164 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_U; break; |
164 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_U; break; |
165 |
|
case 34: // lbz |
166 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_NORM; break; |
166 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_NORM; break; |
167 |
|
case 35: // lbzu |
168 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_U; break; |
168 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_U; break; |
169 |
|
case 36: // stw |
170 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_NORM; break; |
170 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_NORM; break; |
171 |
|
case 37: // stwu |
172 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_U; break; |
172 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_U; break; |
173 |
|
case 38: // stb |
174 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_NORM; break; |
174 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_NORM; break; |
175 |
|
case 39: // stbu |
176 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_U; break; |
176 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_U; break; |
177 |
|
case 40: // lhz |
178 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break; |
178 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break; |
179 |
|
case 41: // lhzu |
180 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_U; break; |
180 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_U; break; |
181 |
|
case 42: // lha |
182 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break; |
182 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break; |
183 |
|
case 43: // lhau |
184 |
< |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_U; break; |
184 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_U; break; |
185 |
|
case 44: // sth |
186 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break; |
186 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break; |
187 |
|
case 45: // sthu |
188 |
< |
transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_U; break; |
188 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_U; break; |
189 |
|
} |
190 |
|
|
191 |
|
// Calculate effective address |
237 |
|
#if (defined(i386) || defined(__i386__)) |
238 |
|
#define SIGSEGV_FAULT_INSTRUCTION (((struct sigcontext *)scp)->sc_eip) |
239 |
|
#define SIGSEGV_REGISTER_FILE ((unsigned int *)&(((struct sigcontext *)scp)->sc_edi)) /* EDI is the first GPR (even below EIP) in sigcontext */ |
222 |
– |
/* (gb) Disable because this would hang configure script for some reason |
223 |
– |
* though standalone testing gets it right. Any idea why? |
240 |
|
#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction |
225 |
– |
*/ |
241 |
|
#endif |
242 |
|
#endif |
243 |
|
#if defined(__linux__) |
248 |
|
#define SIGSEGV_REGISTER_FILE (unsigned int *)SIGSEGV_CONTEXT_REGS |
249 |
|
#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction |
250 |
|
#endif |
251 |
+ |
#if (defined(x86_64) || defined(__x86_64__)) |
252 |
+ |
#include <sys/ucontext.h> |
253 |
+ |
#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext.gregs) |
254 |
+ |
#define SIGSEGV_FAULT_INSTRUCTION SIGSEGV_CONTEXT_REGS[16] /* should use REG_RIP instead */ |
255 |
+ |
#define SIGSEGV_REGISTER_FILE (unsigned long *)SIGSEGV_CONTEXT_REGS |
256 |
+ |
#endif |
257 |
|
#if (defined(ia64) || defined(__ia64__)) |
258 |
|
#define SIGSEGV_FAULT_INSTRUCTION (((struct sigcontext *)scp)->sc_ip & ~0x3ULL) /* slot number is in bits 0 and 1 */ |
259 |
|
#endif |
473 |
|
if (eip == 0) |
474 |
|
return false; |
475 |
|
|
476 |
< |
transfer_type_t transfer_type = TYPE_UNKNOWN; |
476 |
> |
transfer_type_t transfer_type = SIGSEGV_TRANSFER_UNKNOWN; |
477 |
|
transfer_size_t transfer_size = SIZE_LONG; |
478 |
|
|
479 |
|
int reg = -1; |
495 |
|
switch (eip[2] & 0xc0) { |
496 |
|
case 0x80: |
497 |
|
reg = (eip[2] >> 3) & 7; |
498 |
< |
transfer_type = TYPE_LOAD; |
498 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; |
499 |
|
break; |
500 |
|
case 0x40: |
501 |
|
reg = (eip[2] >> 3) & 7; |
502 |
< |
transfer_type = TYPE_LOAD; |
502 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; |
503 |
|
break; |
504 |
|
case 0x00: |
505 |
|
reg = (eip[2] >> 3) & 7; |
506 |
< |
transfer_type = TYPE_LOAD; |
506 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; |
507 |
|
break; |
508 |
|
} |
509 |
|
len += 3 + ix86_step_over_modrm(eip + 2); |
516 |
|
switch (eip[1] & 0xc0) { |
517 |
|
case 0x80: |
518 |
|
reg = (eip[1] >> 3) & 7; |
519 |
< |
transfer_type = TYPE_LOAD; |
519 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; |
520 |
|
break; |
521 |
|
case 0x40: |
522 |
|
reg = (eip[1] >> 3) & 7; |
523 |
< |
transfer_type = TYPE_LOAD; |
523 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; |
524 |
|
break; |
525 |
|
case 0x00: |
526 |
|
reg = (eip[1] >> 3) & 7; |
527 |
< |
transfer_type = TYPE_LOAD; |
527 |
> |
transfer_type = SIGSEGV_TRANSFER_LOAD; |
528 |
|
break; |
529 |
|
} |
530 |
|
len += 2 + ix86_step_over_modrm(eip + 1); |
535 |
|
switch (eip[1] & 0xc0) { |
536 |
|
case 0x80: |
537 |
|
reg = (eip[1] >> 3) & 7; |
538 |
< |
transfer_type = TYPE_STORE; |
538 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; |
539 |
|
break; |
540 |
|
case 0x40: |
541 |
|
reg = (eip[1] >> 3) & 7; |
542 |
< |
transfer_type = TYPE_STORE; |
542 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; |
543 |
|
break; |
544 |
|
case 0x00: |
545 |
|
reg = (eip[1] >> 3) & 7; |
546 |
< |
transfer_type = TYPE_STORE; |
546 |
> |
transfer_type = SIGSEGV_TRANSFER_STORE; |
547 |
|
break; |
548 |
|
} |
549 |
|
len += 2 + ix86_step_over_modrm(eip + 1); |
550 |
|
break; |
551 |
|
} |
552 |
|
|
553 |
< |
if (transfer_type == TYPE_UNKNOWN) { |
553 |
> |
if (transfer_type == SIGSEGV_TRANSFER_UNKNOWN) { |
554 |
|
// Unknown machine code, let it crash. Then patch the decoder |
555 |
|
return false; |
556 |
|
} |
557 |
|
|
558 |
< |
if (transfer_type == TYPE_LOAD && reg != -1) { |
558 |
> |
if (transfer_type == SIGSEGV_TRANSFER_LOAD && reg != -1) { |
559 |
|
static const int x86_reg_map[8] = { |
560 |
|
X86_REG_EAX, X86_REG_ECX, X86_REG_EDX, X86_REG_EBX, |
561 |
|
X86_REG_ESP, X86_REG_EBP, X86_REG_ESI, X86_REG_EDI |
581 |
|
#if DEBUG |
582 |
|
printf("%08x: %s %s access", regs[X86_REG_EIP], |
583 |
|
transfer_size == SIZE_BYTE ? "byte" : transfer_size == SIZE_WORD ? "word" : "long", |
584 |
< |
transfer_type == TYPE_LOAD ? "read" : "write"); |
584 |
> |
transfer_type == SIGSEGV_TRANSFER_LOAD ? "read" : "write"); |
585 |
|
|
586 |
|
if (reg != -1) { |
587 |
|
static const char * x86_reg_str_map[8] = { |
588 |
|
"eax", "ecx", "edx", "ebx", |
589 |
|
"esp", "ebp", "esi", "edi" |
590 |
|
}; |
591 |
< |
printf(" %s register %%%s", transfer_type == TYPE_LOAD ? "to" : "from", x86_reg_str_map[reg]); |
591 |
> |
printf(" %s register %%%s", transfer_type == SIGSEGV_TRANSFER_LOAD ? "to" : "from", x86_reg_str_map[reg]); |
592 |
|
} |
593 |
|
printf(", %d bytes instruction\n", len); |
594 |
|
#endif |
605 |
|
instruction_t instr; |
606 |
|
powerpc_decode_instruction(&instr, *nip_p, regs); |
607 |
|
|
608 |
< |
if (instr.transfer_type == TYPE_UNKNOWN) { |
608 |
> |
if (instr.transfer_type == SIGSEGV_TRANSFER_UNKNOWN) { |
609 |
|
// Unknown machine code, let it crash. Then patch the decoder |
610 |
|
return false; |
611 |
|
} |
612 |
|
|
613 |
+ |
ignore_range_list_t::iterator it = sigsegv_find_ignore_range((sigsegv_address_t)instr.addr); |
614 |
+ |
if (it == sigsegv_ignore_ranges.end() || ((it->transfer_type & instr.transfer_type) != instr.transfer_type)) { |
615 |
+ |
// Address doesn't fall into ignore ranges list, let it crash. |
616 |
+ |
return false; |
617 |
+ |
} |
618 |
+ |
|
619 |
|
#if DEBUG |
620 |
|
printf("%08x: %s %s access", *nip_p, |
621 |
|
instr.transfer_size == SIZE_BYTE ? "byte" : instr.transfer_size == SIZE_WORD ? "word" : "long", |
622 |
< |
instr.transfer_type == TYPE_LOAD ? "read" : "write"); |
622 |
> |
instr.transfer_type == SIGSEGV_TRANSFER_LOAD ? "read" : "write"); |
623 |
|
|
624 |
|
if (instr.addr_mode == MODE_U || instr.addr_mode == MODE_UX) |
625 |
|
printf(" r%d (ra = %08x)\n", instr.ra, instr.addr); |
626 |
< |
if (instr.transfer_type == TYPE_LOAD) |
626 |
> |
if (instr.transfer_type == SIGSEGV_TRANSFER_LOAD) |
627 |
|
printf(" r%d (rd = 0)\n", instr.rd); |
628 |
|
#endif |
629 |
|
|
630 |
|
if (instr.addr_mode == MODE_U || instr.addr_mode == MODE_UX) |
631 |
|
regs[instr.ra] = instr.addr; |
632 |
< |
if (instr.transfer_type == TYPE_LOAD) |
632 |
> |
if (instr.transfer_type == SIGSEGV_TRANSFER_LOAD) |
633 |
|
regs[instr.rd] = 0; |
634 |
|
|
635 |
|
*nip_p += 4; |
668 |
|
fault_recovered = true; |
669 |
|
} |
670 |
|
#if HAVE_SIGSEGV_SKIP_INSTRUCTION |
671 |
< |
else if (sigsegv_ignore_fault) { |
671 |
> |
else if (sigsegv_ignore_ranges.size() > 0) { |
672 |
|
// Call the instruction skipper with the register file available |
673 |
|
if (SIGSEGV_SKIP_INSTRUCTION(SIGSEGV_REGISTER_FILE)) |
674 |
|
fault_recovered = true; |
698 |
|
{ |
699 |
|
// Setup SIGSEGV handler to process writes to frame buffer |
700 |
|
#ifdef HAVE_SIGACTION |
701 |
< |
struct sigaction vosf_sa; |
702 |
< |
sigemptyset(&vosf_sa.sa_mask); |
703 |
< |
vosf_sa.sa_sigaction = sigsegv_handler; |
704 |
< |
vosf_sa.sa_flags = SA_SIGINFO; |
705 |
< |
return (sigaction(sig, &vosf_sa, 0) == 0); |
701 |
> |
struct sigaction sigsegv_sa; |
702 |
> |
sigemptyset(&sigsegv_sa.sa_mask); |
703 |
> |
sigsegv_sa.sa_sigaction = sigsegv_handler; |
704 |
> |
sigsegv_sa.sa_flags = SA_SIGINFO; |
705 |
> |
return (sigaction(sig, &sigsegv_sa, 0) == 0); |
706 |
|
#else |
707 |
|
return (signal(sig, (signal_handler)sigsegv_handler) != SIG_ERR); |
708 |
|
#endif |
714 |
|
{ |
715 |
|
// Setup SIGSEGV handler to process writes to frame buffer |
716 |
|
#ifdef HAVE_SIGACTION |
717 |
< |
struct sigaction vosf_sa; |
718 |
< |
sigemptyset(&vosf_sa.sa_mask); |
719 |
< |
vosf_sa.sa_handler = (signal_handler)sigsegv_handler; |
717 |
> |
struct sigaction sigsegv_sa; |
718 |
> |
sigemptyset(&sigsegv_sa.sa_mask); |
719 |
> |
sigsegv_sa.sa_handler = (signal_handler)sigsegv_handler; |
720 |
> |
sigsegv_sa.sa_flags = 0; |
721 |
|
#if !EMULATED_68K && defined(__NetBSD__) |
722 |
< |
sigaddset(&vosf_sa.sa_mask, SIGALRM); |
723 |
< |
vosf_sa.sa_flags = SA_ONSTACK; |
696 |
< |
#else |
697 |
< |
vosf_sa.sa_flags = 0; |
722 |
> |
sigaddset(&sigsegv_sa.sa_mask, SIGALRM); |
723 |
> |
sigsegv_sa.sa_flags |= SA_ONSTACK; |
724 |
|
#endif |
725 |
< |
return (sigaction(sig, &vosf_sa, 0) == 0); |
725 |
> |
return (sigaction(sig, &sigsegv_sa, 0) == 0); |
726 |
|
#else |
727 |
|
return (signal(sig, (signal_handler)sigsegv_handler) != SIG_ERR); |
728 |
|
#endif |
761 |
|
|
762 |
|
|
763 |
|
/* |
764 |
< |
* SIGSEGV ignore state modifier |
764 |
> |
* Add SIGSEGV ignore range |
765 |
> |
*/ |
766 |
> |
|
767 |
> |
void sigsegv_add_ignore_range(sigsegv_address_t address, unsigned long length, int transfer_type) |
768 |
> |
{ |
769 |
> |
ignore_range_t ignore_range; |
770 |
> |
ignore_range.start = address; |
771 |
> |
ignore_range.length = length; |
772 |
> |
ignore_range.transfer_type = transfer_type; |
773 |
> |
sigsegv_ignore_ranges.push_front(ignore_range); |
774 |
> |
} |
775 |
> |
|
776 |
> |
|
777 |
> |
/* |
778 |
> |
* Remove SIGSEGV ignore range. Range must match installed one, otherwise FALSE is returned. |
779 |
|
*/ |
780 |
|
|
781 |
< |
void sigsegv_set_ignore_state(bool ignore_fault) |
781 |
> |
bool sigsegv_remove_ignore_range(sigsegv_address_t address, unsigned long length, int transfer_type) |
782 |
|
{ |
783 |
< |
sigsegv_ignore_fault = ignore_fault; |
783 |
> |
ignore_range_list_t::iterator it; |
784 |
> |
for (it = sigsegv_ignore_ranges.begin(); it != sigsegv_ignore_ranges.end(); it++) |
785 |
> |
if (it->start == address && it->length == length && ((it->transfer_type & transfer_type) == transfer_type)) |
786 |
> |
break; |
787 |
> |
|
788 |
> |
if (it != sigsegv_ignore_ranges.end()) { |
789 |
> |
if (it->transfer_type != transfer_type) |
790 |
> |
it->transfer_type &= ~transfer_type; |
791 |
> |
else |
792 |
> |
sigsegv_ignore_ranges.erase(it); |
793 |
> |
return true; |
794 |
> |
} |
795 |
> |
|
796 |
> |
return false; |
797 |
|
} |
798 |
|
|
799 |
|
|
873 |
|
if (vm_protect((char *)page, page_size, VM_PAGE_NOACCESS) < 0) |
874 |
|
return 1; |
875 |
|
|
876 |
< |
sigsegv_set_ignore_state(true); |
876 |
> |
sigsegv_add_ignore_range((char *)page, page_size, SIGSEGV_TRANSFER_LOAD | SIGSEGV_TRANSFER_STORE); |
877 |
|
|
878 |
|
#define TEST_SKIP_INSTRUCTION(TYPE) do { \ |
879 |
|
const unsigned int TAG = 0x12345678; \ |