|
From: <sv...@va...> - 2005-09-17 01:48:25
|
Author: sewardj
Date: 2005-09-17 02:48:18 +0100 (Sat, 17 Sep 2005)
New Revision: 4670
Log:
Rephrase hard-to-understand conditional.
Modified:
branches/ASPACEM/coregrind/m_translate.c
Modified: branches/ASPACEM/coregrind/m_translate.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/m_translate.c 2005-09-16 04:16:18 UTC (rev=
4669)
+++ branches/ASPACEM/coregrind/m_translate.c 2005-09-17 01:48:18 UTC (rev=
4670)
@@ -440,7 +440,7 @@
{
Addr64 redir, orig_addr0 =3D orig_addr;
Int tmpbuf_used, verbosity;
- Bool notrace_until_done, do_self_check, allowR;
+ Bool notrace_until_done, do_self_check, allowR, seg_ok;
UInt notrace_until_limit =3D 0;
NSegment* seg;
VexGuestExtents vge;
@@ -537,10 +537,12 @@
allowR =3D False;
# endif
=20
- if (seg =3D=3D NULL=20
- || !(seg->kind =3D=3D SkAnonC || seg->kind =3D=3D SkFileC)
- || !(seg->hasX || (seg->hasR && allowR)) ) {
+ seg_ok =3D seg !=3D NULL
+ && (seg->kind =3D=3D SkAnonC || seg->kind =3D=3D SkFileC)
+ && (seg->hasX || (seg->hasR && allowR));
=20
+ if (!seg_ok) {
+
/* U R busted, sonny. Place your hands on your head and step
away from the orig_addr. */
/* Code address is bad - deliver a signal instead */
|