diff options
| -rw-r--r-- | gdb/common/signals.c | 24 | ||||
| -rw-r--r-- | gdb/darwin-nat.c | 12 | ||||
| -rw-r--r-- | include/gdb/signals.def | 14 |
3 files changed, 25 insertions, 25 deletions
diff --git a/gdb/common/signals.c b/gdb/common/signals.c index 4b3b951..8fe4bed 100644 --- a/gdb/common/signals.c +++ b/gdb/common/signals.c @@ -306,27 +306,27 @@ gdb_signal_from_host (int hostsig) /* Mach exceptions. Assumes that the values for EXC_ are positive! */ #if defined (EXC_BAD_ACCESS) && defined (_NSIG) if (hostsig == _NSIG + EXC_BAD_ACCESS) - return TARGET_EXC_BAD_ACCESS; + return GDB_EXC_BAD_ACCESS; #endif #if defined (EXC_BAD_INSTRUCTION) && defined (_NSIG) if (hostsig == _NSIG + EXC_BAD_INSTRUCTION) - return TARGET_EXC_BAD_INSTRUCTION; + return GDB_EXC_BAD_INSTRUCTION; #endif #if defined (EXC_ARITHMETIC) && defined (_NSIG) if (hostsig == _NSIG + EXC_ARITHMETIC) - return TARGET_EXC_ARITHMETIC; + return GDB_EXC_ARITHMETIC; #endif #if defined (EXC_EMULATION) && defined (_NSIG) if (hostsig == _NSIG + EXC_EMULATION) - return TARGET_EXC_EMULATION; + return GDB_EXC_EMULATION; #endif #if defined (EXC_SOFTWARE) && defined (_NSIG) if (hostsig == _NSIG + EXC_SOFTWARE) - return TARGET_EXC_SOFTWARE; + return GDB_EXC_SOFTWARE; #endif #if defined (EXC_BREAKPOINT) && defined (_NSIG) if (hostsig == _NSIG + EXC_BREAKPOINT) - return TARGET_EXC_BREAKPOINT; + return GDB_EXC_BREAKPOINT; #endif #if defined (SIGINFO) @@ -562,27 +562,27 @@ do_gdb_signal_to_host (enum gdb_signal oursig, /* Mach exceptions. Assumes that the values for EXC_ are positive! */ #if defined (EXC_BAD_ACCESS) && defined (_NSIG) - case TARGET_EXC_BAD_ACCESS: + case GDB_EXC_BAD_ACCESS: return _NSIG + EXC_BAD_ACCESS; #endif #if defined (EXC_BAD_INSTRUCTION) && defined (_NSIG) - case TARGET_EXC_BAD_INSTRUCTION: + case GDB_EXC_BAD_INSTRUCTION: return _NSIG + EXC_BAD_INSTRUCTION; #endif #if defined (EXC_ARITHMETIC) && defined (_NSIG) - case TARGET_EXC_ARITHMETIC: + case GDB_EXC_ARITHMETIC: return _NSIG + EXC_ARITHMETIC; #endif #if defined (EXC_EMULATION) && defined (_NSIG) - case TARGET_EXC_EMULATION: + case GDB_EXC_EMULATION: return _NSIG + EXC_EMULATION; #endif #if defined (EXC_SOFTWARE) && defined (_NSIG) - case TARGET_EXC_SOFTWARE: + case GDB_EXC_SOFTWARE: return _NSIG + EXC_SOFTWARE; #endif #if defined (EXC_BREAKPOINT) && defined (_NSIG) - case TARGET_EXC_BREAKPOINT: + case GDB_EXC_BREAKPOINT: return _NSIG + EXC_BREAKPOINT; #endif diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index 153ffd0..6995c25 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -897,16 +897,16 @@ darwin_decode_message (mach_msg_header_t *hdr, switch (thread->event.ex_type) { case EXC_BAD_ACCESS: - status->value.sig = TARGET_EXC_BAD_ACCESS; + status->value.sig = GDB_EXC_BAD_ACCESS; break; case EXC_BAD_INSTRUCTION: - status->value.sig = TARGET_EXC_BAD_INSTRUCTION; + status->value.sig = GDB_EXC_BAD_INSTRUCTION; break; case EXC_ARITHMETIC: - status->value.sig = TARGET_EXC_ARITHMETIC; + status->value.sig = GDB_EXC_ARITHMETIC; break; case EXC_EMULATION: - status->value.sig = TARGET_EXC_EMULATION; + status->value.sig = GDB_EXC_EMULATION; break; case EXC_SOFTWARE: if (thread->event.ex_data[0] == EXC_SOFT_SIGNAL) @@ -928,11 +928,11 @@ darwin_decode_message (mach_msg_header_t *hdr, } } else - status->value.sig = TARGET_EXC_SOFTWARE; + status->value.sig = GDB_EXC_SOFTWARE; break; case EXC_BREAKPOINT: /* Many internal GDB routines expect breakpoints to be reported - as GDB_SIGNAL_TRAP, and will report TARGET_EXC_BREAKPOINT + as GDB_SIGNAL_TRAP, and will report GDB_EXC_BREAKPOINT as a spurious signal. */ status->value.sig = GDB_SIGNAL_TRAP; break; diff --git a/include/gdb/signals.def b/include/gdb/signals.def index 637d00d..aff5fa5 100644 --- a/include/gdb/signals.def +++ b/include/gdb/signals.def @@ -186,15 +186,15 @@ SET (GDB_SIGNAL_DEFAULT, 144, NULL, /* Mach exceptions. In versions of GDB before 5.2, these were just before GDB_SIGNAL_INFO if you were compiling on a Mach host (and missing otherwise). */ -SET (TARGET_EXC_BAD_ACCESS, 145, "EXC_BAD_ACCESS", "Could not access memory") -SET (TARGET_EXC_BAD_INSTRUCTION, 146, "EXC_BAD_INSTRUCTION", +SET (GDB_EXC_BAD_ACCESS, 145, "EXC_BAD_ACCESS", "Could not access memory") +SET (GDB_EXC_BAD_INSTRUCTION, 146, "EXC_BAD_INSTRUCTION", "Illegal instruction/operand") -SET (TARGET_EXC_ARITHMETIC, 147, "EXC_ARITHMETIC", "Arithmetic exception") -SET (TARGET_EXC_EMULATION, 148, "EXC_EMULATION", "Emulation instruction") -SET (TARGET_EXC_SOFTWARE, 149, "EXC_SOFTWARE", "Software generated exception") -SET (TARGET_EXC_BREAKPOINT, 150, "EXC_BREAKPOINT", "Breakpoint") +SET (GDB_EXC_ARITHMETIC, 147, "EXC_ARITHMETIC", "Arithmetic exception") +SET (GDB_EXC_EMULATION, 148, "EXC_EMULATION", "Emulation instruction") +SET (GDB_EXC_SOFTWARE, 149, "EXC_SOFTWARE", "Software generated exception") +SET (GDB_EXC_BREAKPOINT, 150, "EXC_BREAKPOINT", "Breakpoint") /* If you are adding a new signal, add it just above this comment. */ /* Last and unused enum value, for sizing arrays, etc. */ -SET (GDB_SIGNAL_LAST, 151, NULL, "GDB_SIGNAL_MAGIC") +SET (GDB_SIGNAL_LAST, 151, NULL, "GDB_SIGNAL_LAST") |