CbC/CbC_gcc: gcc/unwind-dw2.c comparison

comparison gcc/unwind-dw2.c @ 55:77e2b8dfacca gcc-4.4.5

update it from 4.4.3 to 4.5.0

author	ryoma <e075725@ie.u-ryukyu.ac.jp>
date	Fri, 12 Feb 2010 23:39:51 +0900
parents	3bfb6c00c1e0
children	b7f97abdc517

comparison

equal deleted inserted replaced

-:c156f1bd5cd9
+:77e2b8dfacca
 /* DWARF2 exception handling and frame unwind runtime interface routines.
 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-2008, 2009, 2010  Free Software Foundation, Inc.
+2008, 2009  Free Software Foundation, Inc.
 This file is part of GCC.
 GCC is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 /* "P" indicates a personality routine in the CIE augmentation.  */
 else if (aug[0] == 'P')
 	{
 	  _Unwind_Ptr personality;
 	  p = read_encoded_value (context, *p, p + 1, &personality);
 	  fs->personality = (_Unwind_Personality_Fn) personality;
 	  aug += 1;
 	}
 	case DW_OP_not:
 	case DW_OP_plus_uconst:
 	  /* Unary operations.  */
 	  gcc_assert (stack_elt);
 	  stack_elt -= 1;
 	  result = stack[stack_elt];
 	  switch (op)
 	    {
 	    case DW_OP_deref:
 	  {
 	    /* Binary operations.  */
 	    _Unwind_Word first, second;
 	    gcc_assert (stack_elt >= 2);
 	    stack_elt -= 2;
 	    second = stack[stack_elt];
 	    first = stack[stack_elt + 1];
 	    switch (op)
 	      {
 		break;
 	      case DW_OP_minus:
 		result = second - first;
 		break;
 	      case DW_OP_mod:
-		result = second % first;
+		result = (_Unwind_Sword) second % (_Unwind_Sword) first;
 		break;
 	      case DW_OP_mul:
 		result = second * first;
 		break;
 	      case DW_OP_or:
 	  goto no_push;
 	case DW_OP_bra:
 	  gcc_assert (stack_elt);
 	  stack_elt -= 1;
 	  offset = read_2s (op_ptr);
 	  op_ptr += 2;
 	  if (stack[stack_elt] != 0)
 	    op_ptr += offset;
 	  goto no_push;
 else switch (insn)
 	{
 	case DW_CFA_set_loc:
 	  {
 	    _Unwind_Ptr pc;
 	    insn_ptr = read_encoded_value (context, fs->fde_encoding,
 					   insn_ptr, &pc);
 	    fs->pc = (void *) pc;
 	  }
 	  break;
 insn = aug + i;
 }
 if (fs->lsda_encoding != DW_EH_PE_omit)
 {
 _Unwind_Ptr lsda;
 aug = read_encoded_value (context, fs->lsda_encoding, aug, &lsda);
 context->lsda = (void *) lsda;
 }
 /* Then the insns in the FDE up to our target PC.  */
 static inline void
 _Unwind_SetSpColumn (struct _Unwind_Context *context, void *cfa,
 		     _Unwind_SpTmp *tmp_sp)
 {
 int size = dwarf_reg_size_table[__builtin_dwarf_sp_column ()];
 if (size == sizeof(_Unwind_Ptr))
 tmp_sp->ptr = (_Unwind_Ptr) cfa;
 else
 {
 gcc_assert (size == sizeof(_Unwind_Word));
 init_dwarf_reg_size_table (void)
 {
 __builtin_init_dwarf_reg_size_table (dwarf_reg_size_table);
 }
-static void
+static void __attribute__((noinline))
 uw_init_context_1 (struct _Unwind_Context *context,
 		   void *outer_cfa, void *outer_ra)
 {
 void *ra = __builtin_extract_return_addr (__builtin_return_address (0));
 _Unwind_FrameState fs;
 initialization context, then we can't see it in the given
 call frame data.  So have the initialization context tell us.  */
 context->ra = __builtin_extract_return_addr (outer_ra);
 }
+static void _Unwind_DebugHook (void *, void *) __attribute__ ((__noinline__));
+/* This function is called during unwinding.  It is intended as a hook
+for a debugger to intercept exceptions.  CFA is the CFA of the
+target frame.  HANDLER is the PC to which control will be
+transferred.  */
+static void
+_Unwind_DebugHook (void *cfa __attribute__ ((__unused__)),
+		   void *handler __attribute__ ((__unused__)))
+{
+asm ("");
+}
 /* Install TARGET into CURRENT so that we can return to it.  This is a
 macro because __builtin_eh_return must be invoked in the context of
 our caller.  */
-#define uw_install_context(CURRENT, TARGET)				 \
+#define uw_install_context(CURRENT, TARGET)				\
-do									 \
+do									\
-{									 \
+{									\
-long offset = uw_install_context_1 ((CURRENT), (TARGET));		 \
+long offset = uw_install_context_1 ((CURRENT), (TARGET));		\
-void *handler = __builtin_frob_return_addr ((TARGET)->ra);	 \
+void *handler = __builtin_frob_return_addr ((TARGET)->ra);	\
-__builtin_eh_return (offset, handler);				 \
+_Unwind_DebugHook ((TARGET)->cfa, handler);			\
-}									 \
+__builtin_eh_return (offset, handler);				\
+}									\
 while (0)
 static long
 uw_install_context_1 (struct _Unwind_Context *current,
 		      struct _Unwind_Context *target)
 }
 static inline _Unwind_Ptr
 uw_identify_context (struct _Unwind_Context *context)
 {
-return _Unwind_GetCFA (context);
+/* The CFA is not sufficient to disambiguate the context of a function
+interrupted by a signal before establishing its frame and the context
+of the signal itself.  */
+if (STACK_GROWS_DOWNWARD)
+return _Unwind_GetCFA (context) - _Unwind_IsSignalFrame (context);
+else
+return _Unwind_GetCFA (context) + _Unwind_IsSignalFrame (context);
 }
 #include "unwind.inc"

Mercurial > hg > CbC > CbC_gcc

comparison gcc/unwind-dw2.c @ 55:77e2b8dfacca gcc-4.4.5