[pypy-commit] pypy numpy-reintroduce-jit-drivers: forgot about one

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: numpy-reintroduce-jit-drivers
Changeset: r57671:44330b0857bc
Date: 2012-09-29 20:53 +0200
http://bitbucket.org/pypy/pypy/changeset/44330b0857bc/

Log:	forgot about one

diff --git a/pypy/module/micronumpy/loop.py b/pypy/module/micronumpy/loop.py
--- a/pypy/module/micronumpy/loop.py
+++ b/pypy/module/micronumpy/loop.py
@@ -367,14 +367,15 @@
         val_iter.reset()
 
 fromstring_driver = jit.JitDriver(name = 'numpy_fromstring',
-                                  greens = ['dtype'],
+                                  greens = ['itemsize', 'dtype'],
                                   reds = ['i', 's', 'ai'])
 
 def fromstring_loop(a, dtype, itemsize, s):
     i = 0
     ai = a.create_iter()
     while not ai.done():
-        fromstring_driver.jit_merge_point(dtype=dtype, s=s, ai=ai, i=i)
+        fromstring_driver.jit_merge_point(dtype=dtype, s=s, ai=ai, i=i,
+                                          itemsize=itemsize)
         val = dtype.itemtype.runpack_str(s[i*itemsize:i*itemsize + itemsize])
         ai.setitem(val)
         ai.next()