Attachment #123077 for bug #166341

View | Details | Raw Unified | Return to bug 166341
Collapse All | Expand All




            op = Cop_And; opname = "and"; goto binop;
         case DW_OP_mul:
            op = Cop_Mul; opname = "mul"; goto binop;
         case DW_OP_shl:
            op = Cop_Shl; opname = "shl"; goto binop;
         case DW_OP_shr:
            op = Cop_Shr; opname = "shr"; goto binop;
         case DW_OP_eq:
            op = Cop_Eq; opname = "eq"; goto binop;
         case DW_OP_ge:
            op = Cop_Ge; opname = "ge"; goto binop;
         case DW_OP_gt:
            op = Cop_Gt; opname = "gt"; goto binop;
         case DW_OP_le:
            op = Cop_Le; opname = "le"; goto binop;
         case DW_OP_lt:
            op = Cop_Lt; opname = "lt"; goto binop;
         case DW_OP_ne:
            op = Cop_Ne; opname = "ne"; goto binop;
         binop:
            POP( ix );
            POP( ix2 );

Lines 1880-1885 Link Here

(-)coregrind/m_debuginfo/debuginfo.c (+8 lines)
1880	case Cop_Sub: return wL - wR;	1880	case Cop_Sub: return wL - wR;
1881	case Cop_And: return wL & wR;	1881	case Cop_And: return wL & wR;
1882	case Cop_Mul: return wL * wR;	1882	case Cop_Mul: return wL * wR;
		1883	case Cop_Shl: return wL << wR;
		1884	case Cop_Shr: return wL >> wR;
		1885	case Cop_Eq: return wL == wR ? 1 : 0;
		1886	case Cop_Ge: return wL >= wR ? 1 : 0;
		1887	case Cop_Gt: return wL > wR ? 1 : 0;
		1888	case Cop_Le: return wL <= wR ? 1 : 0;
		1889	case Cop_Lt: return wL < wR ? 1 : 0;
		1890	case Cop_Ne: return wL != wR ? 1 : 0;
1883	default: goto unhandled;	1891	default: goto unhandled;
1884	}	1892	}
1885	/NOTREACHED/	1893	/NOTREACHED/

Lines 603-608 Link Here

(-)coregrind/m_debuginfo/storage.c (+8 lines)
603	case Cop_Sub: VG_(printf)("-"); break;	603	case Cop_Sub: VG_(printf)("-"); break;
604	case Cop_And: VG_(printf)("&"); break;	604	case Cop_And: VG_(printf)("&"); break;
605	case Cop_Mul: VG_(printf)("*"); break;	605	case Cop_Mul: VG_(printf)("*"); break;
		606	case Cop_Shl: VG_(printf)("<<"); break;
		607	case Cop_Shr: VG_(printf)(">>"); break;
		608	case Cop_Eq: VG_(printf)("=="); break;
		609	case Cop_Ge: VG_(printf)(">="); break;
		610	case Cop_Gt: VG_(printf)(">"); break;
		611	case Cop_Le: VG_(printf)("<="); break;
		612	case Cop_Lt: VG_(printf)("<"); break;
		613	case Cop_Ne: VG_(printf)("!="); break;
606	default: vg_assert(0);	614	default: vg_assert(0);
607	}	615	}
608	}	616	}

Lines 249-255 Link Here

(-)coregrind/m_debuginfo/priv_storage.h (-1 / +9 lines)
249	Cop_Add=0x321,	249	Cop_Add=0x321,
250	Cop_Sub,	250	Cop_Sub,
251	Cop_And,	251	Cop_And,
252	Cop_Mul	252	Cop_Mul,
		253	Cop_Shl,
		254	Cop_Shr,
		255	Cop_Eq,
		256	Cop_Ge,
		257	Cop_Gt,
		258	Cop_Le,
		259	Cop_Lt,
		260	Cop_Ne
253	}	261	}
254	CfiOp;	262	CfiOp;
255		263

Lines 1883-1892 Link Here

(-)coregrind/m_debuginfo/debuginfo.c (-4 / +4 lines)
1883	case Cop_Shl: return wL << wR;	1883	case Cop_Shl: return wL << wR;
1884	case Cop_Shr: return wL >> wR;	1884	case Cop_Shr: return wL >> wR;
1885	case Cop_Eq: return wL == wR ? 1 : 0;	1885	case Cop_Eq: return wL == wR ? 1 : 0;
1886	case Cop_Ge: return wL >= wR ? 1 : 0;	1886	case Cop_Ge: return (Word) wL >= (Word) wR ? 1 : 0;
1887	case Cop_Gt: return wL > wR ? 1 : 0;	1887	case Cop_Gt: return (Word) wL > (Word) wR ? 1 : 0;
1888	case Cop_Le: return wL <= wR ? 1 : 0;	1888	case Cop_Le: return (Word) wL <= (Word) wR ? 1 : 0;
1889	case Cop_Lt: return wL < wR ? 1 : 0;	1889	case Cop_Lt: return (Word) wL < (Word) wR ? 1 : 0;
1890	case Cop_Ne: return wL != wR ? 1 : 0;	1890	case Cop_Ne: return wL != wR ? 1 : 0;
1891	default: goto unhandled;	1891	default: goto unhandled;
1892	}	1892	}

Return to bug 166341

Lines 2899-2904 Link Here

(-)coregrind/m_debuginfo/readdwarf.c (+16 lines)
2899	op = Cop_And; opname = "and"; goto binop;	2899	op = Cop_And; opname = "and"; goto binop;
2900	case DW_OP_mul:	2900	case DW_OP_mul:
2901	op = Cop_Mul; opname = "mul"; goto binop;	2901	op = Cop_Mul; opname = "mul"; goto binop;
		2902	case DW_OP_shl:
		2903	op = Cop_Shl; opname = "shl"; goto binop;
		2904	case DW_OP_shr:
		2905	op = Cop_Shr; opname = "shr"; goto binop;
		2906	case DW_OP_eq:
		2907	op = Cop_Eq; opname = "eq"; goto binop;
		2908	case DW_OP_ge:
		2909	op = Cop_Ge; opname = "ge"; goto binop;
		2910	case DW_OP_gt:
		2911	op = Cop_Gt; opname = "gt"; goto binop;
		2912	case DW_OP_le:
		2913	op = Cop_Le; opname = "le"; goto binop;
		2914	case DW_OP_lt:
		2915	op = Cop_Lt; opname = "lt"; goto binop;
		2916	case DW_OP_ne:
		2917	op = Cop_Ne; opname = "ne"; goto binop;
2902	binop:	2918	binop:
2903	POP( ix );	2919	POP( ix );
2904	POP( ix2 );	2920	POP( ix2 );