[pypy-svn] r52120 - in pypy/dist/pypy/translator/c/gcc: . test

[arigo at codespeak.net]

Author: arigo
Date: Mon Mar  3 20:53:38 2008
New Revision: 52120

Modified:
   pypy/dist/pypy/translator/c/gcc/test/track7.s
   pypy/dist/pypy/translator/c/gcc/trackgcroot.py
Log:
Regexp fun.


Modified: pypy/dist/pypy/translator/c/gcc/test/track7.s
==============================================================================
--- pypy/dist/pypy/translator/c/gcc/test/track7.s	(original)
+++ pypy/dist/pypy/translator/c/gcc/test/track7.s	Mon Mar  3 20:53:38 2008
@@ -7,7 +7,8 @@
 	cmovge	20(%esp), %ebx
 	movl	24(%esp), %eax
 	cmovs	%eax, %ebx
-	call	foobar
+	;; and an indirect call while we're at it
+	call	*(%eax)
 	;; expected {4(%esp) | (%esp), %esi, %edi, %ebp | %ebx}
 #APP
 	/* GCROOT %ebx */

Modified: pypy/dist/pypy/translator/c/gcc/trackgcroot.py
==============================================================================
--- pypy/dist/pypy/translator/c/gcc/trackgcroot.py	(original)
+++ pypy/dist/pypy/translator/c/gcc/trackgcroot.py	Mon Mar  3 20:53:38 2008
@@ -8,7 +8,7 @@
 r_globl         = re.compile(r"\t[.]globl\t(\w+)\s*$")
 r_insn          = re.compile(r"\t([a-z]\w*)\s")
 r_jump          = re.compile(r"\tj\w+\s+([.]?\w+)\s*$")
-OPERAND         =            r"[-\w$%+.:@]+(?:[(][\w%,]+[)])?|[(][\w%,]+[)]"
+OPERAND         =           r"(?:[-\w$%+.:@]+(?:[(][\w%,]+[)])?|[(][\w%,]+[)])"
 r_unaryinsn     = re.compile(r"\t[a-z]\w*\s+("+OPERAND+")\s*$")
 r_unaryinsn_star= re.compile(r"\t[a-z]\w*\s+([*]"+OPERAND+")\s*$")
 r_jmp_switch    = re.compile(r"\tjmp\t[*]([.]?\w+)[(]")