54 |
|
|
55 |
|
|
56 |
|
/* |
57 |
+ |
* Instruction decoding aids |
58 |
+ |
*/ |
59 |
+ |
|
60 |
+ |
// Transfer type |
61 |
+ |
enum transfer_type_t { |
62 |
+ |
TYPE_UNKNOWN, |
63 |
+ |
TYPE_LOAD, |
64 |
+ |
TYPE_STORE |
65 |
+ |
}; |
66 |
+ |
|
67 |
+ |
// Transfer size |
68 |
+ |
enum transfer_size_t { |
69 |
+ |
SIZE_UNKNOWN, |
70 |
+ |
SIZE_BYTE, |
71 |
+ |
SIZE_WORD, |
72 |
+ |
SIZE_LONG |
73 |
+ |
}; |
74 |
+ |
|
75 |
+ |
#if (defined(powerpc) || defined(__powerpc__) || defined(__ppc__)) |
76 |
+ |
// Addressing mode |
77 |
+ |
enum addressing_mode_t { |
78 |
+ |
MODE_UNKNOWN, |
79 |
+ |
MODE_NORM, |
80 |
+ |
MODE_U, |
81 |
+ |
MODE_X, |
82 |
+ |
MODE_UX |
83 |
+ |
}; |
84 |
+ |
|
85 |
+ |
// Decoded instruction |
86 |
+ |
struct instruction_t { |
87 |
+ |
transfer_type_t transfer_type; |
88 |
+ |
transfer_size_t transfer_size; |
89 |
+ |
addressing_mode_t addr_mode; |
90 |
+ |
unsigned int addr; |
91 |
+ |
char ra, rd; |
92 |
+ |
}; |
93 |
+ |
|
94 |
+ |
static void powerpc_decode_instruction(instruction_t *instruction, unsigned int nip, unsigned int * gpr) |
95 |
+ |
{ |
96 |
+ |
// Get opcode and divide into fields |
97 |
+ |
unsigned int opcode = *((unsigned int *)nip); |
98 |
+ |
unsigned int primop = opcode >> 26; |
99 |
+ |
unsigned int exop = (opcode >> 1) & 0x3ff; |
100 |
+ |
unsigned int ra = (opcode >> 16) & 0x1f; |
101 |
+ |
unsigned int rb = (opcode >> 11) & 0x1f; |
102 |
+ |
unsigned int rd = (opcode >> 21) & 0x1f; |
103 |
+ |
signed int imm = (signed short)(opcode & 0xffff); |
104 |
+ |
|
105 |
+ |
// Analyze opcode |
106 |
+ |
transfer_type_t transfer_type = TYPE_UNKNOWN; |
107 |
+ |
transfer_size_t transfer_size = SIZE_UNKNOWN; |
108 |
+ |
addressing_mode_t addr_mode = MODE_UNKNOWN; |
109 |
+ |
switch (primop) { |
110 |
+ |
case 31: |
111 |
+ |
switch (exop) { |
112 |
+ |
case 23: // lwzx |
113 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_X; break; |
114 |
+ |
case 55: // lwzux |
115 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_UX; break; |
116 |
+ |
case 87: // lbzx |
117 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_X; break; |
118 |
+ |
case 119: // lbzux |
119 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_UX; break; |
120 |
+ |
case 151: // stwx |
121 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_X; break; |
122 |
+ |
case 183: // stwux |
123 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_UX; break; |
124 |
+ |
case 215: // stbx |
125 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_X; break; |
126 |
+ |
case 247: // stbux |
127 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_UX; break; |
128 |
+ |
case 279: // lhzx |
129 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_X; break; |
130 |
+ |
case 311: // lhzux |
131 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break; |
132 |
+ |
case 343: // lhax |
133 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_X; break; |
134 |
+ |
case 375: // lhaux |
135 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break; |
136 |
+ |
case 407: // sthx |
137 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_X; break; |
138 |
+ |
case 439: // sthux |
139 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_UX; break; |
140 |
+ |
} |
141 |
+ |
break; |
142 |
+ |
|
143 |
+ |
case 32: // lwz |
144 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_NORM; break; |
145 |
+ |
case 33: // lwzu |
146 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_LONG; addr_mode = MODE_U; break; |
147 |
+ |
case 34: // lbz |
148 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_NORM; break; |
149 |
+ |
case 35: // lbzu |
150 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_BYTE; addr_mode = MODE_U; break; |
151 |
+ |
case 36: // stw |
152 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_NORM; break; |
153 |
+ |
case 37: // stwu |
154 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_LONG; addr_mode = MODE_U; break; |
155 |
+ |
case 38: // stb |
156 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_NORM; break; |
157 |
+ |
case 39: // stbu |
158 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_BYTE; addr_mode = MODE_U; break; |
159 |
+ |
case 40: // lhz |
160 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break; |
161 |
+ |
case 41: // lhzu |
162 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_U; break; |
163 |
+ |
case 42: // lha |
164 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break; |
165 |
+ |
case 43: // lhau |
166 |
+ |
transfer_type = TYPE_LOAD; transfer_size = SIZE_WORD; addr_mode = MODE_U; break; |
167 |
+ |
case 44: // sth |
168 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_NORM; break; |
169 |
+ |
case 45: // sthu |
170 |
+ |
transfer_type = TYPE_STORE; transfer_size = SIZE_WORD; addr_mode = MODE_U; break; |
171 |
+ |
} |
172 |
+ |
|
173 |
+ |
// Calculate effective address |
174 |
+ |
unsigned int addr = 0; |
175 |
+ |
switch (addr_mode) { |
176 |
+ |
case MODE_X: |
177 |
+ |
case MODE_UX: |
178 |
+ |
if (ra == 0) |
179 |
+ |
addr = gpr[rb]; |
180 |
+ |
else |
181 |
+ |
addr = gpr[ra] + gpr[rb]; |
182 |
+ |
break; |
183 |
+ |
case MODE_NORM: |
184 |
+ |
case MODE_U: |
185 |
+ |
if (ra == 0) |
186 |
+ |
addr = (signed int)(signed short)imm; |
187 |
+ |
else |
188 |
+ |
addr = gpr[ra] + (signed int)(signed short)imm; |
189 |
+ |
break; |
190 |
+ |
default: |
191 |
+ |
break; |
192 |
+ |
} |
193 |
+ |
|
194 |
+ |
// Commit decoded instruction |
195 |
+ |
instruction->addr = addr; |
196 |
+ |
instruction->addr_mode = addr_mode; |
197 |
+ |
instruction->transfer_type = transfer_type; |
198 |
+ |
instruction->transfer_size = transfer_size; |
199 |
+ |
instruction->ra = ra; |
200 |
+ |
instruction->rd = rd; |
201 |
+ |
} |
202 |
+ |
#endif |
203 |
+ |
|
204 |
+ |
|
205 |
+ |
/* |
206 |
|
* OS-dependant SIGSEGV signals support section |
207 |
|
*/ |
208 |
|
|
218 |
|
#if defined(__linux__) |
219 |
|
#if (defined(i386) || defined(__i386__)) |
220 |
|
#include <sys/ucontext.h> |
221 |
< |
#define SIGSEGV_FAULT_INSTRUCTION (((ucontext_t *)scp)->uc_mcontext.gregs[14]) /* should use REG_EIP instead */ |
222 |
< |
#define SIGSEGV_REGISTER_FILE (unsigned long *)(((ucontext_t *)scp)->uc_mcontext.gregs) |
221 |
> |
#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext.gregs) |
222 |
> |
#define SIGSEGV_FAULT_INSTRUCTION SIGSEGV_CONTEXT_REGS[14] /* should use REG_EIP instead */ |
223 |
> |
#define SIGSEGV_REGISTER_FILE (unsigned int *)SIGSEGV_CONTEXT_REGS |
224 |
|
#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction |
225 |
|
#endif |
226 |
|
#if (defined(ia64) || defined(__ia64__)) |
228 |
|
#endif |
229 |
|
#if (defined(powerpc) || defined(__powerpc__)) |
230 |
|
#include <sys/ucontext.h> |
231 |
< |
#define SIGSEGV_FAULT_INSTRUCTION (((ucontext_t *)scp)->uc_mcontext.regs->nip) |
231 |
> |
#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext.regs) |
232 |
> |
#define SIGSEGV_FAULT_INSTRUCTION (SIGSEGV_CONTEXT_REGS->nip) |
233 |
> |
#define SIGSEGV_REGISTER_FILE (unsigned int *)&SIGSEGV_CONTEXT_REGS->nip, (unsigned int *)(SIGSEGV_CONTEXT_REGS->gpr) |
234 |
> |
#define SIGSEGV_SKIP_INSTRUCTION powerpc_skip_instruction |
235 |
|
#endif |
236 |
|
#endif |
237 |
|
#endif |
245 |
|
#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, struct sigcontext scs |
246 |
|
#define SIGSEGV_FAULT_ADDRESS scs.cr2 |
247 |
|
#define SIGSEGV_FAULT_INSTRUCTION scs.eip |
248 |
< |
#define SIGSEGV_REGISTER_FILE (unsigned long *)(&scs) |
248 |
> |
#define SIGSEGV_REGISTER_FILE (unsigned int *)(&scs) |
249 |
|
#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction |
250 |
|
#endif |
251 |
|
#if (defined(sparc) || defined(__sparc__)) |
258 |
|
#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, struct sigcontext *scp |
259 |
|
#define SIGSEGV_FAULT_ADDRESS scp->regs->dar |
260 |
|
#define SIGSEGV_FAULT_INSTRUCTION scp->regs->nip |
261 |
+ |
#define SIGSEGV_REGISTER_FILE (unsigned int *)&scp->regs->nip, (unsigned int *)(scp->regs->gpr) |
262 |
+ |
#define SIGSEGV_SKIP_INSTRUCTION powerpc_skip_instruction |
263 |
|
#endif |
264 |
|
#if (defined(alpha) || defined(__alpha__)) |
265 |
|
#include <asm/sigcontext.h> |
313 |
|
#if (defined(m68k) || defined(__m68k__)) |
314 |
|
#include <m68k/frame.h> |
315 |
|
#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, struct sigcontext *scp |
316 |
< |
#define SIGSEGV_FAULT_ADDRESS ({ \ |
162 |
< |
struct sigstate { \ |
163 |
< |
int ss_flags; \ |
164 |
< |
struct frame ss_frame; \ |
165 |
< |
}; \ |
166 |
< |
struct sigstate *state = (struct sigstate *)scp->sc_ap; \ |
167 |
< |
char *fault_addr; \ |
168 |
< |
switch (state->ss_frame.f_format) { \ |
169 |
< |
case 7: /* 68040 access error */ \ |
170 |
< |
/* "code" is sometimes unreliable (i.e. contains NULL or a bogus address), reason unknown */ \ |
171 |
< |
fault_addr = state->ss_frame.f_fmt7.f_fa; \ |
172 |
< |
break; \ |
173 |
< |
default: \ |
174 |
< |
fault_addr = (char *)code; \ |
175 |
< |
break; \ |
176 |
< |
} \ |
177 |
< |
fault_addr; \ |
178 |
< |
}) |
316 |
> |
#define SIGSEGV_FAULT_ADDRESS get_fault_address(scp) |
317 |
|
#define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGSEGV) |
318 |
+ |
|
319 |
+ |
// Use decoding scheme from BasiliskII/m68k native |
320 |
+ |
static sigsegv_address_t get_fault_address(struct sigcontext *scp) |
321 |
+ |
{ |
322 |
+ |
struct sigstate { |
323 |
+ |
int ss_flags; |
324 |
+ |
struct frame ss_frame; |
325 |
+ |
}; |
326 |
+ |
struct sigstate *state = (struct sigstate *)scp->sc_ap; |
327 |
+ |
char *fault_addr; |
328 |
+ |
switch (state->ss_frame.f_format) { |
329 |
+ |
case 7: /* 68040 access error */ |
330 |
+ |
/* "code" is sometimes unreliable (i.e. contains NULL or a bogus address), reason unknown */ |
331 |
+ |
fault_addr = state->ss_frame.f_fmt7.f_fa; |
332 |
+ |
break; |
333 |
+ |
default: |
334 |
+ |
fault_addr = (char *)code; |
335 |
+ |
break; |
336 |
+ |
} |
337 |
+ |
return (sigsegv_address_t)fault_addr; |
338 |
+ |
} |
339 |
|
#else |
340 |
|
#define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, void *scp, char *addr |
341 |
|
#define SIGSEGV_FAULT_ADDRESS addr |
350 |
|
#define SIGSEGV_FAULT_ADDRESS get_fault_address(scp) |
351 |
|
#define SIGSEGV_FAULT_INSTRUCTION scp->sc_ir |
352 |
|
#define SIGSEGV_ALL_SIGNALS FAULT_HANDLER(SIGBUS) |
353 |
+ |
#define SIGSEGV_REGISTER_FILE (unsigned int *)&scp->sc_ir, &((unsigned int *) scp->sc_regs)[2] |
354 |
+ |
#define SIGSEGV_SKIP_INSTRUCTION powerpc_skip_instruction |
355 |
|
|
356 |
< |
// From Boehm's GC 6.0alpha8 |
196 |
< |
#define EXTRACT_OP1(iw) (((iw) & 0xFC000000) >> 26) |
197 |
< |
#define EXTRACT_OP2(iw) (((iw) & 0x000007FE) >> 1) |
198 |
< |
#define EXTRACT_REGA(iw) (((iw) & 0x001F0000) >> 16) |
199 |
< |
#define EXTRACT_REGB(iw) (((iw) & 0x03E00000) >> 21) |
200 |
< |
#define EXTRACT_REGC(iw) (((iw) & 0x0000F800) >> 11) |
201 |
< |
#define EXTRACT_DISP(iw) ((short *) &(iw))[1] |
202 |
< |
|
356 |
> |
// Use decoding scheme from SheepShaver |
357 |
|
static sigsegv_address_t get_fault_address(struct sigcontext *scp) |
358 |
|
{ |
359 |
< |
unsigned int instr = *((unsigned int *) scp->sc_ir); |
360 |
< |
unsigned int * regs = &((unsigned int *) scp->sc_regs)[2]; |
361 |
< |
int disp = 0, tmp; |
362 |
< |
unsigned int baseA = 0, baseB = 0; |
363 |
< |
unsigned int addr, alignmask = 0xFFFFFFFF; |
364 |
< |
|
211 |
< |
switch(EXTRACT_OP1(instr)) { |
212 |
< |
case 38: /* stb */ |
213 |
< |
case 39: /* stbu */ |
214 |
< |
case 54: /* stfd */ |
215 |
< |
case 55: /* stfdu */ |
216 |
< |
case 52: /* stfs */ |
217 |
< |
case 53: /* stfsu */ |
218 |
< |
case 44: /* sth */ |
219 |
< |
case 45: /* sthu */ |
220 |
< |
case 47: /* stmw */ |
221 |
< |
case 36: /* stw */ |
222 |
< |
case 37: /* stwu */ |
223 |
< |
tmp = EXTRACT_REGA(instr); |
224 |
< |
if(tmp > 0) |
225 |
< |
baseA = regs[tmp]; |
226 |
< |
disp = EXTRACT_DISP(instr); |
227 |
< |
break; |
228 |
< |
case 31: |
229 |
< |
switch(EXTRACT_OP2(instr)) { |
230 |
< |
case 86: /* dcbf */ |
231 |
< |
case 54: /* dcbst */ |
232 |
< |
case 1014: /* dcbz */ |
233 |
< |
case 247: /* stbux */ |
234 |
< |
case 215: /* stbx */ |
235 |
< |
case 759: /* stfdux */ |
236 |
< |
case 727: /* stfdx */ |
237 |
< |
case 983: /* stfiwx */ |
238 |
< |
case 695: /* stfsux */ |
239 |
< |
case 663: /* stfsx */ |
240 |
< |
case 918: /* sthbrx */ |
241 |
< |
case 439: /* sthux */ |
242 |
< |
case 407: /* sthx */ |
243 |
< |
case 661: /* stswx */ |
244 |
< |
case 662: /* stwbrx */ |
245 |
< |
case 150: /* stwcx. */ |
246 |
< |
case 183: /* stwux */ |
247 |
< |
case 151: /* stwx */ |
248 |
< |
case 135: /* stvebx */ |
249 |
< |
case 167: /* stvehx */ |
250 |
< |
case 199: /* stvewx */ |
251 |
< |
case 231: /* stvx */ |
252 |
< |
case 487: /* stvxl */ |
253 |
< |
tmp = EXTRACT_REGA(instr); |
254 |
< |
if(tmp > 0) |
255 |
< |
baseA = regs[tmp]; |
256 |
< |
baseB = regs[EXTRACT_REGC(instr)]; |
257 |
< |
/* determine Altivec alignment mask */ |
258 |
< |
switch(EXTRACT_OP2(instr)) { |
259 |
< |
case 167: /* stvehx */ |
260 |
< |
alignmask = 0xFFFFFFFE; |
261 |
< |
break; |
262 |
< |
case 199: /* stvewx */ |
263 |
< |
alignmask = 0xFFFFFFFC; |
264 |
< |
break; |
265 |
< |
case 231: /* stvx */ |
266 |
< |
alignmask = 0xFFFFFFF0; |
267 |
< |
break; |
268 |
< |
case 487: /* stvxl */ |
269 |
< |
alignmask = 0xFFFFFFF0; |
270 |
< |
break; |
271 |
< |
} |
272 |
< |
break; |
273 |
< |
case 725: /* stswi */ |
274 |
< |
tmp = EXTRACT_REGA(instr); |
275 |
< |
if(tmp > 0) |
276 |
< |
baseA = regs[tmp]; |
277 |
< |
break; |
278 |
< |
default: /* ignore instruction */ |
279 |
< |
return 0; |
280 |
< |
break; |
281 |
< |
} |
282 |
< |
break; |
283 |
< |
default: /* ignore instruction */ |
284 |
< |
return 0; |
285 |
< |
break; |
286 |
< |
} |
287 |
< |
|
288 |
< |
addr = (baseA + baseB) + disp; |
289 |
< |
addr &= alignmask; |
290 |
< |
return (sigsegv_address_t)addr; |
359 |
> |
unsigned int nip = (unsigned int) scp->sc_ir; |
360 |
> |
unsigned int * gpr = &((unsigned int *) scp->sc_regs)[2]; |
361 |
> |
instruction_t instr; |
362 |
> |
|
363 |
> |
powerpc_decode_instruction(&instr, nip, gpr); |
364 |
> |
return (sigsegv_address_t)instr.addr; |
365 |
|
} |
366 |
|
#endif |
367 |
|
#endif |
368 |
|
#endif |
369 |
|
|
370 |
+ |
|
371 |
+ |
/* |
372 |
+ |
* Instruction skipping |
373 |
+ |
*/ |
374 |
+ |
|
375 |
|
#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION |
376 |
|
// Decode and skip X86 instruction |
377 |
|
#if (defined(i386) || defined(__i386__)) |
422 |
|
return offset; |
423 |
|
} |
424 |
|
|
425 |
< |
static bool ix86_skip_instruction(sigsegv_address_t fault_instruction, unsigned long * regs) |
425 |
> |
static bool ix86_skip_instruction(unsigned int * regs) |
426 |
|
{ |
427 |
< |
unsigned char * eip = (unsigned char *)fault_instruction; |
427 |
> |
unsigned char * eip = (unsigned char *)regs[X86_REG_EIP]; |
428 |
|
|
429 |
|
if (eip == 0) |
430 |
|
return false; |
431 |
|
|
432 |
< |
// Transfer type |
433 |
< |
enum { |
355 |
< |
TYPE_UNKNOWN, |
356 |
< |
TYPE_LOAD, |
357 |
< |
TYPE_STORE |
358 |
< |
} transfer_type = TYPE_UNKNOWN; |
359 |
< |
|
360 |
< |
// Transfer size |
361 |
< |
enum { |
362 |
< |
SIZE_BYTE, |
363 |
< |
SIZE_WORD, |
364 |
< |
SIZE_LONG |
365 |
< |
} transfer_size = SIZE_LONG; |
432 |
> |
transfer_type_t transfer_type = TYPE_UNKNOWN; |
433 |
> |
transfer_size_t transfer_size = SIZE_LONG; |
434 |
|
|
435 |
|
int reg = -1; |
436 |
|
int len = 0; |
531 |
|
return true; |
532 |
|
} |
533 |
|
#endif |
534 |
+ |
|
535 |
+ |
// Decode and skip PPC instruction |
536 |
+ |
#if (defined(powerpc) || defined(__powerpc__) || defined(__ppc__)) |
537 |
+ |
static bool powerpc_skip_instruction(unsigned int * nip_p, unsigned int * regs) |
538 |
+ |
{ |
539 |
+ |
instruction_t instr; |
540 |
+ |
powerpc_decode_instruction(&instr, *nip_p, regs); |
541 |
+ |
|
542 |
+ |
if (instr.transfer_type == TYPE_UNKNOWN) { |
543 |
+ |
// Unknown machine code, let it crash. Then patch the decoder |
544 |
+ |
return false; |
545 |
+ |
} |
546 |
+ |
|
547 |
+ |
#if DEBUG |
548 |
+ |
printf("%08x: %s %s access", *nip_p, |
549 |
+ |
instr.transfer_size == SIZE_BYTE ? "byte" : instr.transfer_size == SIZE_WORD ? "word" : "long", |
550 |
+ |
instr.transfer_type == TYPE_LOAD ? "read" : "write"); |
551 |
+ |
|
552 |
+ |
if (instr.addr_mode == MODE_U || instr.addr_mode == MODE_UX) |
553 |
+ |
printf(" r%d (ra = %08x)\n", instr.ra, instr.addr); |
554 |
+ |
if (instr.transfer_type == TYPE_LOAD) |
555 |
+ |
printf(" r%d (rd = 0)\n", instr.rd); |
556 |
+ |
#endif |
557 |
+ |
|
558 |
+ |
if (instr.addr_mode == MODE_U || instr.addr_mode == MODE_UX) |
559 |
+ |
regs[instr.ra] = instr.addr; |
560 |
+ |
if (instr.transfer_type == TYPE_LOAD) |
561 |
+ |
regs[instr.rd] = 0; |
562 |
+ |
|
563 |
+ |
*nip_p += 4; |
564 |
+ |
return true; |
565 |
+ |
} |
566 |
+ |
#endif |
567 |
|
#endif |
568 |
|
|
569 |
|
// Fallbacks |
598 |
|
#if HAVE_SIGSEGV_SKIP_INSTRUCTION |
599 |
|
else if (sigsegv_ignore_fault) { |
600 |
|
// Call the instruction skipper with the register file available |
601 |
< |
if (SIGSEGV_SKIP_INSTRUCTION(fault_instruction, SIGSEGV_REGISTER_FILE)) |
601 |
> |
if (SIGSEGV_SKIP_INSTRUCTION(SIGSEGV_REGISTER_FILE)) |
602 |
|
fault_recovered = true; |
603 |
|
} |
604 |
|
#endif |