[pypy-commit] pypy win64-stage1: Merge with default

[ctismer]

Author: Christian Tismer <tismer at stackless.com>
Branch: win64-stage1
Changeset: r53964:3ca10036f306
Date: 2012-03-24 17:27 +0100
http://bitbucket.org/pypy/pypy/changeset/3ca10036f306/

Log:	Merge with default

diff --git a/pypy/doc/you-want-to-help.rst b/pypy/doc/you-want-to-help.rst
--- a/pypy/doc/you-want-to-help.rst
+++ b/pypy/doc/you-want-to-help.rst
@@ -60,9 +60,14 @@
 
   xxx
 
-* Garbage Collectors
+* Garbage Collectors: as you can notice, there are no ``Py_INCREF/Py_DECREF``
+  equivalents in RPython code.  `Garbage collection in PyPy`_ is inserted
+  during translation.  Moreover, this is not reference counting; it is a real
+  GC written as more RPython code.  The best one we have so far is in
+  ``rpython/memory/gc/minimark.py``.
 
-  xxx
+.. _`Garbage collection in PyPy`: garbage_collection.html
+
 
 Toolset
 =======
diff --git a/pypy/rpython/lltypesystem/opimpl.py b/pypy/rpython/lltypesystem/opimpl.py
--- a/pypy/rpython/lltypesystem/opimpl.py
+++ b/pypy/rpython/lltypesystem/opimpl.py
@@ -427,6 +427,10 @@
 ##    assert type(x) is int
 ##    return llmemory.cast_int_to_adr(x)
 
+def op_convert_float_bytes_to_longlong(a):
+    from pypy.rlib.longlong2float import float2longlong
+    return float2longlong(a)
+
 
 def op_unichar_eq(x, y):
     assert isinstance(x, unicode) and len(x) == 1