Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r57680:993a0159055a
Date: 2012-09-30 00:14 +0200
http://bitbucket.org/pypy/pypy/changeset/993a0159055a/
Log: merge default
diff --git a/pypy/doc/arm.rst b/pypy/doc/arm.rst
--- a/pypy/doc/arm.rst
+++ b/pypy/doc/arm.rst
@@ -23,7 +23,7 @@
The tools required to cross translate from a Linux based host to an ARM based
Linux target are:
-- A checkout of PyPy's arm-backend-2 branch.
+- A checkout of PyPy (default branch).
- The GCC ARM cross compiler (on Ubuntu it is the ``gcc-arm-linux-gnueabi
package``) but other toolchains should also work.
- Scratchbox 2, a cross-compilation engine (``scratchbox2`` Ubuntu package).
- A 32-bit PyPy or Python.
@@ -147,4 +147,4 @@
return 0
def target(*args):
- return main, None
\ No newline at end of file
+ return main, None
diff --git a/pypy/jit/backend/model.py b/pypy/jit/backend/model.py
--- a/pypy/jit/backend/model.py
+++ b/pypy/jit/backend/model.py
@@ -131,13 +131,13 @@
def get_latest_value_float(self, index):
"""Returns the value for the index'th argument to the
last executed operation (from 'fail_args' if it was a guard,
- or from 'args' if it was a FINISH). Returns a float."""
+ or from 'args' if it was a FINISH). Returns a FLOATSTORAGE."""
raise NotImplementedError
def get_latest_value_ref(self, index):
"""Returns the value for the index'th argument to the
last executed operation (from 'fail_args' if it was a guard,
- or from 'args' if it was a FINISH). Returns a ptr or an obj."""
+ or from 'args' if it was a FINISH). Returns a GCREF."""
raise NotImplementedError
def get_latest_value_count(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
