Attachment 598874 Details for Bug 837081 – Backport of upstream revisions r11856 and r11904

[patch] Backport of upstream revisions r11856 and r11904

moredwops.patch (text/plain), 4.44 KB, created by Mark Wielaard on 2012-07-18 12:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Wielaard

Created: 2012-07-18 12:50:01 UTC

Size: 4.44 KB

patch

obsolete

>diff --git a/valgrind-3.6.0-moredwops.patch b/valgrind-3.6.0-moredwops.patch
>new file mode 100644
>index 0000000..7d2ce79
>--- /dev/null
>+++ b/valgrind-3.6.0-moredwops.patch
>@@ -0,0 +1,86 @@
>+Index: coregrind/m_debuginfo/readdwarf.c
>+===================================================================
>+--- coregrind/m_debuginfo/readdwarf.c	(revision 11855)
>++++ coregrind/m_debuginfo/readdwarf.c	(revision 11904)
>+@@ -2899,6 +2899,22 @@
>+             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 );
>+Index: coregrind/m_debuginfo/debuginfo.c
>+===================================================================
>+--- coregrind/m_debuginfo/debuginfo.c	(revision 11855)
>++++ coregrind/m_debuginfo/debuginfo.c	(revision 11904)
>+@@ -1880,6 +1880,14 @@
>+             case Cop_Sub: return wL - wR;
>+             case Cop_And: return wL & wR;
>+             case Cop_Mul: return wL * wR;
>++            case Cop_Shl: return wL << wR;
>++            case Cop_Shr: return wL >> wR;
>++            case Cop_Eq: return wL == wR ? 1 : 0;
>++            case Cop_Ge: return (Word) wL >= (Word) wR ? 1 : 0;
>++            case Cop_Gt: return (Word) wL > (Word) wR ? 1 : 0;
>++            case Cop_Le: return (Word) wL <= (Word) wR ? 1 : 0;
>++            case Cop_Lt: return (Word) wL < (Word) wR ? 1 : 0;
>++            case Cop_Ne: return wL != wR ? 1 : 0;
>+             default: goto unhandled;
>+          }
>+          /*NOTREACHED*/
>+Index: coregrind/m_debuginfo/storage.c
>+===================================================================
>+--- coregrind/m_debuginfo/storage.c	(revision 11855)
>++++ coregrind/m_debuginfo/storage.c	(revision 11904)
>+@@ -603,6 +603,14 @@
>+       case Cop_Sub: VG_(printf)("-"); break;
>+       case Cop_And: VG_(printf)("&"); break;
>+       case Cop_Mul: VG_(printf)("*"); break;
>++      case Cop_Shl: VG_(printf)("<<"); break;
>++      case Cop_Shr: VG_(printf)(">>"); break;
>++      case Cop_Eq: VG_(printf)("=="); break;
>++      case Cop_Ge: VG_(printf)(">="); break;
>++      case Cop_Gt: VG_(printf)(">"); break;
>++      case Cop_Le: VG_(printf)("<="); break;
>++      case Cop_Lt: VG_(printf)("<"); break;
>++      case Cop_Ne: VG_(printf)("!="); break;
>+       default:      vg_assert(0);
>+    }
>+ }
>+Index: coregrind/m_debuginfo/priv_storage.h
>+===================================================================
>+--- coregrind/m_debuginfo/priv_storage.h	(revision 11855)
>++++ coregrind/m_debuginfo/priv_storage.h	(revision 11904)
>+@@ -249,7 +249,15 @@
>+       Cop_Add=0x321,
>+       Cop_Sub,
>+       Cop_And,
>+-      Cop_Mul
>++      Cop_Mul,
>++      Cop_Shl,
>++      Cop_Shr,
>++      Cop_Eq,
>++      Cop_Ge,
>++      Cop_Gt,
>++      Cop_Le,
>++      Cop_Lt,
>++      Cop_Ne
>+    }
>+    CfiOp;
>+ 
>diff --git a/valgrind.spec b/valgrind.spec
>index 0cbe11b..c35d93b 100644
>--- a/valgrind.spec
>+++ b/valgrind.spec
>@@ -30,6 +30,7 @@ Patch23: valgrind-3.6.0-rexw-ptest.patch
> Patch24: valgrind-3.6.0-memalign-4M.patch
> Patch25: valgrind-3.6.0-power7-2.patch
> Patch26: valgrind-3.6.0-power7-3.patch
>+Patch27: valgrind-3.6.0-moredwops.patch
> 
> License: GPLv2
> URL: http://www.valgrind.org/
>@@ -131,6 +132,7 @@ for details.
> %patch24 -p1
> %patch25 -p1
> %patch26 -p1
>+%patch27 -p0
> 
> chmod 755 none/tests/s390x/filter_stderr || :
> chmod 755 tests/check_isa-2_06_cap || :
>@@ -280,6 +282,11 @@ rm -rf $RPM_BUILD_ROOT
> %endif
> 
> %changelog
>+* Mon Jul 18 2012 Mark Wielaard <mjw@redhat.com>
>+- Add valgrind-3.6.0-moredwops.patch based on upstream revisions r11856
>+  and r11904 to support DW_OP_shl, DW_OP_shr, DW_OP_eq, DW_OP_ge, DW_OP_gt,
>+  DW_OP_le, DW_OP_lt, DW_OP_ne (#837081)
>+
> * Mon Mar  5 2012 Jakub Jelinek <jakub@redhat.com> 3.6.0-5
> - improve POWER7 support (#739143)
> - handle memalign requests up to 4MB alignment instead of 1MB (#757728)

Actions: View | Diff

Attachments on bug 837081: 598874