Author: Manuel Jacob
Branch: refactor-translator
Changeset: r61783:37c2b24250ea
Date: 2013-02-25 16:43 +0100
http://bitbucket.org/pypy/pypy/changeset/37c2b24250ea/
Log: Replace cbuilder.generate_source(defines=cbuilder.DEBUG_DEFINES)
with cbuilder.generate_source(debug_defines=True).
diff --git a/rpython/jit/backend/arm/test/test_zrpy_gc.py
b/rpython/jit/backend/arm/test/test_zrpy_gc.py
--- a/rpython/jit/backend/arm/test/test_zrpy_gc.py
+++ b/rpython/jit/backend/arm/test/test_zrpy_gc.py
@@ -115,7 +115,7 @@
setattr(obj, attr, oldvalue)
cbuilder = genc.CStandaloneBuilder(t, f, t.config)
- cbuilder.generate_source(defines=cbuilder.DEBUG_DEFINES)
+ cbuilder.generate_source(debug_defines=True)
cbuilder.compile()
return cbuilder
diff --git a/rpython/jit/backend/x86/test/test_zrpy_gc.py
b/rpython/jit/backend/x86/test/test_zrpy_gc.py
--- a/rpython/jit/backend/x86/test/test_zrpy_gc.py
+++ b/rpython/jit/backend/x86/test/test_zrpy_gc.py
@@ -111,7 +111,7 @@
setattr(obj, attr, oldvalue)
cbuilder = genc.CStandaloneBuilder(t, f, t.config)
- cbuilder.generate_source(defines=cbuilder.DEBUG_DEFINES)
+ cbuilder.generate_source(debug_defines=True)
cbuilder.compile()
return cbuilder
diff --git a/rpython/translator/c/gcc/test/test_asmgcroot.py
b/rpython/translator/c/gcc/test/test_asmgcroot.py
--- a/rpython/translator/c/gcc/test/test_asmgcroot.py
+++ b/rpython/translator/c/gcc/test/test_asmgcroot.py
@@ -58,8 +58,7 @@
cbuilder = CStandaloneBuilder(t, main, config=config,
secondary_entrypoints=sec_ep)
- c_source_filename = cbuilder.generate_source(
- defines = cbuilder.DEBUG_DEFINES)
+ c_source_filename = cbuilder.generate_source(debug_defines=True)
cls._patch_makefile(cbuilder.targetdir)
if option.view:
t.view()
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
@@ -206,11 +206,6 @@
return gc.name_to_gcpolicy[name]
return self.gcpolicy
- # use generate_source(defines=DEBUG_DEFINES) to force the #definition
- # of the macros that enable debugging assertions
- DEBUG_DEFINES = {'RPY_ASSERT': 1,
- 'RPY_LL_ASSERT': 1}
-
def generate_graphs_for_llinterp(self, db=None):
# prepare the graphs as when the source is generated, but without
# actually generating the source.
@@ -224,7 +219,7 @@
funcgen.patch_graph(copy_graph=False)
return db
- def generate_source(self, db=None, defines={}, exe_name=None):
+ def generate_source(self, db=None, debug_defines=True, exe_name=None):
assert self.c_source_filename is None
if db is None:
@@ -238,7 +233,10 @@
targetdir = NullPyPathLocal(targetdir)
self.targetdir = targetdir
- defines = defines.copy()
+ defines = {}
+ if debug_defines:
+ defines['RPY_ASSERT'] = 1
+ defines['RPY_LL_ASSERT'] = 1
if self.config.translation.countmallocs:
defines['COUNT_OP_MALLOCS'] = 1
if self.config.translation.sandbox:
diff --git a/rpython/translator/c/test/test_standalone.py
b/rpython/translator/c/test/test_standalone.py
--- a/rpython/translator/c/test/test_standalone.py
+++ b/rpython/translator/c/test/test_standalone.py
@@ -31,7 +31,7 @@
cbuilder = CStandaloneBuilder(t, entry_point, t.config)
if debug:
- cbuilder.generate_source(defines=cbuilder.DEBUG_DEFINES)
+ cbuilder.generate_source(debug_defines=True)
else:
cbuilder.generate_source()
cbuilder.compile()
@@ -848,7 +848,7 @@
t.buildrtyper().specialize()
#
cbuilder = CStandaloneBuilder(t, entry_point, t.config)
- cbuilder.generate_source(defines=cbuilder.DEBUG_DEFINES)
+ cbuilder.generate_source(debug_defines=True)
cbuilder.compile()
#
return t, cbuilder
diff --git a/rpython/translator/driver.py b/rpython/translator/driver.py
--- a/rpython/translator/driver.py
+++ b/rpython/translator/driver.py
@@ -393,16 +393,13 @@
self._task_database_c()
cbuilder = self.cbuilder
database = self.database
- if self._backend_extra_options.get('c_debug_defines', False):
- defines = cbuilder.DEBUG_DEFINES
- else:
- defines = {}
+ debug_def = self._backend_extra_options.get('c_debug_defines', False)
if self.exe_name is not None:
exe_name = self.exe_name % self.get_info()
else:
exe_name = None
- c_source_filename = cbuilder.generate_source(database, defines,
- exe_name=exe_name)
+ c_source_filename = cbuilder.generate_source(
+ database, debug_defines=debug_def, exe_name=exe_name)
self.log.info("written: %s" % (c_source_filename,))
if self.config.translation.dump_static_data_info:
from rpython.translator.tool.staticsizereport import
dump_static_data_info
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
