[Valgrind-developers] valgrind: r10003 - trunk/coregrind/m_debuginfo

[<sv...@va...>]

Author: njn
Date: 2009-05-20 03:27:00 +0100 (Wed, 20 May 2009)
New Revision: 10003

Log:
DARWIN sync: put conditional compilation alternatives in the usual order.



Modified:
   trunk/coregrind/m_debuginfo/d3basics.c


Modified: trunk/coregrind/m_debuginfo/d3basics.c
===================================================================
--- trunk/coregrind/m_debuginfo/d3basics.c	2009-05-20 02:25:12 UTC (rev 10002)
+++ trunk/coregrind/m_debuginfo/d3basics.c	2009-05-20 02:27:00 UTC (rev 10003)
@@ -379,12 +379,12 @@
 static Bool get_Dwarf_Reg( /*OUT*/Addr* a, Word regno, RegSummary* regs )
 {
    vg_assert(regs);
-#  if defined(VGP_amd64_linux)
+#  if defined(VGP_x86_linux)
+   if (regno == 5/*EBP*/) { *a = regs->fp; return True; }
+   if (regno == 4/*ESP*/) { *a = regs->sp; return True; }
+#  elif defined(VGP_amd64_linux)
    if (regno == 6/*RBP*/) { *a = regs->fp; return True; }
    if (regno == 7/*RSP*/) { *a = regs->sp; return True; }
-#  elif defined(VGP_x86_linux)
-   if (regno == 5/*EBP*/) { *a = regs->fp; return True; }
-   if (regno == 4/*ESP*/) { *a = regs->sp; return True; }
 #  elif defined(VGP_ppc32_linux)
    if (regno == 1/*SP*/) { *a = regs->sp; return True; }
    if (regno == 31) return False;