[pypy-commit] pypy py3k: oops

2013-09-09 Thread pjenvey
Author: Philip Jenvey Branch: py3k Changeset: r66888:6cadba559578 Date: 2013-09-09 18:12 -0700 http://bitbucket.org/pypy/pypy/changeset/6cadba559578/ Log:oops diff --git a/pypy/objspace/std/objecttype.py b/pypy/objspace/std/objecttype.py --- a/pypy/objspace/std/objecttype.py +++ b/pypy/objsp

[pypy-commit] pypy py3k: translation fix

2013-09-09 Thread pjenvey
Author: Philip Jenvey Branch: py3k Changeset: r66887:88b27fe9402e Date: 2013-09-09 18:00 -0700 http://bitbucket.org/pypy/pypy/changeset/88b27fe9402e/ Log:translation fix diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/interpreter/baseobjspace.py ++

[pypy-commit] pypy py3k: add py3 bytecodes

2013-09-09 Thread pjenvey
Author: Philip Jenvey Branch: py3k Changeset: r66886:7c48f805ad02 Date: 2013-09-09 14:53 -0700 http://bitbucket.org/pypy/pypy/changeset/7c48f805ad02/ Log:add py3 bytecodes diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py --- a/pypy/interpreter/pyopcode.py +++ b/pypy/i

[pypy-commit] pypy py3k: return a unicode name on py3

2013-09-09 Thread pjenvey
Author: Philip Jenvey Branch: py3k Changeset: r66885:8b3000150d65 Date: 2013-09-09 14:26 -0700 http://bitbucket.org/pypy/pypy/changeset/8b3000150d65/ Log:return a unicode name on py3 diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py --- a/pypy/objspace/std/typeob

[pypy-commit] pypy stmgc-c4: Waa, this made gcc produce a warning: "/*" within comment

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66883:4fa82aceb43c Date: 2013-09-09 22:37 +0200 http://bitbucket.org/pypy/pypy/changeset/4fa82aceb43c/ Log:Waa, this made gcc produce a warning: "/*" within comment diff --git a/rpython/translator/c/src/mem.c b/rpython/translator/c/src/mem.c --

[pypy-commit] pypy stmgc-c4: A test and small fixes for gc_writebarrier in stm.

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66882:de0e05b91573 Date: 2013-09-09 22:29 +0200 http://bitbucket.org/pypy/pypy/changeset/de0e05b91573/ Log:A test and small fixes for gc_writebarrier in stm. diff --git a/rpython/memory/gctransform/framework.py b/rpython/memory/gctransform/fra

[pypy-commit] pypy stmgc-c4: hg merge default

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66881:6bcc88ab4f2b Date: 2013-09-09 22:17 +0200 http://bitbucket.org/pypy/pypy/changeset/6bcc88ab4f2b/ Log:hg merge default diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/wha

[pypy-commit] pypy default: We don't need do_write_barrier() any more.

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66877:abb1e075eae6 Date: 2013-09-09 21:14 +0200 http://bitbucket.org/pypy/pypy/changeset/abb1e075eae6/ Log:We don't need do_write_barrier() any more. diff --git a/rpython/jit/backend/llsupport/gc.py b/rpython/jit/backend/llsupport/gc.py --- a/rpython/

[pypy-commit] pypy default: Move gc_writebarrier() closer to where it needs to be: just before calling the assembler

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66879:f21ab1e8ae20 Date: 2013-09-09 22:01 +0200 http://bitbucket.org/pypy/pypy/changeset/f21ab1e8ae20/ Log:Move gc_writebarrier() closer to where it needs to be: just before calling the assembler diff --git a/rpython/jit/backend/llsupport/gc.py

[pypy-commit] pypy default: merge heads

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66880:619ceb5c24c8 Date: 2013-09-09 22:07 +0200 http://bitbucket.org/pypy/pypy/changeset/619ceb5c24c8/ Log:merge heads diff --git a/rpython/rtyper/rpbc.py b/rpython/rtyper/rpbc.py --- a/rpython/rtyper/rpbc.py +++ b/rpython/rtyper/rpbc.py @@ -596,6 +596

[pypy-commit] pypy default: Oups, attempt to fix translation

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66878:2df4a2cdc3d4 Date: 2013-09-09 21:19 +0200 http://bitbucket.org/pypy/pypy/changeset/2df4a2cdc3d4/ Log:Oups, attempt to fix translation diff --git a/rpython/jit/backend/llgraph/runner.py b/rpython/jit/backend/llgraph/runner.py --- a/rpython/jit/ba

