hasting2 02/07/31 12:33:36
Modified: gcc unwind-dw2.c unwind.inc
Log:
Remove previous experimental hack to log C++ throws that trash CR.
Bug #: 2996832
Submitted by: stuart
Revision Changes Path
1.17 +0 -14 gcc3/gcc/unwind-dw2.c
Index: unwind-dw2.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/unwind-dw2.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- unwind-dw2.c 2002/07/27 17:16:26 1.16
+++ unwind-dw2.c 2002/07/31 19:33:36 1.17
@@ -28,14 +28,7 @@
#include "gthr.h"
/* APPLE LOCAL FSF candidate */
#include <string.h>
-/* APPLE LOCAL begin log throws that trash CR */
-#include <syslog.h>
-#include <stdarg.h>
-int __log_cr_trashing = 0 ;
-#define APPLE_LOCAL_LOG_CR_TRASHING(x) do { __log_cr_trashing = x ; } while (0)
-/* APPLE LOCAL end log throws that trash CR */
-
#define Dprintf if (0) printf
#ifndef __USING_SJLJ_EXCEPTIONS__
@@ -872,13 +865,6 @@
fs->regs.reg[reg].loc.offset = offset;
Dprintf("execute_cfa_program reg %d REG_SAVED_OFFSET offset %d\n",
reg, offset);
- /* APPLE LOCAL begin log throws that trash CR */
- if (reg == 70 /* CR2_REGNO */ && __log_cr_trashing == 1)
- {
- syslog( LOG_LOCAL7 | LOG_ERR, "C++ exception thrown; possible CR
corruption\n") ;
- __log_cr_trashing = 42 ; /* once per throw */
- }
- /* APPLE LOCAL end log throws that trash CR */
break;
case DW_CFA_def_cfa_sf:
1.10 +0 -2 gcc3/gcc/unwind.inc
Index: unwind.inc
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/unwind.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- unwind.inc 2002/07/27 17:16:26 1.9
+++ unwind.inc 2002/07/31 19:33:36 1.10
@@ -35,7 +35,6 @@
{
_Unwind_Reason_Code code;
- APPLE_LOCAL_LOG_CR_TRASHING(1);
Dprintf("in _Unwind_RaiseException_Phase2\n");
while (1)
{
@@ -76,7 +75,6 @@
uw_update_context (context, &fs);
}
- APPLE_LOCAL_LOG_CR_TRASHING(0);
return code;
}
