[pypy-svn] r77472 - in pypy/trunk/pypy: jit/codewriter module/array/benchmark

[agaynor at codespeak.net]

Author: agaynor
Date: Wed Sep 29 19:09:57 2010
New Revision: 77472

Modified:
   pypy/trunk/pypy/jit/codewriter/effectinfo.py
   pypy/trunk/pypy/module/array/benchmark/sumtst.c
Log:
Fix translation, hopefully.

Modified: pypy/trunk/pypy/jit/codewriter/effectinfo.py
==============================================================================
--- pypy/trunk/pypy/jit/codewriter/effectinfo.py	(original)
+++ pypy/trunk/pypy/jit/codewriter/effectinfo.py	Wed Sep 29 19:09:57 2010
@@ -139,12 +139,12 @@
     try:
         return _callinfo_for_oopspec[oopspecindex]
     except KeyError:
-        return None
+        return (None, 0)
 
 
 def _funcptr_for_oopspec_memo(oopspecindex):
     from pypy.jit.codewriter import heaptracker
-    _, func_as_int = _callinfo_for_oopspec.get(oopspecindex, (None, 0))
+    _, func_as_int = callinfo_for_oopspec(oopspecindex)
     funcadr = heaptracker.int2adr(func_as_int)
     return funcadr.ptr
 _funcptr_for_oopspec_memo._annspecialcase_ = 'specialize:memo'

Modified: pypy/trunk/pypy/module/array/benchmark/sumtst.c
==============================================================================
--- pypy/trunk/pypy/module/array/benchmark/sumtst.c	(original)
+++ pypy/trunk/pypy/module/array/benchmark/sumtst.c	Wed Sep 29 19:09:57 2010
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 
 double sum(double *img);
 
@@ -5,4 +6,4 @@
   double *img=malloc(640*480*4*sizeof(double));
   int sa=0;
   for (int l=0; l<500; l++) sum(img);
-}    
+}