[pypy-commit] pypy default: Test and fix.

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66876:0e2f0d910e8f Date: 2013-09-09 21:55 +0200 http://bitbucket.org/pypy/pypy/changeset/0e2f0d910e8f/ Log:Test and fix. diff --git a/rpython/rtyper/rpbc.py b/rpython/rtyper/rpbc.py --- a/rpython/rtyper/rpbc.py +++ b/rpython/rtyper/rpbc.py @@ -596,6 +5

[pypy-commit] pypy py3k: copy over from the pypy3-release-2.1.x branch

2013-09-09 Thread pjenvey
Author: Philip Jenvey Branch: py3k Changeset: r66875:7f9bcea88ed3 Date: 2013-09-09 12:25 -0700 http://bitbucket.org/pypy/pypy/changeset/7f9bcea88ed3/ Log:copy over from the pypy3-release-2.1.x branch diff --git a/pypy/doc/release-pypy3-2.1.0-beta1.rst b/pypy/doc/release-pypy3-2.1.0-beta1.rs

[pypy-commit] pypy pypy-pyarray: revert to original c-macro (segfaulting) style api for consistency with numpy

2013-09-09 Thread mattip
Author: Matti Picus Branch: pypy-pyarray Changeset: r66874:02814fa15f6c Date: 2013-09-09 22:19 +0300 http://bitbucket.org/pypy/pypy/changeset/02814fa15f6c/ Log:revert to original c-macro (segfaulting) style api for consistency with numpy diff --git a/pypy/module/cpyext/ndarrayobject.

[pypy-commit] pypy default: Ignore this branch merge

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66873:5597c038128c Date: 2013-09-09 20:12 +0200 http://bitbucket.org/pypy/pypy/changeset/5597c038128c/ Log:Ignore this branch merge diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/wha

[pypy-commit] pypy stmgc-c4: Add raw_load and raw_store here, to generate the correct barriers

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66867:1b6f11c55022 Date: 2013-09-09 18:28 +0200 http://bitbucket.org/pypy/pypy/changeset/1b6f11c55022/ Log:Add raw_load and raw_store here, to generate the correct barriers when applied on GC objects. diff --git a/rpython/translator/stm

[pypy-commit] pypy stmgc-c4: hg merge default

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66871:a206090d8a53 Date: 2013-09-09 19:13 +0200 http://bitbucket.org/pypy/pypy/changeset/a206090d8a53/ Log:hg merge default diff --git a/rpython/rtyper/lltypesystem/opimpl.py b/rpython/rtyper/lltypesystem/opimpl.py --- a/rpython/rtyper/lltypes

[pypy-commit] pypy stmgc-c4: The indirect_call() going to assembler code forces the transaction to

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66870:ff868bef7ee0 Date: 2013-09-09 19:09 +0200 http://bitbucket.org/pypy/pypy/changeset/ff868bef7ee0/ Log:The indirect_call() going to assembler code forces the transaction to become inevitable. The only way I can think of to avoid this

[pypy-commit] pypy default: Kill unused lines

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66872:74bd88216584 Date: 2013-09-09 19:15 +0200 http://bitbucket.org/pypy/pypy/changeset/74bd88216584/ Log:Kill unused lines diff --git a/rpython/rtyper/lltypesystem/opimpl.py b/rpython/rtyper/lltypesystem/opimpl.py --- a/rpython/rtyper/lltypesystem/o

[pypy-commit] pypy default: Fix: allow other types too, e.g. an AddressAsInt instance.

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66869:6aade584984f Date: 2013-09-09 19:13 +0200 http://bitbucket.org/pypy/pypy/changeset/6aade584984f/ Log:Fix: allow other types too, e.g. an AddressAsInt instance. diff --git a/rpython/rtyper/lltypesystem/opimpl.py b/rpython/rtyper/lltypesystem/opim

[pypy-commit] pypy stmgc-c4: hg merge default

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66866:781dce1d3438 Date: 2013-09-09 18:25 +0200 http://bitbucket.org/pypy/pypy/changeset/781dce1d3438/ Log:hg merge default diff --git a/lib_pypy/_tkinter/__init__.py b/lib_pypy/_tkinter/__init__.py --- a/lib_pypy/_tkinter/__init__.py +++ b/lib

[pypy-commit] pypy stmgc-c4: Fixes: in raw_load/raw_store, we don't know what kind of type the 1st argument has. It could be a GCREF, or a Signed or an

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66868:ffe7dd8b3850 Date: 2013-09-09 18:54 +0200 http://bitbucket.org/pypy/pypy/changeset/ffe7dd8b3850/ Log:Fixes: in raw_load/raw_store, we don't know what kind of type the 1st argument has. It could be a GCREF, or a Signed or an Address

[pypy-commit] pypy default: Use raw_load() and raw_store() instead of custom logic for

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66865:af5e7f014b6e Date: 2013-09-09 18:12 +0200 http://bitbucket.org/pypy/pypy/changeset/af5e7f014b6e/ Log:Use raw_load() and raw_store() instead of custom logic for {read_write}_{int,ref,float}_at_mem(), with an extention that puts them

[pypy-commit] pypy default: Simplify the code and always call {read, write}_{int, ref, float}_at_mem().

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66864:e35d638cb427 Date: 2013-09-09 17:30 +0200 http://bitbucket.org/pypy/pypy/changeset/e35d638cb427/ Log:Simplify the code and always call {read,write}_{int,ref,float}_at_mem(). diff --git a/rpython/jit/backend/llsupport/llmodel.py b/rpython

[pypy-commit] pypy stmgc-c4: Fix

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66863:4a08783e2fa4 Date: 2013-09-09 16:38 +0200 http://bitbucket.org/pypy/pypy/changeset/4a08783e2fa4/ Log:Fix diff --git a/rpython/memory/gctransform/framework.py b/rpython/memory/gctransform/framework.py --- a/rpython/memory/gctransform/fram

[pypy-commit] pypy stmgc-c4: Debugging: always fprintf the inevitable reasons

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66861:781b5647ee58 Date: 2013-09-09 16:24 +0200 http://bitbucket.org/pypy/pypy/changeset/781b5647ee58/ Log:Debugging: always fprintf the inevitable reasons diff --git a/rpython/jit/tl/targettlr.py b/rpython/jit/tl/targettlr.py --- a/rpython/jit

[pypy-commit] pypy stmgc-c4: Handle gc_writebarrier in stm/writebarrier.py

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66862:97ea6facc2a3 Date: 2013-09-09 16:31 +0200 http://bitbucket.org/pypy/pypy/changeset/97ea6facc2a3/ Log:Handle gc_writebarrier in stm/writebarrier.py diff --git a/rpython/memory/gctransform/framework.py b/rpython/memory/gctransform/framewor

[pypy-commit] pypy stmgc-c4: Crash more cleanly when trying to translate on 32-bit (duh)

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66860:07dc1406b5e1 Date: 2013-09-09 16:02 +0200 http://bitbucket.org/pypy/pypy/changeset/07dc1406b5e1/ Log:Crash more cleanly when trying to translate on 32-bit (duh) diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/

[pypy-commit] pypy stmgc-c4: Make the raw JITFRAMEINFO STM-free, by using only one field in case

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66859:663ecda0e4d8 Date: 2013-09-09 14:30 +0200 http://bitbucket.org/pypy/pypy/changeset/663ecda0e4d8/ Log:Make the raw JITFRAMEINFO STM-free, by using only one field in case of STM and by updating its value carefully with bool_cas(). d

[pypy-commit] pypy default: This argument is always -1. Kill the (broken) support for different

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r66858:e86991796de2 Date: 2013-09-09 11:17 +0200 http://bitbucket.org/pypy/pypy/changeset/e86991796de2/ Log:This argument is always -1. Kill the (broken) support for different values. diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/

[pypy-commit] pypy stmgc-c4: import stmgc/698910c9edc3

2013-09-09 Thread arigo
Author: Armin Rigo Branch: stmgc-c4 Changeset: r66857:533cd1f88e46 Date: 2013-09-09 09:46 +0200 http://bitbucket.org/pypy/pypy/changeset/533cd1f88e46/ Log:import stmgc/698910c9edc3 diff --git a/rpython/translator/stm/src_stm/gcpage.c b/rpython/translator/stm/src_stm/gcpage.c --- a/rpython/t

[pypy-commit] stmgc default: Skip this assert, after discussion with Remi.

2013-09-09 Thread arigo
Author: Armin Rigo Branch: Changeset: r525:698910c9edc3 Date: 2013-09-09 09:46 +0200 http://bitbucket.org/pypy/stmgc/changeset/698910c9edc3/ Log:Skip this assert, after discussion with Remi. diff --git a/c4/gcpage.c b/c4/gcpage.c --- a/c4/gcpage.c +++ b/c4/gcpage.c @@ -503,7 +503,9 @@