Author: Richard Plangger <planri...@gmail.com> Branch: s390x-backend Changeset: r80511:e9d5e097f0aa Date: 2015-11-02 18:21 +0100 http://bitbucket.org/pypy/pypy/changeset/e9d5e097f0aa/
Log: saving byte_count as attribute to codebuilder instead as attribute of the function diff --git a/rpython/jit/backend/zarch/instruction_builder.py b/rpython/jit/backend/zarch/instruction_builder.py --- a/rpython/jit/backend/zarch/instruction_builder.py +++ b/rpython/jit/backend/zarch/instruction_builder.py @@ -354,7 +354,6 @@ newargs[i] = args[i] return func(self, *newargs) function.__name__ = mnemonic - function._byte_count = func._byte_count return function def is_branch_relative(name): @@ -375,3 +374,5 @@ name = mnemonic + "_" + instrtype setattr(clazz, name, func) setattr(clazz, mnemonic, build_unpack_func(mnemonic, func)) + setattr(clazz, mnemonic + '_byte_count', func._byte_count) + del func._byte_count diff --git a/rpython/jit/backend/zarch/pool.py b/rpython/jit/backend/zarch/pool.py --- a/rpython/jit/backend/zarch/pool.py +++ b/rpython/jit/backend/zarch/pool.py @@ -2,6 +2,7 @@ from rpython.jit.backend.zarch import locations as l from rpython.jit.metainterp.history import (INT, REF, FLOAT, TargetToken) +from rpython.jit.metainterp.resoperation import rop from rpython.rtyper.lltypesystem import lltype, rffi, llmemory from rpython.jit.backend.zarch.arch import (WORD, RECOVERY_GCMAP_POOL_OFFSET, RECOVERY_TARGET_POOL_OFFSET) @@ -62,8 +63,8 @@ if self.size % 2 == 1: self.size += 1 assert self.size < 2**16-1 - asm.mc.BRAS(r.POOL, l.imm(self.size+mc.BRAS._byte_count)) - self.pool_start = mc.get_relative_pos() + asm.mc.BRAS(r.POOL, l.imm(self.size+asm.mc.BRAS_byte_count)) + self.pool_start = asm.mc.get_relative_pos() asm.mc.write('\x00' * self.size) print "pool with %d quad words" % (self.size // 8) _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit