Author: Armin Rigo <[email protected]>
Branch:
Changeset: r72322:659b814b797a
Date: 2014-07-02 21:28 +0200
http://bitbucket.org/pypy/pypy/changeset/659b814b797a/
Log: Details from the stm branch
diff --git a/rpython/jit/backend/x86/callbuilder.py
b/rpython/jit/backend/x86/callbuilder.py
--- a/rpython/jit/backend/x86/callbuilder.py
+++ b/rpython/jit/backend/x86/callbuilder.py
@@ -132,7 +132,6 @@
self.mc.ADD(ebp, imm(1)) # ebp any more; and ignore 'fastgil'
def move_real_result_and_call_reacqgil_addr(self, fastgil):
- from rpython.jit.backend.x86.assembler import heap
from rpython.jit.backend.x86 import rx86
#
# check if we need to call the reacqgil() function or not
diff --git a/rpython/jit/metainterp/resoperation.py
b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -499,7 +499,7 @@
'SETARRAYITEM_GC/3d',
'SETARRAYITEM_RAW/3d',
'SETINTERIORFIELD_GC/3d',
- 'SETINTERIORFIELD_RAW/3d', # only used by llsupport/rewrite.py
+ 'SETINTERIORFIELD_RAW/3d', # right now, only used by tests
'RAW_STORE/3d',
'SETFIELD_GC/2d',
'SETFIELD_RAW/2d',
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -328,6 +328,11 @@
#Since there is no GetErrorMode, do a double Set
old_mode = SetErrorMode(flags)
SetErrorMode(old_mode | flags)
+ if env is None:
+ envrepr = ''
+ else:
+ envrepr = ' [env=%r]' % (env,)
+ log.cmdexec('%s %s%s' % (self.executable_name, args, envrepr))
res = self.translator.platform.execute(self.executable_name, args,
env=env)
if sys.platform == 'win32':
diff --git a/rpython/translator/c/src/mem.h b/rpython/translator/c/src/mem.h
--- a/rpython/translator/c/src/mem.h
+++ b/rpython/translator/c/src/mem.h
@@ -117,7 +117,9 @@
#define OP_BOEHM_DISAPPEARING_LINK(link, obj, r) /* nothing */
#define OP_GC__DISABLE_FINALIZERS(r) /* nothing */
#define OP_GC__ENABLE_FINALIZERS(r) /* nothing */
-#define GC_REGISTER_FINALIZER(a,b,c,d,e) /* nothing */
+#define GC_REGISTER_FINALIZER(a, b, c, d, e) /* nothing */
+#define GC_gcollect() /* nothing */
+#define GC_set_max_heap_size(a) /* nothing */
#endif
/************************************************************/
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
